Bug 1525458 - Part 3: Work around bug 1529728 by disabling tracking annotations in flash blocking classifier tests; r=baku
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 21 Feb 2019 16:34:49 -0500
changeset 461871 bfadbf643f32e259d45f8b5af88c0300dc17b68f
parent 461870 03f6a90e46bd71ce3f8827c4dfedba6abd509867
child 461872 ca609968769496871058ab18a471b0c3be5c67ad
push id35631
push userrgurzau@mozilla.com
push dateFri, 01 Mar 2019 13:06:03 +0000
treeherdermozilla-central@d4e19870e27f [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 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: [
     {