Bug 1525458 - Part 3: Work around bug 1529728 by disabling tracking annotations in flash blocking classifier tests; r=baku
☠☠ backed out by b3a4dde40f15 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 27 Feb 2019 20:39:00 +0000
changeset 519636 1755b771e8c70495fedce427e27184db0bfb44d0
parent 519635 c6177206b968960439a5ccd0fdef1437095dec4d
child 519637 96c38e4a3d2302598a81e4928d8c9dd09b8afe08
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1525458, 1529728
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 1525458 - Part 3: Work around bug 1529728 by disabling tracking annotations in flash blocking classifier tests; r=baku Depends on D20875 Differential Revision: https://phabricator.services.mozilla.com/D20876
toolkit/components/url-classifier/tests/browser/classifierTester.js
--- a/toolkit/components/url-classifier/tests/browser/classifierTester.js
+++ b/toolkit/components/url-classifier/tests/browser/classifierTester.js
@@ -9,16 +9,17 @@ var classifierTester = {
   IFRAME_ID: "testFrame",
   FLASHBLOCK_ENABLE_PREF: "plugins.flashBlock.enabled",
   FLASH_PLUGIN_USER_SETTING_PREF: "plugin.state.flash",
   URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF: "urlclassifier.disallow_completions",
   NEVER_ACTIVATE_PREF_VALUE: 0,
   ASK_TO_ACTIVATE_PREF_VALUE: 1,
   ALWAYS_ACTIVATE_PREF_VALUE: 2,
   ALLOW_CTA_PREF: "plugins.click_to_play",
+  TRACKING_ANNOTATIONS_PREF: "privacy.trackingprotection.annotate_channels",
 
   dbUrls: [
     {
       url: "flashallow.example.com/",
       db: "test-flashallow-simple",
       pref: "urlclassifier.flashAllowTable",
     },
     {
@@ -62,27 +63,30 @@ var classifierTester = {
       Services.prefs.setCharPref(classifierTester.URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF, completions);
     }
 
     Services.prefs.setBoolPref(classifierTester.FLASHBLOCK_ENABLE_PREF,
                                flashBlockEnable);
     Services.prefs.setIntPref(classifierTester.FLASH_PLUGIN_USER_SETTING_PREF,
                               flashSetting);
     Services.prefs.setBoolPref(classifierTester.ALLOW_CTA_PREF, true);
+    // Work around bug 1529728
+    Services.prefs.setBoolPref(classifierTester.TRACKING_ANNOTATIONS_PREF, false);
   },
 
   unsetPrefs() {
     for (let dbData of classifierTester.dbUrls) {
       Services.prefs.clearUserPref(dbData.pref);
     }
 
     Services.prefs.clearUserPref(classifierTester.URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF);
     Services.prefs.clearUserPref(classifierTester.FLASHBLOCK_ENABLE_PREF);
     Services.prefs.clearUserPref(classifierTester.FLASH_PLUGIN_USER_SETTING_PREF);
     Services.prefs.clearUserPref(classifierTester.ALLOW_CTA_PREF);
+    Services.prefs.clearUserPref(classifierTester.TRACKING_ANNOTATIONS_PREF);
   },
 
   // The |domains| property describes the domains of the nested documents making
   // up the page. |domains[0]| represents the domain in the URL bar. The last
   // domain in the list is the domain of the most deeply nested iframe.
   // Only the plugin in the most deeply nested document will be checked.
   testCases: [
     {