Bug 1509555 - Part 5: Remove fastblock from tests r=baku
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 27 Nov 2018 08:57:53 +0000
changeset 507533 9555f6d408f1d030380052ddae2491869aa1031b
parent 507532 52afd894ca9eb8bf0596c7ac318a0d4e93233f84
child 507534 4b8c2df35461931ee0eaa2f9e7fad1c2d41acb6c
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1509555
milestone65.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 1509555 - Part 5: Remove fastblock from tests r=baku Depends on D12831 Differential Revision: https://phabricator.services.mozilla.com/D12832
toolkit/components/antitracking/test/browser/browser_backgroundImageAssertion.js
toolkit/components/antitracking/test/browser/browser_existingCookiesForSubresources.js
toolkit/components/antitracking/test/browser/browser_localStorageEvents.js
toolkit/components/antitracking/test/browser/browser_onBeforeRequestNotificationForTrackingResources.js
toolkit/components/antitracking/test/browser/browser_onModifyRequestNotificationForTrackingResources.js
toolkit/components/antitracking/test/browser/browser_partitionedLocalStorage_events.js
toolkit/components/antitracking/test/browser/browser_script.js
toolkit/components/antitracking/test/browser/browser_storageAccessDoorHanger.js
toolkit/components/antitracking/test/browser/browser_storageAccessWithHeuristics.js
toolkit/components/antitracking/test/browser/browser_subResources.js
toolkit/components/antitracking/test/browser/head.js
toolkit/components/url-classifier/tests/mochitest/chrome.ini
toolkit/components/url-classifier/tests/mochitest/fastblock.html
toolkit/components/url-classifier/tests/mochitest/fastblock_iframe.html
toolkit/components/url-classifier/tests/mochitest/fastblock_slow_iframe.html
toolkit/components/url-classifier/tests/mochitest/test_classifier.html
toolkit/components/url-classifier/tests/mochitest/test_classify_ping.html
toolkit/components/url-classifier/tests/mochitest/test_fastblock_bug1477046.html
--- a/toolkit/components/antitracking/test/browser/browser_backgroundImageAssertion.js
+++ b/toolkit/components/antitracking/test/browser/browser_backgroundImageAssertion.js
@@ -2,17 +2,16 @@ ChromeUtils.import("resource://gre/modul
 
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
--- a/toolkit/components/antitracking/test/browser/browser_existingCookiesForSubresources.js
+++ b/toolkit/components/antitracking/test/browser/browser_existingCookiesForSubresources.js
@@ -1,16 +1,15 @@
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
-    ["browser.fastblock.enabled", false],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
--- a/toolkit/components/antitracking/test/browser/browser_localStorageEvents.js
+++ b/toolkit/components/antitracking/test/browser/browser_localStorageEvents.js
@@ -3,17 +3,16 @@ ChromeUtils.import("resource://gre/modul
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.storage_access.enabled", true],
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 });
--- a/toolkit/components/antitracking/test/browser/browser_onBeforeRequestNotificationForTrackingResources.js
+++ b/toolkit/components/antitracking/test/browser/browser_onBeforeRequestNotificationForTrackingResources.js
@@ -49,17 +49,16 @@ add_task(async function() {
 
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["privacy.trackingprotection.enabled", true],
     // the test doesn't open a private window, so we don't care about this pref's value
     ["privacy.trackingprotection.pbmode.enabled", false],
     // tracking annotations aren't needed in this test, only TP is needed
     ["privacy.trackingprotection.annotate_channels", false],
     // prevent the content blocking on-boarding UI to start mid-way through the test!
     [ContentBlocking.prefIntroCount, ContentBlocking.MAX_INTROS],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
--- a/toolkit/components/antitracking/test/browser/browser_onModifyRequestNotificationForTrackingResources.js
+++ b/toolkit/components/antitracking/test/browser/browser_onModifyRequestNotificationForTrackingResources.js
@@ -44,17 +44,16 @@ async function onModifyRequest() {
 
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["privacy.trackingprotection.enabled", true],
     // the test doesn't open a private window, so we don't care about this pref's value
     ["privacy.trackingprotection.pbmode.enabled", false],
     // tracking annotations aren't needed in this test, only TP is needed
     ["privacy.trackingprotection.annotate_channels", false],
     // prevent the content blocking on-boarding UI to start mid-way through the test!
     [ContentBlocking.prefIntroCount, ContentBlocking.MAX_INTROS],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
--- a/toolkit/components/antitracking/test/browser/browser_partitionedLocalStorage_events.js
+++ b/toolkit/components/antitracking/test/browser/browser_partitionedLocalStorage_events.js
@@ -5,17 +5,16 @@
 // to avoid having to worry about any e10s propagation issues.)
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
@@ -97,17 +96,16 @@ add_task(async _ => {
 // other.
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
@@ -180,17 +178,16 @@ add_task(async _ => {
 // localStorage instead of partitioned localStorage.
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_ACCEPT],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
@@ -262,17 +259,16 @@ add_task(async _ => {
 // origin does not see the values stored by the previous iframe.
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
@@ -329,17 +325,16 @@ add_task(async _ => {
 // Like the previous test, but accepting trackers
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_ACCEPT],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
@@ -398,17 +393,16 @@ add_task(async _ => {
 // its previous self.
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
@@ -465,17 +459,16 @@ add_task(async _ => {
 // Like the previous test, but accepting trackers
 add_task(async _ => {
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.ipc.processCount", 1],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_ACCEPT],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
-    ["browser.fastblock.enabled", false], // prevent intermittent failures
     ["privacy.restrict3rdpartystorage.partitionedHosts", "tracking.example.org,tracking.example.com"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a non-tracker top-level context");
   let normalTab = BrowserTestUtils.addTab(gBrowser, TEST_DOMAIN + TEST_PATH + "page.html");
   let normalBrowser = gBrowser.getBrowserForTab(normalTab);
--- a/toolkit/components/antitracking/test/browser/browser_script.js
+++ b/toolkit/components/antitracking/test/browser/browser_script.js
@@ -2,17 +2,16 @@ ChromeUtils.import("resource://gre/modul
 
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
--- a/toolkit/components/antitracking/test/browser/browser_storageAccessDoorHanger.js
+++ b/toolkit/components/antitracking/test/browser/browser_storageAccessDoorHanger.js
@@ -7,17 +7,16 @@ Services.scriptloader.loadSubScript(CHRO
 async function testDoorHanger(choice) {
   info(`Running doorhanger test with choice #${choice}`);
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
     [ContentBlocking.prefIntroCount, ContentBlocking.MAX_INTROS],
-    ["browser.fastblock.enabled", false],
     ["dom.storage_access.enabled", true],
     ["dom.storage_access.prompt.testing", false],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
   ]});
--- a/toolkit/components/antitracking/test/browser/browser_storageAccessWithHeuristics.js
+++ b/toolkit/components/antitracking/test/browser/browser_storageAccessWithHeuristics.js
@@ -3,17 +3,16 @@ ChromeUtils.import("resource://gre/modul
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["dom.storage_access.enabled", true],
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
--- a/toolkit/components/antitracking/test/browser/browser_subResources.js
+++ b/toolkit/components/antitracking/test/browser/browser_subResources.js
@@ -2,17 +2,16 @@ ChromeUtils.import("resource://gre/modul
 
 add_task(async function() {
   info("Starting subResources test");
 
   await SpecialPowers.flushPrefEnv();
   await SpecialPowers.pushPrefEnv({"set": [
     ["browser.contentblocking.allowlist.annotations.enabled", true],
     ["browser.contentblocking.allowlist.storage.enabled", true],
-    ["browser.fastblock.enabled", false],
     ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER],
     ["privacy.trackingprotection.enabled", false],
     ["privacy.trackingprotection.pbmode.enabled", false],
     ["privacy.trackingprotection.annotate_channels", true],
     ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
   ]});
 
   await UrlClassifierTestUtils.addTestTrackers();
--- a/toolkit/components/antitracking/test/browser/head.js
+++ b/toolkit/components/antitracking/test/browser/head.js
@@ -249,17 +249,16 @@ this.AntiTracking = {
       ["dom.storage_access.enabled", true],
       ["browser.contentblocking.allowlist.annotations.enabled", blockingByContentBlockingRTUI],
       ["browser.contentblocking.allowlist.storage.enabled", blockingByContentBlockingRTUI],
       ["network.cookie.cookieBehavior", cookieBehavior],
       ["privacy.trackingprotection.enabled", false],
       ["privacy.trackingprotection.pbmode.enabled", false],
       ["privacy.trackingprotection.annotate_channels", cookieBehavior != BEHAVIOR_ACCEPT],
       [win.ContentBlocking.prefIntroCount, win.ContentBlocking.MAX_INTROS],
-      ["browser.fastblock.enabled", false], // prevent intermittent failures
       ["privacy.restrict3rdpartystorage.userInteractionRequiredForHosts", "tracking.example.com,tracking.example.org"],
     ]});
 
     if (extraPrefs && Array.isArray(extraPrefs) && extraPrefs.length) {
       await SpecialPowers.pushPrefEnv({"set": extraPrefs });
     }
 
     await UrlClassifierTestUtils.addTestTrackers();
--- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/chrome.ini
@@ -7,20 +7,17 @@ support-files =
   trackingRequest.html
   bug_1281083.html
   report.sjs
   gethash.sjs
   classifierCommon.js
   classifierHelper.js
   head.js
   threathit.sjs
-  fastblock.html
   redirect_tracker.sjs
-  fastblock_iframe.html
-  fastblock_slow_iframe.html
   !/toolkit/components/url-classifier/tests/mochitest/classifierFrame.html
   !/toolkit/components/url-classifier/tests/mochitest/cleanWorker.js
   !/toolkit/components/url-classifier/tests/mochitest/good.js
   !/toolkit/components/url-classifier/tests/mochitest/evil.css
   !/toolkit/components/url-classifier/tests/mochitest/evil.css^headers^
   !/toolkit/components/url-classifier/tests/mochitest/evil.js
   !/toolkit/components/url-classifier/tests/mochitest/evil.js^headers^
   !/toolkit/components/url-classifier/tests/mochitest/evilWorker.js
@@ -63,9 +60,8 @@ tags = trackingprotection
 skip-if = verify
 [test_classifier_changetablepref_bug1395411.html]
 [test_reporturl.html]
 skip-if = verify
 [test_trackingprotection_bug1312515.html]
 [test_advisory_link.html]
 [test_threathit_report.html]
 skip-if = verify
-[test_fastblock_bug1477046.html]
deleted file mode 100644
--- a/toolkit/components/url-classifier/tests/mochitest/fastblock.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title></title>
-</head>
-<body>
-  <!-- Tracking iframe contains some trackers -->
-  <iframe id="fastIFrame" data-touched="not sure" src="http://tracking.example.org/chrome/toolkit/components/url-classifier/tests/mochitest/fastblock_iframe.html" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></iframe>
-
-  <!-- A slow tracking iframe containing some trackers -->
-  <iframe id="slowIFrame" data-touched="not sure" src="http://tracking.example.org/chrome/toolkit/components/url-classifier/tests/mochitest/fastblock_slow_iframe.html" onload="this.dataset.touched='yes';"></iframe>
-
-  <!-- A fast tracker that redirects to become a slow tracker -->
-  <script id="redirectScript"src="http://example.com/chrome/toolkit/components/url-classifier/tests/mochitest/redirect_tracker.sjs" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking URL -->
-  <script id="goodScript" data-touched="not sure" src="http://tracking.example.com/tests/toolkit/components/url-classifier/tests/mochitest/good.js" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking Annotation -->
-  <script id="fastScript" data-touched="not sure" src="http://tracking.example.org/tests/toolkit/components/url-classifier/tests/mochitest/evil.js" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking Annotation -->
-  <script id="slowScript" data-touched="not sure" src="http://tracking.example.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-</body>
-</html>
deleted file mode 100644
--- a/toolkit/components/url-classifier/tests/mochitest/fastblock_iframe.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title></title>
-</head>
-<body>
-
-  <!-- Tracking URL -->
-  <script id="goodIFrameScript" data-touched="not sure" src="http://example.com/tests/toolkit/components/url-classifier/tests/mochitest/good.js?iframe" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking Annotation -->
-  <script id="fastIFrameScript" data-touched="not sure" src="http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/evil.js?iframe" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking Annotation -->
-  <script id="slowIFrameScript" data-touched="not sure" src="http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js?iframe" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-</body>
-</html>
deleted file mode 100644
--- a/toolkit/components/url-classifier/tests/mochitest/fastblock_slow_iframe.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title></title>
-</head>
-<body>
-
-  <!-- Tracking URL -->
-  <script id="goodSlowIFrameScript" data-touched="not sure" src="http://example.com/tests/toolkit/components/url-classifier/tests/mochitest/good.js?slowiframe" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking Annotation -->
-  <script id="fastSlowIFrameScript" data-touched="not sure" src="http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/evil.js?slowiframe" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-  <!-- Tracking Annotation -->
-  <script id="slowSlowIFrameScript" data-touched="not sure" src="http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js?slowiframe" onload="this.dataset.touched='yes';" onerror="this.dataset.touched='no';"></script>
-
-</body>
-</html>
--- a/toolkit/components/url-classifier/tests/mochitest/test_classifier.html
+++ b/toolkit/components/url-classifier/tests/mochitest/test_classifier.html
@@ -166,17 +166,16 @@ function testService() {
 }
 
 SpecialPowers.pushPrefEnv(
   {"set": [["urlclassifier.malwareTable", "test-malware-simple,test-unwanted-simple,test-harmful-simple"],
            ["urlclassifier.phishTable", "test-phish-simple"],
            ["urlclassifier.downloadBlockTable", "test-block-simple"],
            ["urlclassifier.trackingTable", "test-track-simple"],
            ["browser.safebrowsing.debug", true],
-           ["browser.fastblock.enabled", false],
            ["privacy.trackingprotection.annotate_channels", true]]},
   function() {
     classifierHelper.waitForInit()
       .then(() => classifierHelper.addUrlToDB(testData))
       .then(updateSuccess)
       .catch(err => {
         updateError(err);
       })
--- a/toolkit/components/url-classifier/tests/mochitest/test_classify_ping.html
+++ b/toolkit/components/url-classifier/tests/mochitest/test_classify_ping.html
@@ -126,15 +126,14 @@
       });
   }
 
   SimpleTest.waitForExplicitFinish();
   SimpleTest.registerCleanupFunction(cleanup);
   SpecialPowers.pushPrefEnv({"set": [
     ["browser.send_pings", true],
     ["urlclassifier.trackingTable", "test-track-simple"],
-    ["browser.fastblock.enabled", false],
   ]}, runTest);
 
 </script>
 </pre>
 </body>
 </html>
deleted file mode 100644
--- a/toolkit/components/url-classifier/tests/mochitest/test_fastblock_bug1477046.html
+++ /dev/null
@@ -1,605 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1477046
-
-----------------------------------------------
-| ID                   | Tracker | FastBlock |
------------------------+---------+------------
-| fastblock.html       | No      | N/A       |
------------------------+---------+------------
-| goodScript           | No      | N/A       |
-| fastScript           | Yes     | No        |
-| slowScript           | Yes     | Yes       |
-| redirectScript       | Yes     | Yes       |
------------------------+---------+------------
-| fastIFrame           | Yes     | No        |
------------------------+---------+------------
-| goodIFrameScript     | No      | N/A       |
-| fastIFrameScript     | Yes     | No        |
-| slowIFrameScript     | Yes     | Yes       |
------------------------+---------+------------
-| slowIFrame           | Yes     | Yes       |
------------------------+---------+------------
-| goodSlowIFrameScript | No      | N/A       |
-| fastSlowIFrameScript | Yes     | N/A       |
-| slowSlowIFrameScript | Yes     | N/A       |
------------------------+---------+------------
-|            (load event fires)              |
------------------------+---------+------------
-| badIFrame            | Yes     | No        |
------------------------+---------+------------
-| goodIFrameScript     | No      | N/A       |
-| fastIFrameScript     | Yes     | No        |
-| slowIFrameScript     | Yes     | No        |
------------------------+---------+------------
-| goodIFrame           | No      | N/A       |
------------------------+---------+------------
-| goodIFrameScript     | No      | N/A       |
-| fastIFrameScript     | Yes     | No        |
-| slowIFrameScript     | Yes     | No        |
-----------------------------------------------
-
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 1477046</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-
-<body>
-
-<p id="display"></p>
-<div id="content" style="display: none">
-</div>
-<pre id="test">
-
-<script src="head.js"></script>
-<script class="testbody" type="text/javascript">
-
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-ChromeUtils.import("resource://testing-common/ContentTask.jsm");
-ChromeUtils.import("resource://testing-common/ContentTaskUtils.jsm");
-ChromeUtils.import("resource://testing-common/TestUtils.jsm");
-ChromeUtils.import("resource://testing-common/UrlClassifierTestUtils.jsm");
-
-const gContentPage =
-  "http://example.com/chrome/toolkit/components/url-classifier/tests/mochitest/fastblock.html";
-const gGoodIFramePage =
-  "http://example.com/chrome/toolkit/components/url-classifier/tests/mochitest/fastblock_iframe.html";
-const gBadIFramePage =
-  "http://itisatracker.org/chrome/toolkit/components/url-classifier/tests/mochitest/fastblock_iframe.html";
-const gValidHosts = [
-  "example.com",
-  "itisatracker.org",
-  "trackertest.org",
-  "tracking.example.com",
-  "tracking.example.org",
-];
-const gSlowTrackers = [
-  "http://tracking.example.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js",
-  "http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js",
-  "http://tracking.example.org/chrome/toolkit/components/url-classifier/tests/mochitest/fastblock_slow_iframe.html",
-  "http://tracking.example.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js?iframe",
-  "http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js?iframe",
-  "http://tracking.example.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js?slowiframe",
-  "http://itisatracker.org/tests/toolkit/components/url-classifier/tests/mochitest/trackingRequest.js?slowiframe",
-];
-const gRedirectTracker =
-  "http://example.com/chrome/toolkit/components/url-classifier/tests/mochitest/redirect_tracker.sjs";
-
-const gInfiniteTimeout = 300000;
-const gDebug = false;
-
-function log(aMsg) {
-  if (gDebug) {
-    info("[FastBlock] " + aMsg + "\n");
-  }
-}
-
-function awaitBrowserLoaded(browser) {
-  return ContentTask.spawn(browser, null, () => {
-    if (content.document.readyState !== "complete" ||
-        content.document.documentURI === "about:blank") {
-      return ContentTaskUtils.waitForEvent(this, "load", true, event => {
-        return content.document.documentURI !== "about:blank";
-      }).then(() => {
-        return ContentTaskUtils.waitForCondition(() => {
-          return content.document.readyState === "complete";
-        }, "page load complete", 100, 600); // wait for ~60s
-      });
-    }
-    return Promise.resolve();
-  });
-}
-
-function testOnWindow(resolve, reject) {
-  const mainWindow = window.docShell.rootTreeItem.domWindow;
-  let win = mainWindow.OpenBrowserWindow({remote: true});
-
-  whenDelayedStartupFinished(win, function() {
-    SimpleTest.executeSoon(function() { BrowserTestUtils.loadURI(win.gBrowser, gContentPage); });
-    awaitBrowserLoaded(win.gBrowser.selectedBrowser).then(() => {
-      resolve(win);
-    }).catch((reason) => {
-      ok(false, reason);
-      reject(reason);
-    });
-  });
-}
-
-async function setupTest() {
-  log("setupTest");
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.registerCleanupFunction(() => {
-    log("cleanup()");
-    UrlClassifierTestUtils.cleanupTestTrackers();
-  });
-
-  await SpecialPowers.pushPrefEnv({ "set": [
-    ["browser.fastblock.enabled", true],
-    ["browser.fastblock.limit", 0],
-    ["browser.fastblock.timeout", 5000],
-    ["network.http.tailing.enabled", true],
-    ["privacy.trackingprotection.enabled", false],
-    ["privacy.trackingprotection.annotate_channels", true],
-  ]});
-  await UrlClassifierTestUtils.addTestTrackers();
-
-}
-
-/**
- * This is a helper function that detects slower trackers loaded before timeout.
- * All such trackers will be suspended until other resources are loaded.
- * At the moment, the timeout will be set to immediately, which makes all following
- * trackers blocked by FastBlock. This test depends on the implementation in
- * |nsHttpChannel|, where the timeout check is after resume.
- */
-function SlowTrackerDetector(aNumNonSlowTargets) {
-  this.numTargets = aNumNonSlowTargets;
-  this.suspendedRequests = [];
-  this._onBC = this.onBeforeConnect.bind(this);
-  this._onSR = this.onStopRequest.bind(this);
-  this._onER = this.onExamineResponse.bind(this);
-}
-
-SlowTrackerDetector.prototype = {
-  async init() {
-    SpecialPowers.addObserver(this._onBC, "http-on-before-connect");
-    SpecialPowers.addObserver(this._onSR, "http-on-stop-request");
-    SpecialPowers.addObserver(this._onER, "http-on-examine-response");
-
-    await SpecialPowers.pushPrefEnv({
-      "set": [
-        ["browser.fastblock.timeout", gInfiniteTimeout],
-      ],
-    });
-  },
-  async close() {
-    ok(!this._onBC, "observer removed");
-    ok(!this._onSR, "observer removed");
-    ok(!this._onER, "observer removed");
-    is(this.suspendedRequests.length, 0, "no suspended request");
-    await SpecialPowers.popPrefEnv();
-  },
-
-  onBeforeConnect(aSubject) {
-    let channel = aSubject.QueryInterface(Ci.nsIChannel);
-    log("onBeforeConnect: " + channel.name);
-    if (gSlowTrackers.includes(channel.name) &&
-        this.numTargets > 0) {
-      this.onSlowTrackerFound(channel);
-    }
-  },
-
-  onStopRequest(aSubject) {
-    let channel = aSubject.QueryInterface(Ci.nsIChannel);
-    log("onStopRequest: " + channel.name);
-    if (gValidHosts.includes(channel.URI.host) &&
-        !gSlowTrackers.includes(channel.name)) {
-      --this.numTargets;
-      if (this.numTargets == 0) {
-        this.onAllNonSlowTargetsLoaded();
-      }
-    }
-  },
-
-  onExamineResponse(aSubject) {
-    let channel = aSubject.QueryInterface(Ci.nsIChannel);
-    log("onExamineResponse: " + channel.name);
-    if (gRedirectTracker == channel.name &&
-        this.numTargets > 0) {
-      this.onRedirectTrackerFound(channel);
-    }
-  },
-
-  onSlowTrackerFound(aChannel) {
-    log("onSlowTrackerFound: " + aChannel.name);
-    aChannel.suspend();
-    this.suspendedRequests.push(aChannel);
-  },
-
-  onRedirectTrackerFound(aChannel) {
-    log("onRedirectTrackerFound: " + aChannel.name);
-    let request = aChannel.QueryInterface(Ci.nsIRequest);
-    request.suspend();
-    this.suspendedRequests.push(request);
-  },
-
-  onAllNonSlowTargetsLoaded() {
-    is(this.numTargets, 0, "resources are loaded");
-
-    SpecialPowers.removeObserver(this._onBC, "http-on-before-connect");
-    SpecialPowers.removeObserver(this._onSR, "http-on-stop-request");
-    SpecialPowers.removeObserver(this._onER, "http-on-examine-response");
-    this._onBC = this._onSR = this._onER = null;
-
-    log("=========== TIMEOUT ===========");
-    // FastBlock from now on
-    SpecialPowers.setIntPref("browser.fastblock.timeout", 1);
-
-    for (let channel of this.suspendedRequests) {
-      log("resuming: " + channel.name);
-      channel.resume();
-    }
-    this.suspendedRequests = [];
-  },
-};
-
-/**
- * DOM will do some SpeculativeLoad thing, which increases the tracker counter
- * incorrectly. This class is introduced to cancel those duplicated channels.
- */
-function ChannelUnifier() {
-  this._onOR = this.onOpeningRequest.bind(this);
-}
-
-ChannelUnifier.prototype = {
-  init() {
-    this.uris = new Set();
-    SpecialPowers.addObserver(this._onOR, "http-on-opening-request");
-  },
-
-  close() {
-    SpecialPowers.removeObserver(this._onOR, "http-on-opening-request");
-  },
-
-  onOpeningRequest(aSubject) {
-    let channel = aSubject.QueryInterface(Ci.nsIChannel);
-    if (this.uris.has(channel.name)) {
-      log("ChannelUnifier cancels: " + channel.name);
-      channel.cancel(Cr.NS_BINDING_ABORTED);
-    } else {
-      this.uris.add(channel.name);
-    }
-  },
-};
-
-async function runTest(aPrefs, aFunction, aNumNonSlowTrackers) {
-  if (aPrefs) {
-    await SpecialPowers.pushPrefEnv(aPrefs);
-  }
-
-  let detector;
-  if (aNumNonSlowTrackers) {
-    detector = new SlowTrackerDetector(aNumNonSlowTrackers);
-    await detector.init();
-  }
-
-  await new Promise((resolve, reject) => {
-    let monitor = new ChannelUnifier();
-    monitor.init();
-
-    testOnWindow(async function(aWindow) {
-      monitor.close();
-      await aFunction(aWindow);
-      await BrowserTestUtils.closeWindow(aWindow);
-
-      if (detector) {
-        await detector.close();
-        detector = null;
-      }
-
-      if (aPrefs) {
-        await SpecialPowers.popPrefEnv();
-      }
-      resolve();
-    }, reject);
-  });
-}
-
-async function finishTest() {
-  log("finishTest()");
-  SimpleTest.finish();
-}
-
-async function addIFrame(aWindow, aUrl, aId) {
-  let monitor = new ChannelUnifier();
-  monitor.init();
-
-  let loadIFramePromise = new Promise(resolve => {
-    let onStopRequest = aSubject => {
-      let channel = aSubject.QueryInterface(Ci.nsIHttpChannel);
-      if (channel.name == aUrl) {
-        try {
-          is(channel.responseStatus, 200, "the channel is loaded");
-          resolve(true);
-        } catch (e) {
-          is(e.name, "NS_ERROR_NOT_AVAILABLE", "the channel is canceled");
-          resolve(false);
-        } finally {
-          SpecialPowers.removeObserver(onStopRequest, "http-on-stop-request");
-        }
-      }
-    };
-    SpecialPowers.addObserver(onStopRequest, "http-on-stop-request");
-  });
-
-  let loadIFrameContentPromise = ContentTask.spawn(aWindow.gBrowser.selectedBrowser,
-                                                   [aUrl, aId],
-                                                   async function([url, id]) {
-    return new Promise((resolve, err) => {
-      let iframe = content.document.createElement("iframe");
-      iframe.id = id;
-      iframe.src = url;
-
-      // onload/onerror are triggered only when the iframe is not blocked
-      iframe.dataset.touched = "no";
-      iframe.onload = function() {
-        this.dataset.touched = "yes";
-        resolve();
-      };
-      content.document.body.appendChild(iframe);
-    });
-  });
-
-  let isIFrameLoaded = await loadIFramePromise; // wait until page load finish
-  if (isIFrameLoaded) {
-    // make sure all content are also loaded, this promise will never be resolved
-    // for the case it's blocked.
-    await loadIFrameContentPromise;
-  }
-
-  monitor.close();
-  return isIFrameLoaded;
-}
-
-async function testFastBlock(aWindow) {
-  log("testFastBlock");
-
-  let browser = aWindow.gBrowser.selectedBrowser;
-  let results = await ContentTask.spawn(browser, {}, () => {
-    let iframe = content.document.getElementById("fastIFrame").contentDocument;
-    return {
-      goodScript: content.document.getElementById("goodScript").dataset.touched,
-      fastScript: content.document.getElementById("fastScript").dataset.touched,
-      slowScript: content.document.getElementById("slowScript").dataset.touched,
-      fastIFrame: content.document.getElementById("fastIFrame").dataset.touched,
-      goodIFrameScript: iframe.getElementById("goodIFrameScript").dataset.touched,
-      fastIFrameScript: iframe.getElementById("fastIFrameScript").dataset.touched,
-      slowIFrameScript: iframe.getElementById("slowIFrameScript").dataset.touched,
-      slowIFrame: content.document.getElementById("slowIFrame").dataset.touched,
-      redirectScript: content.document.getElementById("redirectScript").dataset.touched,
-      numTrackersFound: content.document.numTrackersFound,
-      numTrackersBlocked: content.document.numTrackersBlocked,
-    };
-  });
-
-  let { goodScript,
-        fastScript,
-        slowScript,
-        fastIFrame,
-        slowIFrame,
-        goodIFrameScript,
-        fastIFrameScript,
-        slowIFrameScript,
-        redirectScript,
-        numTrackersFound,
-        numTrackersBlocked,
-  } = results;
-
-  is(goodScript, "yes", "is not a tracker");
-  is(fastScript, "yes", "is a fast tracker");
-  is(slowScript, "no", "is a blocked tracker");
-  is(fastIFrame, "yes", "fast iframe loaded");
-  is(slowIFrame, "not sure", "slow tracking iframe blocked");
-  is(goodIFrameScript, "yes", "is not a tracker");
-  is(fastIFrameScript, "yes", "is a fast tracker");
-  is(slowIFrameScript, "no", "is a blocked tracker");
-  is(redirectScript, "no", "redirect to blocked tracker");
-  is(numTrackersFound, 7, "7 trackers found");
-  is(numTrackersBlocked, 4, "4 tracker blocked");
-
-  let badIFrameLoaded = await addIFrame(aWindow, gBadIFramePage, "badIFrame");
-  ok(badIFrameLoaded, "tracking iframe after load event is loaded");
-
-  results = await ContentTask.spawn(browser, {}, () => {
-    let iframe = content.document.getElementById("badIFrame").contentDocument;
-    return {
-      badIFrame: content.document.getElementById("badIFrame").dataset.touched,
-      goodIFrameScript: iframe.getElementById("goodIFrameScript").dataset.touched,
-      fastIFrameScript: iframe.getElementById("fastIFrameScript").dataset.touched,
-      slowIFrameScript: iframe.getElementById("slowIFrameScript").dataset.touched,
-      numTrackersFound: content.document.numTrackersFound,
-      numTrackersBlocked: content.document.numTrackersBlocked,
-    };
-  });
-
-  is(results.badIFrame, "yes", "post-load tracking iframe loaded");
-  is(results.goodIFrameScript, "yes", "is not a tracker");
-  is(results.fastIFrameScript, "yes", "is a loaded tracker");
-  is(results.slowIFrameScript, "yes", "is a loaded tracker");
-
-  is(results.numTrackersFound, 10, "10 trackers found");
-  is(results.numTrackersBlocked, 4, "4 tracker blocked");
-
-  let goodIFrameLoaded = await addIFrame(aWindow, gGoodIFramePage, "goodIFrame");
-  ok(goodIFrameLoaded, "non tracking iframe is loaded");
-
-  results = await ContentTask.spawn(browser, {}, () => {
-    let iframe = content.document.getElementById("goodIFrame").contentDocument;
-    return {
-      goodIFrame: content.document.getElementById("goodIFrame").dataset.touched,
-      goodIFrameScript: iframe.getElementById("goodIFrameScript").dataset.touched,
-      fastIFrameScript: iframe.getElementById("fastIFrameScript").dataset.touched,
-      slowIFrameScript: iframe.getElementById("slowIFrameScript").dataset.touched,
-      numTrackersFound: content.document.numTrackersFound,
-      numTrackersBlocked: content.document.numTrackersBlocked,
-    };
-  });
-
-  is(results.goodIFrame, "yes", "non tracking iframe is loaded");
-  is(results.goodIFrameScript, "yes", "is not a tracker");
-  is(results.fastIFrameScript, "yes", "is a loaded tracker");
-  is(results.slowIFrameScript, "yes", "is a loaded tracker");
-
-  is(results.numTrackersFound, 12, "12 trackers found");
-  is(results.numTrackersBlocked, 4, "4 tracker blocked");
-}
-
-async function testNoFastBlock(aWindow) {
-  log("testNoFastBlock");
-  let browser = aWindow.gBrowser.selectedBrowser;
-  let results = await ContentTask.spawn(browser, {}, () => {
-    let fastIframe = content.document.getElementById("fastIFrame").contentDocument;
-    let slowIframe = content.document.getElementById("slowIFrame").contentDocument;
-    return {
-      goodScript: content.document.getElementById("goodScript").dataset.touched,
-      fastScript: content.document.getElementById("fastScript").dataset.touched,
-      slowScript: content.document.getElementById("slowScript").dataset.touched,
-      fastIFrame: content.document.getElementById("fastIFrame").dataset.touched,
-      goodIFrameScript: fastIframe.getElementById("goodIFrameScript").dataset.touched,
-      fastIFrameScript: fastIframe.getElementById("fastIFrameScript").dataset.touched,
-      slowIFrameScript: fastIframe.getElementById("slowIFrameScript").dataset.touched,
-      slowIFrame: content.document.getElementById("slowIFrame").dataset.touched,
-      goodSlowIFrameScript: slowIframe.getElementById("goodSlowIFrameScript").dataset.touched,
-      fastSlowIFrameScript: slowIframe.getElementById("fastSlowIFrameScript").dataset.touched,
-      slowSlowIFrameScript: slowIframe.getElementById("slowSlowIFrameScript").dataset.touched,
-      numTrackersFound: content.document.numTrackersFound,
-      numTrackersBlocked: content.document.numTrackersBlocked,
-    };
-  });
-
-  let { goodScript,
-        fastScript,
-        slowScript,
-        fastIFrame,
-        goodIFrameScript,
-        fastIFrameScript,
-        slowIFrameScript,
-        slowIFrame,
-        goodSlowIFrameScript,
-        fastSlowIFrameScript,
-        slowSlowIFrameScript,
-        numTrackersFound,
-        numTrackersBlocked,
-  } = results;
-
-  is(goodScript, "yes", "is not a tracker");
-  is(fastScript, "yes", "FastBlock is disabled");
-  is(slowScript, "yes", "FastBlock is disabled");
-  is(fastIFrame, "yes", "fast iframe loaded");
-  is(goodIFrameScript, "yes", "is not a tracker");
-  is(fastIFrameScript, "yes", "FastBlock is disabled");
-  is(slowIFrameScript, "yes", "FastBlock is disabled");
-  is(slowIFrame, "yes", "FastBlock is disabled");
-  is(goodSlowIFrameScript, "yes", "is not a tracker");
-  is(fastSlowIFrameScript, "yes", "FastBlock is disabled");
-  is(slowSlowIFrameScript, "yes", "FastBlock is disabled");
-  is(numTrackersFound, 9, "9 trackers found");
-  is(numTrackersBlocked, 0, "no tracker blocked");
-
-  let iframeLoaded = await addIFrame(aWindow, gBadIFramePage, "badIFrame");
-  ok(iframeLoaded, "tracking iframe is loaded");
-
-  results = await ContentTask.spawn(browser, log, (LOG) => {
-    let iframe = content.document.getElementById("badIFrame").contentDocument;
-    return {
-      badIFrame: content.document.getElementById("badIFrame").dataset.touched,
-      goodIFrameScript: iframe.getElementById("goodIFrameScript").dataset.touched,
-      fastIFrameScript: iframe.getElementById("fastIFrameScript").dataset.touched,
-      slowIFrameScript: iframe.getElementById("slowIFrameScript").dataset.touched,
-      numTrackersFound: content.document.numTrackersFound,
-      numTrackersBlocked: content.document.numTrackersBlocked,
-    };
-  });
-
-  is(results.badIFrame, "yes", "FastBlock is disabled");
-  is(results.goodIFrameScript, "yes", "is not a tracker");
-  is(results.fastIFrameScript, "yes", "FastBlock is disabled");
-  is(results.slowIFrameScript, "yes", "FastBlock is disabled");
-
-  is(results.numTrackersFound, 12, "12 trackers found");
-  is(results.numTrackersBlocked, 0, "0 tracker blocked");
-
-  let goodIFrameLoaded = await addIFrame(aWindow, gGoodIFramePage, "goodIFrame");
-  ok(goodIFrameLoaded, "non tracking iframe is loaded");
-
-  results = await ContentTask.spawn(browser, {}, () => {
-    let iframe = content.document.getElementById("goodIFrame").contentDocument;
-    return {
-      goodIFrame: content.document.getElementById("goodIFrame").dataset.touched,
-      goodIFrameScript: iframe.getElementById("goodIFrameScript").dataset.touched,
-      fastIFrameScript: iframe.getElementById("fastIFrameScript").dataset.touched,
-      slowIFrameScript: iframe.getElementById("slowIFrameScript").dataset.touched,
-      numTrackersFound: content.document.numTrackersFound,
-      numTrackersBlocked: content.document.numTrackersBlocked,
-    };
-  });
-
-  is(results.goodIFrame, "yes", "non tracking iframe is loaded");
-  is(results.goodIFrameScript, "yes", "is not a tracker");
-  is(results.fastIFrameScript, "yes", "FastBlock is disabled");
-  is(results.slowIFrameScript, "yes", "FastBlock is disabled");
-
-  is(results.numTrackersFound, 14, "14 trackers found");
-  is(results.numTrackersBlocked, 0, "0 tracker blocked");
-}
-
-async function testPrefsSwitch() {
-  // FastBlock ON
-  await runTest({
-    "set": [
-      ["browser.fastblock.enabled", true],
-    ]}, testFastBlock, 6);
-
-  // FastBlock OFF
-  await runTest({
-    "set": [
-      ["browser.fastblock.enabled", false],
-      ["browser.fastblock.timeout", 1],
-    ]}, testNoFastBlock, 0);
-
-  // FastBlock OFF
-  await runTest({
-    "set": [
-      ["browser.fastblock.enabled", false],
-      ["browser.fastblock.timeout", 1],
-    ]}, testNoFastBlock, 0);
-}
-
-async function test() {
-  await setupTest();
-
-  await runTest(null,
-                testFastBlock,
-                6);
-
-  // A long-timeout that FastBlock never happens
-  await runTest({ "set": [["browser.fastblock.timeout", gInfiniteTimeout]]},
-                testNoFastBlock, 0);
-
-  await testPrefsSwitch();
-
-  await finishTest();
-}
-
-test();
-
-</script>
-
-</pre>
-</body>
-</html>