Bug 1529728 - P2. Remove previous testcase workaround. r=baku
authordlee <dlee@mozilla.com>
Mon, 04 Mar 2019 08:26:17 +0000
changeset 520087 78f3aca43fdeee1108542423a15cbbfa12a5f8db
parent 520086 0bdd564d24799403cbb8314c4589fc823acf3926
child 520088 c43632f95e3adce75f78cb411996f8287d41c523
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
bugs1529728, 1525458
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 1529728 - P2. Remove previous testcase workaround. r=baku Remove the workaround in Bug 1525458 because the issue is fixed. Differential Revision: https://phabricator.services.mozilla.com/D21781
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,17 +9,16 @@ 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",
     },
     {
@@ -63,30 +62,27 @@ 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: [
     {