Bug 1564801 - Consolidate b/b/c/test/trackingUI and b/b/c/test/siteProtections into b/b/c/test/protectionsUI. r=nhnt11
authoralexuwa <uwaobayagbona@gmail.com>
Tue, 31 Mar 2020 08:05:22 +0000
changeset 521235 8d384e9731ded2408c5274089d1f694ec24ce44c
parent 521234 5267e6e2015da0645ee05ad8a200a9f851b4afdd
child 521236 69b4f7dc597324967df947f7953dcbd5c8fd8769
push id111570
push usershindli@mozilla.com
push dateTue, 31 Mar 2020 08:11:03 +0000
treeherderautoland@8d384e9731de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnhnt11
bugs1564801
milestone76.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 1564801 - Consolidate b/b/c/test/trackingUI and b/b/c/test/siteProtections into b/b/c/test/protectionsUI. r=nhnt11 Differential Revision: https://phabricator.services.mozilla.com/D68073
browser/base/content/moz.build
browser/base/content/test/protectionsUI/.eslintrc.js
browser/base/content/test/protectionsUI/benignPage.html
browser/base/content/test/protectionsUI/browser.ini
browser/base/content/test/protectionsUI/browser_protectionsUI.js
browser/base/content/test/protectionsUI/browser_protectionsUI_3.js
browser/base/content/test/protectionsUI/browser_protectionsUI_animation.js
browser/base/content/test/protectionsUI/browser_protectionsUI_animation_2.js
browser/base/content/test/protectionsUI/browser_protectionsUI_background_tabs.js
browser/base/content/test/protectionsUI/browser_protectionsUI_categories.js
browser/base/content/test/protectionsUI/browser_protectionsUI_cookies_subview.js
browser/base/content/test/protectionsUI/browser_protectionsUI_cryptominers.js
browser/base/content/test/protectionsUI/browser_protectionsUI_fetch.js
browser/base/content/test/protectionsUI/browser_protectionsUI_fingerprinters.js
browser/base/content/test/protectionsUI/browser_protectionsUI_milestones.js
browser/base/content/test/protectionsUI/browser_protectionsUI_open_preferences.js
browser/base/content/test/protectionsUI/browser_protectionsUI_pbmode_exceptions.js
browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js
browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js
browser/base/content/test/protectionsUI/browser_protectionsUI_socialtracking.js
browser/base/content/test/protectionsUI/browser_protectionsUI_state.js
browser/base/content/test/protectionsUI/browser_protectionsUI_state_reset.js
browser/base/content/test/protectionsUI/browser_protectionsUI_telemetry.js
browser/base/content/test/protectionsUI/browser_protectionsUI_trackers_subview.js
browser/base/content/test/protectionsUI/containerPage.html
browser/base/content/test/protectionsUI/cookiePage.html
browser/base/content/test/protectionsUI/cookieServer.sjs
browser/base/content/test/protectionsUI/cookieSetterPage.html
browser/base/content/test/protectionsUI/embeddedPage.html
browser/base/content/test/protectionsUI/file_protectionsUI_fetch.html
browser/base/content/test/protectionsUI/file_protectionsUI_fetch.js
browser/base/content/test/protectionsUI/file_protectionsUI_fetch.js^headers^
browser/base/content/test/protectionsUI/head.js
browser/base/content/test/protectionsUI/trackingAPI.js
browser/base/content/test/protectionsUI/trackingPage.html
browser/base/content/test/siteProtections/.eslintrc.js
browser/base/content/test/siteProtections/browser.ini
browser/base/content/test/siteProtections/browser_protections_UI.js
browser/base/content/test/siteProtections/browser_protections_UI_milestones.js
browser/base/content/test/siteProtections/head.js
browser/base/content/test/trackingUI/.eslintrc.js
browser/base/content/test/trackingUI/benignPage.html
browser/base/content/test/trackingUI/browser.ini
browser/base/content/test/trackingUI/browser_trackingUI_3.js
browser/base/content/test/trackingUI/browser_trackingUI_animation.js
browser/base/content/test/trackingUI/browser_trackingUI_animation_2.js
browser/base/content/test/trackingUI/browser_trackingUI_background_tabs.js
browser/base/content/test/trackingUI/browser_trackingUI_categories.js
browser/base/content/test/trackingUI/browser_trackingUI_cookies_subview.js
browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
browser/base/content/test/trackingUI/browser_trackingUI_fetch.js
browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
browser/base/content/test/trackingUI/browser_trackingUI_open_preferences.js
browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
browser/base/content/test/trackingUI/browser_trackingUI_shield_visibility.js
browser/base/content/test/trackingUI/browser_trackingUI_socialtracking.js
browser/base/content/test/trackingUI/browser_trackingUI_state.js
browser/base/content/test/trackingUI/browser_trackingUI_state_reset.js
browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
browser/base/content/test/trackingUI/browser_trackingUI_trackers_subview.js
browser/base/content/test/trackingUI/containerPage.html
browser/base/content/test/trackingUI/cookiePage.html
browser/base/content/test/trackingUI/cookieServer.sjs
browser/base/content/test/trackingUI/cookieSetterPage.html
browser/base/content/test/trackingUI/embeddedPage.html
browser/base/content/test/trackingUI/file_trackingUI_fetch.html
browser/base/content/test/trackingUI/file_trackingUI_fetch.js
browser/base/content/test/trackingUI/file_trackingUI_fetch.js^headers^
browser/base/content/test/trackingUI/head.js
browser/base/content/test/trackingUI/trackingAPI.js
browser/base/content/test/trackingUI/trackingPage.html
browser/base/moz.build
browser/components/protections/test/browser/browser.ini
testing/runtimes/manifest-runtimes-unix.json
toolkit/components/antitracking/test/browser/browser.ini
toolkit/components/antitracking/test/browser/browser_storageAccessThirdPartyChecks.js
--- a/browser/base/content/moz.build
+++ b/browser/base/content/moz.build
@@ -95,17 +95,17 @@ with Files("test/tabcrashed/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
 with Files("test/tabs/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
 with Files("test/touch/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
-with Files("test/trackingUI/**"):
+with Files("test/protectionsUI/**"):
     BUG_COMPONENT = ("Firefox", "Protections UI")
 
 with Files("test/webextensions/**"):
     BUG_COMPONENT = ("WebExtensions", "Untriaged")
 
 with Files("test/webrtc/**"):
     BUG_COMPONENT = ("Core", "WebRTC")
 
rename from browser/base/content/test/siteProtections/.eslintrc.js
rename to browser/base/content/test/protectionsUI/.eslintrc.js
rename from browser/base/content/test/trackingUI/benignPage.html
rename to browser/base/content/test/protectionsUI/benignPage.html
rename from browser/base/content/test/siteProtections/browser.ini
rename to browser/base/content/test/protectionsUI/browser.ini
--- a/browser/base/content/test/siteProtections/browser.ini
+++ b/browser/base/content/test/protectionsUI/browser.ini
@@ -1,7 +1,39 @@
 [DEFAULT]
+tags = trackingprotection
 support-files =
   head.js
-  !/browser/base/content/test/trackingUI/trackingPage.html
+  benignPage.html
+  containerPage.html
+  cookiePage.html
+  cookieSetterPage.html
+  cookieServer.sjs
+  embeddedPage.html
+  trackingAPI.js
+  trackingPage.html
 
-[browser_protections_UI.js]
-[browser_protections_UI_milestones.js]
+[browser_protectionsUI.js]
+[browser_protectionsUI_3.js]
+[browser_protectionsUI_animation.js]
+[browser_protectionsUI_animation_2.js]
+[browser_protectionsUI_background_tabs.js]
+[browser_protectionsUI_categories.js]
+[browser_protectionsUI_cookies_subview.js]
+[browser_protectionsUI_cryptominers.js]
+[browser_protectionsUI_fetch.js]
+support-files =
+  file_protectionsUI_fetch.html
+  file_protectionsUI_fetch.js
+  file_protectionsUI_fetch.js^headers^
+[browser_protectionsUI_fingerprinters.js]
+[browser_protectionsUI_milestones.js]
+[browser_protectionsUI_open_preferences.js]
+[browser_protectionsUI_pbmode_exceptions.js]
+[browser_protectionsUI_report_breakage.js]
+skip-if = debug || asan # Bug 1546797
+[browser_protectionsUI_socialtracking.js]
+skip-if = fission # Bug 1614350
+[browser_protectionsUI_shield_visibility.js]
+[browser_protectionsUI_state.js]
+[browser_protectionsUI_state_reset.js]
+[browser_protectionsUI_telemetry.js]
+[browser_protectionsUI_trackers_subview.js]
rename from browser/base/content/test/siteProtections/browser_protections_UI.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI.js
--- a/browser/base/content/test/siteProtections/browser_protections_UI.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /* Basic UI tests for the protections panel */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 
 ChromeUtils.defineModuleGetter(
   this,
   "ContentBlockingAllowList",
   "resource://gre/modules/ContentBlockingAllowList.jsm"
 );
 
 ChromeUtils.import(
rename from browser/base/content/test/trackingUI/browser_trackingUI_3.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_3.js
rename from browser/base/content/test/trackingUI/browser_trackingUI_animation.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_animation.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_animation.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_animation.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const ANIMATIONS_PREF = "toolkit.cosmeticAnimations.enabled";
 const DTSCBN_PREF = "dom.testing.sync-content-blocking-notifications";
 
 // Test that the shield icon animation can be controlled by the cosmetic
 // animations pref and that one of the icons is visible in each case.
 add_task(async function testShieldAnimation() {
   await UrlClassifierTestUtils.addTestTrackers();
rename from browser/base/content/test/trackingUI/browser_trackingUI_animation_2.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_animation_2.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_animation_2.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_animation_2.js
@@ -4,21 +4,21 @@
  * block when loading tabs and switching between tabs.
  * See also Bug 1175858.
  */
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TP_PB_PREF = "privacy.trackingprotection.pbmode.enabled";
 const NCB_PREF = "network.cookie.cookieBehavior";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const COOKIE_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/cookiePage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/cookiePage.html";
 const DTSCBN_PREF = "dom.testing.sync-content-blocking-notifications";
 
 requestLongerTimeout(2);
 
 registerCleanupFunction(function() {
   UrlClassifierTestUtils.cleanupTestTrackers();
   Services.prefs.clearUserPref(TP_PREF);
   Services.prefs.clearUserPref(TP_PB_PREF);
rename from browser/base/content/test/trackingUI/browser_trackingUI_background_tabs.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_background_tabs.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_background_tabs.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_background_tabs.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 
 add_task(async function testBackgroundTabs() {
   info(
     "Testing receiving and storing content blocking events in non-selected tabs."
   );
 
rename from browser/base/content/test/trackingUI/browser_trackingUI_categories.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_categories.js
rename from browser/base/content/test/trackingUI/browser_trackingUI_cookies_subview.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_cookies_subview.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_cookies_subview.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_cookies_subview.js
@@ -1,19 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /* eslint-disable mozilla/no-arbitrary-setTimeout */
 
 "use strict";
 
 const COOKIE_PAGE =
-  "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
+  "http://not-tracking.example.com/browser/browser/base/content/test/protectionsUI/cookiePage.html";
 const CONTAINER_PAGE =
-  "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/containerPage.html";
+  "http://not-tracking.example.com/browser/browser/base/content/test/protectionsUI/containerPage.html";
 
 const TPC_PREF = "network.cookie.cookieBehavior";
 
 add_task(async function setup() {
   await UrlClassifierTestUtils.addTestTrackers();
 
   registerCleanupFunction(() => {
     UrlClassifierTestUtils.cleanupTestTrackers();
@@ -55,17 +55,17 @@ async function assertSitesListed(testCas
     gBrowser,
   });
   let [tab] = await Promise.all([
     promise,
     waitForContentBlockingEvent(contentBlockingEventCount),
   ]);
   let browser = tab.linkedBrowser;
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-cookies"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
@@ -291,17 +291,17 @@ add_task(async function testCookiesSubVi
   );
 
   let promise = BrowserTestUtils.openNewForegroundTab({
     url: COOKIE_PAGE,
     gBrowser,
   });
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent(3)]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-cookies"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
@@ -394,17 +394,17 @@ add_task(async function testCookiesSubVi
   await SpecialPowers.spawn(browser, [], function() {
     content.postMessage("window-open", "*");
   });
   await Promise.all([windowCreated, permChanged]);
 
   await new Promise(resolve => waitForFocus(resolve, popup));
   await new Promise(resolve => waitForFocus(resolve, window));
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-cookies"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
@@ -464,17 +464,17 @@ add_task(async function testCookiesSubVi
   );
 
   let promise = BrowserTestUtils.openNewForegroundTab({
     url: CONTAINER_PAGE,
     gBrowser,
   });
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent(3)]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-cookies"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
rename from browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_cryptominers.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_cryptominers.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_cryptominers.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const CM_PROTECTION_PREF = "privacy.trackingprotection.cryptomining.enabled";
 let cmHistogram;
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [
         "urlclassifier.features.cryptomining.blacklistHosts",
@@ -118,17 +118,17 @@ async function testSubview(hasException)
   }
 
   promise = waitForContentBlockingEvent();
   await SpecialPowers.spawn(tab.linkedBrowser, [], function() {
     content.postMessage("cryptomining", "*");
   });
   await promise;
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-cryptominers"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
rename from browser/base/content/test/trackingUI/browser_trackingUI_fetch.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_fetch.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_fetch.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_fetch.js
@@ -1,10 +1,10 @@
 const URL =
-  "http://mochi.test:8888/browser/browser/base/content/test/trackingUI/file_trackingUI_fetch.html";
+  "http://mochi.test:8888/browser/browser/base/content/test/protectionsUI/file_protectionsUI_fetch.html";
 
 add_task(async function test_fetch() {
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.trackingprotection.enabled", true]],
   });
 
   await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, async function(
     newTabBrowser
rename from browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_fingerprinters.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_fingerprinters.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_fingerprinters.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const FP_PROTECTION_PREF = "privacy.trackingprotection.fingerprinting.enabled";
 let fpHistogram;
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [
         "urlclassifier.features.fingerprinting.blacklistHosts",
@@ -189,17 +189,17 @@ async function testSubview(hasException)
   }
 
   promise = waitForContentBlockingEvent();
   await SpecialPowers.spawn(tab.linkedBrowser, [], function() {
     content.postMessage("fingerprinting", "*");
   });
   await promise;
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-fingerprinters"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
rename from browser/base/content/test/siteProtections/browser_protections_UI_milestones.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_milestones.js
rename from browser/base/content/test/trackingUI/browser_trackingUI_open_preferences.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_open_preferences.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_open_preferences.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_open_preferences.js
@@ -1,19 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TPC_PREF = "network.cookie.cookieBehavior";
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const COOKIE_PAGE =
-  "http://tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
+  "http://tracking.example.com/browser/browser/base/content/test/protectionsUI/cookiePage.html";
 
 async function waitAndAssertPreferencesShown(_spotlight, identityPopup) {
   await BrowserTestUtils.waitForEvent(
     identityPopup
       ? gIdentityHandler._identityPopup
       : gProtectionsHandler._protectionsPopup,
     "popuphidden"
   );
@@ -61,17 +61,17 @@ add_task(async function testOpenPreferen
   let promise = BrowserTestUtils.openNewForegroundTab({
     url: TRACKING_PAGE,
     gBrowser,
   });
 
   // Wait for 2 content blocking events - one for the load and one for the tracker.
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent(2)]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-tracking-protection"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
@@ -113,17 +113,17 @@ add_task(async function testOpenPreferen
   let promise = BrowserTestUtils.openNewForegroundTab({
     url: COOKIE_PAGE,
     gBrowser,
   });
 
   // Wait for 2 content blocking events - one for the load and one for the tracker.
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent(2)]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-cookies"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
rename from browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_pbmode_exceptions.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_pbmode_exceptions.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_pbmode_exceptions.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test that sites added to the Tracking Protection whitelist in private
 // browsing mode don't persist once the private browsing window closes.
 
 const TP_PB_PREF = "privacy.trackingprotection.enabled";
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const DTSCBN_PREF = "dom.testing.sync-content-blocking-notifications";
 var TrackingProtection = null;
 var gProtectionsHandler = null;
 var browser = null;
 
 registerCleanupFunction(function() {
   Services.prefs.clearUserPref(TP_PB_PREF);
   Services.prefs.clearUserPref(DTSCBN_PREF);
rename from browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js
@@ -1,19 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 const COOKIE_PAGE =
-  "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
+  "http://not-tracking.example.com/browser/browser/base/content/test/protectionsUI/cookiePage.html";
 
 const CM_PREF = "privacy.trackingprotection.cryptomining.enabled";
 const FP_PREF = "privacy.trackingprotection.fingerprinting.enabled";
 const TP_PREF = "privacy.trackingprotection.enabled";
 const CB_PREF = "network.cookie.cookieBehavior";
 
 const PREF_REPORT_BREAKAGE_URL = "browser.contentblocking.reportBreakage.url";
 
@@ -62,17 +62,17 @@ add_task(async function setup() {
 
 add_task(async function testReportBreakageCancel() {
   Services.prefs.setBoolPref(TP_PREF, true);
 
   await BrowserTestUtils.withNewTab(TRACKING_PAGE, async function() {
     await TestUtils.waitForCondition(() =>
       gProtectionsHandler._protectionsPopup.hasAttribute("blocking")
     );
-    await openProtectionsPopup();
+    await openProtectionsPanel();
 
     let siteNotWorkingButton = document.getElementById(
       "protections-popup-tp-switch-breakage-link"
     );
     ok(
       BrowserTestUtils.is_visible(siteNotWorkingButton),
       "site not working button is visible"
     );
@@ -116,17 +116,17 @@ add_task(async function testReportBreaka
 
   let url = TRACKING_PAGE + "?a=b&1=abc&unicode=🦊";
 
   await BrowserTestUtils.withNewTab(url, async browser => {
     let loaded = BrowserTestUtils.browserLoaded(browser, false);
     gProtectionsHandler.disableForCurrentPage();
     await loaded;
 
-    await openProtectionsPopup();
+    await openProtectionsPanel();
 
     let siteFixedButton = document.getElementById(
       "protections-popup-tp-switch-breakage-fixed-link"
     );
     ok(
       BrowserTestUtils.is_visible(siteFixedButton),
       "site fixed button is visible"
     );
@@ -150,17 +150,17 @@ add_task(async function testReportBreaka
     gProtectionsHandler.enableForCurrentPage(false);
   });
 
   Services.prefs.clearUserPref(TP_PREF);
 });
 
 add_task(async function testNoTracking() {
   await BrowserTestUtils.withNewTab(BENIGN_PAGE, async function() {
-    await openProtectionsPopup();
+    await openProtectionsPanel();
 
     let siteNotWorkingButton = document.getElementById(
       "protections-popup-tp-switch-breakage-link"
     );
     ok(
       BrowserTestUtils.is_hidden(siteNotWorkingButton),
       "site not working button is not visible"
     );
@@ -237,17 +237,17 @@ add_task(async function testCM() {
     await openAndTestReportBreakage(TRACKING_PAGE, "cryptomining", true);
   });
 
   Services.prefs.clearUserPref(CM_PREF);
   Services.prefs.clearUserPref(CB_PREF);
 });
 
 async function openAndTestReportBreakage(url, tags, error = false) {
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let siteNotWorkingButton = document.getElementById(
     "protections-popup-tp-switch-breakage-link"
   );
   ok(
     BrowserTestUtils.is_visible(siteNotWorkingButton),
     "site not working button is visible"
   );
rename from browser/base/content/test/trackingUI/browser_trackingUI_shield_visibility.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js
rename from browser/base/content/test/trackingUI/browser_trackingUI_socialtracking.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_socialtracking.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_socialtracking.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_socialtracking.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const TRACKING_PAGE =
-  "http://example.com/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://example.com/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 
 const ST_PROTECTION_PREF = "privacy.trackingprotection.socialtracking.enabled";
 const ST_BLOCK_COOKIES_PREF = "privacy.socialtracking.block_cookies.enabled";
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [ST_BLOCK_COOKIES_PREF, true],
@@ -118,17 +118,17 @@ async function testSubview(hasException)
   }
 
   promise = waitForContentBlockingEvent();
   await SpecialPowers.spawn(tab.linkedBrowser, [], function() {
     content.postMessage("socialtracking", "*");
   });
   await promise;
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-socialblock"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
@@ -194,17 +194,17 @@ async function testCategoryItem(blockLoa
   Services.prefs.setBoolPref(ST_BLOCK_COOKIES_PREF, false);
 
   let promise = BrowserTestUtils.openNewForegroundTab({
     url: TRACKING_PAGE,
     gBrowser,
   });
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-socialblock"
   );
 
   let noTrackersDetectedDesc = document.getElementById(
     "protections-popup-no-trackers-found-description"
   );
@@ -244,17 +244,17 @@ async function testCategoryItem(blockLoa
   Services.prefs.setBoolPref(ST_BLOCK_COOKIES_PREF, true);
 
   promise = BrowserTestUtils.openNewForegroundTab({
     url: TRACKING_PAGE,
     gBrowser,
   });
   [tab] = await Promise.all([promise, waitForContentBlockingEvent()]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   ok(!categoryItem.hasAttribute("uidisabled"), "Item shouldn't be uidisabled");
 
   ok(categoryItem.classList.contains("blocked"), "Category marked as blocked");
   ok(
     categoryItem.classList.contains("notFound"),
     "Category marked as not found"
   );
rename from browser/base/content/test/trackingUI/browser_trackingUI_state.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_state.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_state.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_state.js
@@ -14,21 +14,21 @@
  * See also Bugs 1175327, 1043801, 1178985
  */
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TP_PB_PREF = "privacy.trackingprotection.pbmode.enabled";
 const TPC_PREF = "network.cookie.cookieBehavior";
 const DTSCBN_PREF = "dom.testing.sync-content-blocking-notifications";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const COOKIE_PAGE =
-  "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
+  "http://not-tracking.example.com/browser/browser/base/content/test/protectionsUI/cookiePage.html";
 var gProtectionsHandler = null;
 var TrackingProtection = null;
 var ThirdPartyCookies = null;
 var tabbrowser = null;
 var gTrackingPageURL = TRACKING_PAGE;
 
 const sBrandBundle = Services.strings.createBundle(
   "chrome://branding/locale/brand.properties"
rename from browser/base/content/test/trackingUI/browser_trackingUI_state_reset.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_state_reset.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_state_reset.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_state_reset.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 const ABOUT_PAGE = "about:preferences";
 
 /* This asserts that the content blocking event state is correctly reset
  * when navigating to a new location, and that the user is correctly
  * reset when switching between tabs. */
 
 add_task(async function testResetOnLocationChange() {
   Services.prefs.setBoolPref(TP_PREF, true);
rename from browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_telemetry.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_telemetry.js
@@ -1,18 +1,18 @@
 /*
  * Test telemetry for Tracking Protection
  */
 
 const PREF = "privacy.trackingprotection.enabled";
 const DTSCBN_PREF = "dom.testing.sync-content-blocking-notifications";
 const BENIGN_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/benignPage.html";
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 
 /**
  * Enable local telemetry recording for the duration of the tests.
  */
 var oldCanRecord = Services.telemetry.canRecordExtended;
 Services.telemetry.canRecordExtended = true;
 registerCleanupFunction(function() {
   UrlClassifierTestUtils.cleanupTestTrackers();
rename from browser/base/content/test/trackingUI/browser_trackingUI_trackers_subview.js
rename to browser/base/content/test/protectionsUI/browser_protectionsUI_trackers_subview.js
--- a/browser/base/content/test/trackingUI/browser_trackingUI_trackers_subview.js
+++ b/browser/base/content/test/protectionsUI/browser_protectionsUI_trackers_subview.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );
 
 const TRACKING_PAGE =
-  "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
+  "http://tracking.example.org/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 
 add_task(async function setup() {
   await UrlClassifierTestUtils.addTestTrackers();
 
   registerCleanupFunction(() => {
     UrlClassifierTestUtils.cleanupTestTrackers();
@@ -25,17 +25,17 @@ async function assertSitesListed(blocked
   let promise = BrowserTestUtils.openNewForegroundTab({
     url: TRACKING_PAGE,
     gBrowser,
   });
 
   // Wait for 2 content blocking events - one for the load and one for the tracker.
   let [tab] = await Promise.all([promise, waitForContentBlockingEvent(2)]);
 
-  await openProtectionsPopup();
+  await openProtectionsPanel();
 
   let categoryItem = document.getElementById(
     "protections-popup-category-tracking-protection"
   );
 
   // Explicitly waiting for the category item becoming visible.
   await TestUtils.waitForCondition(() => {
     return BrowserTestUtils.is_visible(categoryItem);
rename from browser/base/content/test/trackingUI/containerPage.html
rename to browser/base/content/test/protectionsUI/containerPage.html
--- a/browser/base/content/test/trackingUI/containerPage.html
+++ b/browser/base/content/test/protectionsUI/containerPage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
 <body>
-  <iframe src="http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/embeddedPage.html"></iframe>
+  <iframe src="http://not-tracking.example.com/browser/browser/base/content/test/protectionsUI/embeddedPage.html"></iframe>
 </body>
 </html>
rename from browser/base/content/test/trackingUI/cookiePage.html
rename to browser/base/content/test/protectionsUI/cookiePage.html
--- a/browser/base/content/test/trackingUI/cookiePage.html
+++ b/browser/base/content/test/protectionsUI/cookiePage.html
@@ -3,11 +3,11 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html dir="ltr" xml:lang="en-US" lang="en-US">
   <head>
     <meta charset="utf8">
     <script src="trackingAPI.js" type="text/javascript"></script>
   </head>
   <body>
-    <iframe src="http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs"></iframe>
+    <iframe src="http://trackertest.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs"></iframe>
   </body>
 </html>
rename from browser/base/content/test/trackingUI/cookieServer.sjs
rename to browser/base/content/test/protectionsUI/cookieServer.sjs
rename from browser/base/content/test/trackingUI/cookieSetterPage.html
rename to browser/base/content/test/protectionsUI/cookieSetterPage.html
rename from browser/base/content/test/trackingUI/embeddedPage.html
rename to browser/base/content/test/protectionsUI/embeddedPage.html
--- a/browser/base/content/test/trackingUI/embeddedPage.html
+++ b/browser/base/content/test/protectionsUI/embeddedPage.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
 <body>
-  <iframe src="http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieSetterPage.html"></iframe>
+  <iframe src="http://trackertest.org/browser/browser/base/content/test/protectionsUI/cookieSetterPage.html"></iframe>
 </body>
 </html>
rename from browser/base/content/test/trackingUI/file_trackingUI_fetch.html
rename to browser/base/content/test/protectionsUI/file_protectionsUI_fetch.html
--- a/browser/base/content/test/trackingUI/file_trackingUI_fetch.html
+++ b/browser/base/content/test/protectionsUI/file_protectionsUI_fetch.html
@@ -3,14 +3,14 @@
 <head>
   <meta charset="UTF-8">
   <title>Testing the shield from fetch and XHR</title>
 </head>
 <body>
   <p>Hello there!</p>
   <script type="application/javascript">
     function test_fetch() {
-      let url = "http://trackertest.org/browser/browser/base/content/test/trackingUI/file_trackingUI_fetch.js";
+      let url = "http://trackertest.org/browser/browser/base/content/test/protectionsUI/file_protectionsUI_fetch.js";
       return fetch(url);
     }
   </script>
 </body>
 </html>
rename from browser/base/content/test/trackingUI/file_trackingUI_fetch.js
rename to browser/base/content/test/protectionsUI/file_protectionsUI_fetch.js
rename from browser/base/content/test/trackingUI/file_trackingUI_fetch.js^headers^
rename to browser/base/content/test/protectionsUI/file_protectionsUI_fetch.js^headers^
rename from browser/base/content/test/siteProtections/head.js
rename to browser/base/content/test/protectionsUI/head.js
--- a/browser/base/content/test/siteProtections/head.js
+++ b/browser/base/content/test/protectionsUI/head.js
@@ -9,16 +9,25 @@ XPCOMUtils.defineLazyServiceGetter(
   "@mozilla.org/tracking-db-service;1",
   "nsITrackingDBService"
 );
 
 XPCOMUtils.defineLazyGetter(this, "TRACK_DB_PATH", function() {
   return OS.Path.join(OS.Constants.Path.profileDir, "protections.sqlite");
 });
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "ContentBlockingAllowList",
+  "resource://gre/modules/ContentBlockingAllowList.jsm"
+);
+
+var { UrlClassifierTestUtils } = ChromeUtils.import(
+  "resource://testing-common/UrlClassifierTestUtils.jsm"
+);
 var protectionsPopup = document.getElementById("protections-popup");
 var protectionsPopupMainView = document.getElementById(
   "protections-popup-mainView"
 );
 var protectionsPopupHeader = document.getElementById(
   "protections-popup-mainView-panel-header"
 );
 
@@ -115,8 +124,91 @@ async function waitForAboutProtectionsTa
     await ContentTaskUtils.waitForCondition(() => {
       let bars = content.document.querySelectorAll(".graph-bar");
       return bars.length;
     }, "The graph has been built");
   });
 
   return tab;
 }
+
+/**
+ * Waits for a load (or custom) event to finish in a given tab. If provided
+ * load an uri into the tab.
+ *
+ * @param tab
+ *        The tab to load into.
+ * @param [optional] url
+ *        The url to load, or the current url.
+ * @return {Promise} resolved when the event is handled.
+ * @resolves to the received event
+ * @rejects if a valid load event is not received within a meaningful interval
+ */
+function promiseTabLoadEvent(tab, url) {
+  info("Wait tab event: load");
+
+  function handle(loadedUrl) {
+    if (loadedUrl === "about:blank" || (url && loadedUrl !== url)) {
+      info(`Skipping spurious load event for ${loadedUrl}`);
+      return false;
+    }
+
+    info("Tab event received: load");
+    return true;
+  }
+
+  let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);
+
+  if (url) {
+    BrowserTestUtils.loadURI(tab.linkedBrowser, url);
+  }
+
+  return loaded;
+}
+
+function openIdentityPopup() {
+  let mainView = document.getElementById("identity-popup-mainView");
+  let viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
+  gIdentityHandler._identityBox.click();
+  return viewShown;
+}
+
+function waitForSecurityChange(numChanges = 1, win = null) {
+  if (!win) {
+    win = window;
+  }
+  return new Promise(resolve => {
+    let n = 0;
+    let listener = {
+      onSecurityChange() {
+        n = n + 1;
+        info("Received onSecurityChange event " + n + " of " + numChanges);
+        if (n >= numChanges) {
+          win.gBrowser.removeProgressListener(listener);
+          resolve(n);
+        }
+      },
+    };
+    win.gBrowser.addProgressListener(listener);
+  });
+}
+
+function waitForContentBlockingEvent(numChanges = 1, win = null) {
+  if (!win) {
+    win = window;
+  }
+  return new Promise(resolve => {
+    let n = 0;
+    let listener = {
+      onContentBlockingEvent(webProgress, request, event) {
+        n = n + 1;
+        info(
+          `Received onContentBlockingEvent event: ${event} (${n} of ${numChanges})`
+        );
+        if (n >= numChanges) {
+          win.gBrowser.removeProgressListener(listener);
+          resolve(n);
+        }
+      },
+    };
+    win.gBrowser.addProgressListener(listener);
+  });
+}
rename from browser/base/content/test/trackingUI/trackingAPI.js
rename to browser/base/content/test/protectionsUI/trackingAPI.js
--- a/browser/base/content/test/trackingUI/trackingAPI.js
+++ b/browser/base/content/test/protectionsUI/trackingAPI.js
@@ -15,54 +15,54 @@ function createImage(src) {
 
 onmessage = event => {
   switch (event.data) {
     case "tracking":
       createIframe("https://trackertest.org/");
       break;
     case "socialtracking":
       createIframe(
-        "https://social-tracking.example.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs"
+        "https://social-tracking.example.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs"
       );
       break;
     case "cryptomining":
       createIframe("http://cryptomining.example.com/");
       break;
     case "fingerprinting":
       createIframe("https://fingerprinting.example.com/");
       break;
     case "more-tracking":
       createIframe("https://itisatracker.org/");
       break;
     case "cookie":
       createIframe(
-        "https://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs"
+        "https://trackertest.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs"
       );
       break;
     case "first-party-cookie":
       // Since the content blocking log doesn't seem to get updated for
       // top-level cookies right now, we just create an iframe with the
       // first party domain...
       createIframe(
-        "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookieServer.sjs"
+        "http://not-tracking.example.com/browser/browser/base/content/test/protectionsUI/cookieServer.sjs"
       );
       break;
     case "third-party-cookie":
       createIframe(
-        "https://test1.example.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs"
+        "https://test1.example.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs"
       );
       break;
     case "image":
       createImage(
-        "http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs?type=image-no-cookie"
+        "http://trackertest.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs?type=image-no-cookie"
       );
       break;
     case "window-open":
       window.win = window.open(
-        "http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs",
+        "http://trackertest.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs",
         "_blank",
         "width=100,height=100"
       );
       break;
     case "window-close":
       window.win.close();
       window.win = null;
       break;
rename from browser/base/content/test/trackingUI/trackingPage.html
rename to browser/base/content/test/protectionsUI/trackingPage.html
deleted file mode 100644
--- a/browser/base/content/test/trackingUI/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = {
-  extends: ["plugin:mozilla/browser-test"],
-};
deleted file mode 100644
--- a/browser/base/content/test/trackingUI/browser.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[DEFAULT]
-tags = trackingprotection
-support-files =
-  head.js
-  benignPage.html
-  containerPage.html
-  cookiePage.html
-  cookieSetterPage.html
-  cookieServer.sjs
-  embeddedPage.html
-  trackingAPI.js
-  trackingPage.html
-
-[browser_trackingUI_3.js]
-[browser_trackingUI_animation.js]
-[browser_trackingUI_animation_2.js]
-[browser_trackingUI_background_tabs.js]
-[browser_trackingUI_categories.js]
-[browser_trackingUI_cookies_subview.js]
-[browser_trackingUI_cryptominers.js]
-[browser_trackingUI_fetch.js]
-support-files =
-  file_trackingUI_fetch.html
-  file_trackingUI_fetch.js
-  file_trackingUI_fetch.js^headers^
-[browser_trackingUI_fingerprinters.js]
-[browser_trackingUI_open_preferences.js]
-[browser_trackingUI_pbmode_exceptions.js]
-[browser_trackingUI_report_breakage.js]
-skip-if = debug || asan # Bug 1546797
-[browser_trackingUI_socialtracking.js]
-skip-if = fission # Bug 1614350
-[browser_trackingUI_shield_visibility.js]
-[browser_trackingUI_state.js]
-[browser_trackingUI_state_reset.js]
-[browser_trackingUI_telemetry.js]
-[browser_trackingUI_trackers_subview.js]
deleted file mode 100644
--- a/browser/base/content/test/trackingUI/head.js
+++ /dev/null
@@ -1,99 +0,0 @@
-var { UrlClassifierTestUtils } = ChromeUtils.import(
-  "resource://testing-common/UrlClassifierTestUtils.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "ContentBlockingAllowList",
-  "resource://gre/modules/ContentBlockingAllowList.jsm"
-);
-
-/**
- * Waits for a load (or custom) event to finish in a given tab. If provided
- * load an uri into the tab.
- *
- * @param tab
- *        The tab to load into.
- * @param [optional] url
- *        The url to load, or the current url.
- * @return {Promise} resolved when the event is handled.
- * @resolves to the received event
- * @rejects if a valid load event is not received within a meaningful interval
- */
-function promiseTabLoadEvent(tab, url) {
-  info("Wait tab event: load");
-
-  function handle(loadedUrl) {
-    if (loadedUrl === "about:blank" || (url && loadedUrl !== url)) {
-      info(`Skipping spurious load event for ${loadedUrl}`);
-      return false;
-    }
-
-    info("Tab event received: load");
-    return true;
-  }
-
-  let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);
-
-  if (url) {
-    BrowserTestUtils.loadURI(tab.linkedBrowser, url);
-  }
-
-  return loaded;
-}
-
-function openIdentityPopup() {
-  let mainView = document.getElementById("identity-popup-mainView");
-  let viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
-  gIdentityHandler._identityBox.click();
-  return viewShown;
-}
-
-function openProtectionsPopup() {
-  let mainView = document.getElementById("protections-popup-mainView");
-  let viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
-  gProtectionsHandler._trackingProtectionIconContainer.click();
-  return viewShown;
-}
-
-function waitForSecurityChange(numChanges = 1, win = null) {
-  if (!win) {
-    win = window;
-  }
-  return new Promise(resolve => {
-    let n = 0;
-    let listener = {
-      onSecurityChange() {
-        n = n + 1;
-        info("Received onSecurityChange event " + n + " of " + numChanges);
-        if (n >= numChanges) {
-          win.gBrowser.removeProgressListener(listener);
-          resolve(n);
-        }
-      },
-    };
-    win.gBrowser.addProgressListener(listener);
-  });
-}
-
-function waitForContentBlockingEvent(numChanges = 1, win = null) {
-  if (!win) {
-    win = window;
-  }
-  return new Promise(resolve => {
-    let n = 0;
-    let listener = {
-      onContentBlockingEvent(webProgress, request, event) {
-        n = n + 1;
-        info(
-          `Received onContentBlockingEvent event: ${event} (${n} of ${numChanges})`
-        );
-        if (n >= numChanges) {
-          win.gBrowser.removeProgressListener(listener);
-          resolve(n);
-        }
-      },
-    };
-    win.gBrowser.addProgressListener(listener);
-  });
-}
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -37,29 +37,28 @@ BROWSER_CHROME_MANIFESTS += [
     'content/test/performance/browser.ini',
     'content/test/performance/hidpi/browser.ini',
     'content/test/performance/io/browser.ini',
     'content/test/performance/lowdpi/browser.ini',
     'content/test/permissions/browser.ini',
     'content/test/plugins/browser.ini',
     'content/test/popupNotifications/browser.ini',
     'content/test/popups/browser.ini',
+    'content/test/protectionsUI/browser.ini',
     'content/test/referrer/browser.ini',
     'content/test/sanitize/browser.ini',
     'content/test/sidebar/browser.ini',
     'content/test/siteIdentity/browser.ini',
-    'content/test/siteProtections/browser.ini',
     'content/test/static/browser.ini',
     'content/test/statuspanel/browser.ini',
     'content/test/sync/browser.ini',
     'content/test/tabcrashed/browser.ini',
     'content/test/tabPrompts/browser.ini',
     'content/test/tabs/browser.ini',
     'content/test/touch/browser.ini',
-    'content/test/trackingUI/browser.ini',
     'content/test/webextensions/browser.ini',
     'content/test/webrtc/browser.ini',
     'content/test/zoom/browser.ini',
 ]
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 
--- a/browser/components/protections/test/browser/browser.ini
+++ b/browser/components/protections/test/browser/browser.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 support-files =
   head.js
-  !/browser/base/content/test/trackingUI/trackingPage.html
+  !/browser/base/content/test/protectionsUI/trackingPage.html
 
 [browser_protections_lockwise.js]
 [browser_protections_monitor.js]
 [browser_protections_proxy.js]
 [browser_protections_report_ui.js]
 [browser_protections_telemetry.js]
--- a/testing/runtimes/manifest-runtimes-unix.json
+++ b/testing/runtimes/manifest-runtimes-unix.json
@@ -58,28 +58,27 @@
   "browser/base/content/test/performance/hidpi/browser.ini": 0.07, 
   "browser/base/content/test/performance/io/browser.ini": 0.19, 
   "browser/base/content/test/performance/lowdpi/browser.ini": 0.07, 
   "browser/base/content/test/permissions/browser.ini": 36.51, 
   "browser/base/content/test/plugins/browser-rs-blocklist.ini": 35.71, 
   "browser/base/content/test/plugins/browser.ini": 59.59, 
   "browser/base/content/test/popupNotifications/browser.ini": 35.82, 
   "browser/base/content/test/popups/browser.ini": 11.64, 
+  "browser/base/content/test/protectionsUI/browser.ini": 149.1, 
   "browser/base/content/test/referrer/browser.ini": 175.27, 
   "browser/base/content/test/sanitize/browser.ini": 17.72, 
   "browser/base/content/test/sidebar/browser.ini": 5.77, 
   "browser/base/content/test/siteIdentity/browser.ini": 167.96, 
-  "browser/base/content/test/siteProtections/browser.ini": 34.67, 
   "browser/base/content/test/static/browser.ini": 33.02, 
   "browser/base/content/test/statuspanel/browser.ini": 2.76, 
   "browser/base/content/test/sync/browser.ini": 8.35, 
   "browser/base/content/test/tabPrompts/browser.ini": 4.25, 
   "browser/base/content/test/tabcrashed/browser.ini": 31.52, 
   "browser/base/content/test/tabs/browser.ini": 273.38, 
-  "browser/base/content/test/trackingUI/browser.ini": 114.43, 
   "browser/base/content/test/webextensions/browser.ini": 39.34, 
   "browser/base/content/test/webrtc/browser.ini": 49.16, 
   "browser/base/content/test/zoom/browser.ini": 10.78, 
   "browser/components/about/test/unit/xpcshell.ini": 1.59, 
   "browser/components/aboutconfig/test/browser/browser.ini": 56.3, 
   "browser/components/aboutlogins/tests/browser/browser.ini": 63.89, 
   "browser/components/aboutlogins/tests/chrome/chrome.ini": 9.72, 
   "browser/components/aboutlogins/tests/unit/xpcshell.ini": 3.98, 
@@ -781,9 +780,9 @@
   "widget/headless/tests/xpcshell.ini": 4.08, 
   "widget/tests/browser/browser.ini": 22.4, 
   "widget/tests/chrome.ini": 63.72, 
   "widget/tests/mochitest.ini": 7.14, 
   "widget/tests/unit/xpcshell.ini": 5.8, 
   "xpcom/string/crashtests/crashtests.list": 0.59, 
   "xpcom/tests/unit/xpcshell.ini": 55.49, 
   "xpfe/appshell/test/chrome.ini": 1.14
-}
\ No newline at end of file
+}
--- a/toolkit/components/antitracking/test/browser/browser.ini
+++ b/toolkit/components/antitracking/test/browser/browser.ini
@@ -38,19 +38,19 @@ support-files =
   storageAccessAPIHelpers.js
   3rdPartyStorage.html
   3rdPartyStorageWO.html
   3rdPartyPartitioned.html
   localStorage.html
   raptor.jpg
   !/browser/modules/test/browser/head.js
   !/browser/base/content/test/general/head.js
-  !/browser/base/content/test/trackingUI/cookieServer.sjs
-  !/browser/base/content/test/trackingUI/trackingPage.html
-  !/browser/base/content/test/trackingUI/trackingAPI.js
+  !/browser/base/content/test/protectionsUI/cookieServer.sjs
+  !/browser/base/content/test/protectionsUI/trackingPage.html
+  !/browser/base/content/test/protectionsUI/trackingAPI.js
 
 [browser_allowListNotifications.js]
 support-files = subResources.sjs
 [browser_addonHostPermissionIgnoredInTP.js]
 [browser_allowListSeparationInPrivateAndNormalWindows.js]
 skip-if = os == "mac" && !debug || fission # Bug 1503778, 1577362
 [browser_backgroundImageAssertion.js]
 [browser_blockingCookies.js]
--- a/toolkit/components/antitracking/test/browser/browser_storageAccessThirdPartyChecks.js
+++ b/toolkit/components/antitracking/test/browser/browser_storageAccessThirdPartyChecks.js
@@ -8,17 +8,17 @@ AntiTracking._createTask({
   allowList: false,
   callback: async _ => {
     /* import-globals-from storageAccessAPIHelpers.js */
     await noStorageAccessInitially();
 
     await callRequestStorageAccess();
 
     const TRACKING_PAGE =
-      "http://another-tracking.example.net/browser/browser/base/content/test/trackingUI/trackingPage.html";
+      "http://another-tracking.example.net/browser/browser/base/content/test/protectionsUI/trackingPage.html";
     async function runChecks(name) {
       let iframe = document.createElement("iframe");
       iframe.src = TRACKING_PAGE;
       document.body.appendChild(iframe);
       await new Promise(resolve => {
         iframe.onload = resolve;
       });