Bug 1461534 - Enable user/add-on overrides of tracking annotations. r?dimi draft
authorFrancois Marier <francois@mozilla.com>
Tue, 03 Jul 2018 17:32:29 -0700
changeset 814338 6e63e6b7f19b585859c36b74954a4961001dd106
parent 813837 987ea0d6a000b95cf93928b25a74a7fb1dfe37b2
child 814339 b4ab627d8b6ceccdf6b12f5168e4411861cf9257
child 815664 58c573459c2f5f817c82ad175accb8c855f92554
child 815673 f3cf7f44e9620b20b67e1faca16500a78d7f2222
push id115164
push userfmarier@mozilla.com
push dateWed, 04 Jul 2018 23:33:39 +0000
reviewersdimi
bugs1461534
milestone63.0a1
Bug 1461534 - Enable user/add-on overrides of tracking annotations. r?dimi MozReview-Commit-ID: GQfIGirbSuW
netwerk/base/nsChannelClassifier.cpp
--- a/netwerk/base/nsChannelClassifier.cpp
+++ b/netwerk/base/nsChannelClassifier.cpp
@@ -369,23 +369,16 @@ nsChannelClassifier::ShouldEnableTrackin
       if (LOG_ENABLED()) {
         LOG(("nsChannelClassifier[%p]: Skipping tracking protection checks "
              "for first party or top-level load channel[%p] with uri %s",
              this, aChannel, chanURI->GetSpecOrDefault().get()));
       }
       return NS_OK;
     }
 
-    // Unlike full Tracking Protection, annotations don't block anything
-    // so we don't need to take into account add-ons or user exceptions.
-    if (aAnnotationsOnly) {
-      *result = true;
-      return NS_OK;
-    }
-
     if (AddonMayLoad(aChannel, chanURI)) {
         return NS_OK;
     }
 
     nsCOMPtr<nsIIOService> ios = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!topWinURI && CachedPrefs::GetInstance()->IsAllowListExample()) {