Bug 1535337 - Part 2: Don't clobber the extraPrefs argument when calling AntiTracking._createTask(); r=baku
authorEhsan Akhgari <ehsan@mozilla.com>
Sat, 16 Mar 2019 02:42:25 +0000
changeset 464475 81d4d461ab15
parent 464474 7eed7ef4c16e
child 464476 3c2169f7665e
push id35716
push useraciure@mozilla.com
push dateSun, 17 Mar 2019 09:42:17 +0000
treeherdermozilla-central@8ee97c045359 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1535337
milestone67.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 1535337 - Part 2: Don't clobber the extraPrefs argument when calling AntiTracking._createTask(); r=baku Depends on D23508 Differential Revision: https://phabricator.services.mozilla.com/D23509
toolkit/components/antitracking/test/browser/head.js
--- a/toolkit/components/antitracking/test/browser/head.js
+++ b/toolkit/components/antitracking/test/browser/head.js
@@ -113,122 +113,122 @@ this.AntiTracking = {
         //   * If the contentBlocking third-party cookies UI pref is off, the allow list will be ignored.
         // All of these cases are tested here.
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_ACCEPT,
           blockingByContentBlockingRTUI: true,
           allowList: false,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_ACCEPT,
           blockingByContentBlockingRTUI: false,
           allowList: true,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_ACCEPT,
           blockingByContentBlockingRTUI: false,
           allowList: false,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_REJECT,
           blockingByContentBlockingRTUI: true,
           allowList: false,
           callback: callbackTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_LIMIT_FOREIGN,
           blockingByContentBlockingRTUI: true,
           allowList: true,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_REJECT_FOREIGN,
           blockingByContentBlockingRTUI: true,
           allowList: true,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_REJECT_TRACKER,
           blockingByContentBlockingRTUI: true,
           allowList: true,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: 0,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval,
           callbackAfterRemoval,
         });
         this._createCleanupTask(cleanupFunction);
 
         this._createTask({
           name,
           cookieBehavior: BEHAVIOR_REJECT_TRACKER,
           blockingByContentBlockingRTUI: false,
           allowList: false,
           callback: callbackNonTracking,
-          extraPrefs: [],
+          extraPrefs,
           expectedBlockingNotifications: false,
           runInPrivateWindow,
           iframeSandbox,
           accessRemoval: null, // only passed with non-blocking callback
           callbackAfterRemoval: null,
           thirdPartyPage: TEST_ANOTHER_3RD_PARTY_PAGE,
         });
         this._createCleanupTask(cleanupFunction);