Bug 1285428 - Fix urlclassifier.trackingWhitelistTable table registration. r=gcp
authorFrancois Marier <francois@mozilla.com>
Thu, 07 Jul 2016 22:27:56 -0700
changeset 304247 4287a45df22d86765e15561a8834f6f3d00c24ec
parent 304246 51efc2643b800dc65e759ba97e70f585392e413e
child 304248 04b34bdb471576c61d0d4b2f4c3b6f1d736bd6c3
push id30526
push userfmarier@mozilla.com
push dateFri, 08 Jul 2016 22:26:59 +0000
treeherderautoland@4287a45df22d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgcp
bugs1285428
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1285428 - Fix urlclassifier.trackingWhitelistTable table registration. r=gcp MozReview-Commit-ID: ISeuu8XjZ0d
toolkit/components/url-classifier/SafeBrowsing.jsm
--- a/toolkit/components/url-classifier/SafeBrowsing.jsm
+++ b/toolkit/components/url-classifier/SafeBrowsing.jsm
@@ -280,19 +280,24 @@ this.SafeBrowsing = {
         listManager.enableUpdate(downloadAllowLists[i]);
       } else {
         listManager.disableUpdate(downloadAllowLists[i]);
       }
     }
     for (let i = 0; i < trackingProtectionLists.length; ++i) {
       if (this.trackingEnabled) {
         listManager.enableUpdate(trackingProtectionLists[i]);
+      } else {
+        listManager.disableUpdate(trackingProtectionLists[i]);
+      }
+    }
+    for (let i = 0; i < trackingProtectionWhitelists.length; ++i) {
+      if (this.trackingEnabled) {
         listManager.enableUpdate(trackingProtectionWhitelists[i]);
       } else {
-        listManager.disableUpdate(trackingProtectionLists[i]);
         listManager.disableUpdate(trackingProtectionWhitelists[i]);
       }
     }
     for (let i = 0; i < forbiddenLists.length; ++i) {
       if (this.forbiddenEnabled) {
         listManager.enableUpdate(forbiddenLists[i]);
       } else {
         listManager.disableUpdate(forbiddenLists[i]);