Bug 1563062 Part 1: Remove tests of old about:addons r=rpl
☠☠ backed out by 278650937165 ☠ ☠
authorAndrew Swan <aswan@mozilla.com>
Tue, 09 Jul 2019 19:33:33 +0000
changeset 481993 46ad01c26df8ac85e5062433d420e084556400af
parent 481992 b4f105259931fe50fd1313de876ec69f23cbee3e
child 481994 59255dd51e9abbdb7d8239cac317a43efe53b495
push id89529
push useraswan@mozilla.com
push dateTue, 09 Jul 2019 20:04:15 +0000
treeherderautoland@59255dd51e9a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrpl
bugs1563062
milestone70.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 1563062 Part 1: Remove tests of old about:addons r=rpl Differential Revision: https://phabricator.services.mozilla.com/D36693
browser/base/content/test/webextensions/browser.ini
browser/base/content/test/webextensions/browser_extension_sideloading.js
browser/base/content/test/webextensions/browser_update_checkForUpdates.js
browser/base/content/test/webextensions/browser_update_findUpdates.js
browser/base/content/test/webextensions/head.js
browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js
browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
browser/components/enterprisepolicies/tests/browser/head.js
browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js
toolkit/mozapps/extensions/test/browser/browser.ini
toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js
toolkit/mozapps/extensions/test/browser/browser_bug562890.js
toolkit/mozapps/extensions/test/browser/browser_bug562899.js
toolkit/mozapps/extensions/test/browser/browser_bug562992.js
toolkit/mozapps/extensions/test/browser/browser_bug580298.js
toolkit/mozapps/extensions/test/browser/browser_bug587970.js
toolkit/mozapps/extensions/test/browser/browser_bug590347.js
toolkit/mozapps/extensions/test/browser/browser_bug591663.js
toolkit/mozapps/extensions/test/browser/browser_bug618502.js
toolkit/mozapps/extensions/test/browser/browser_details.js
toolkit/mozapps/extensions/test/browser/browser_discovery.js
toolkit/mozapps/extensions/test/browser/browser_discovery_clientid.js
toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js
toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js
toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js
toolkit/mozapps/extensions/test/browser/browser_html_discover_view.js
toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js
toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js
toolkit/mozapps/extensions/test/browser/browser_html_named_deck.js
toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js
toolkit/mozapps/extensions/test/browser/browser_html_options_ui_in_tab.js
toolkit/mozapps/extensions/test/browser/browser_html_plugins.js
toolkit/mozapps/extensions/test/browser/browser_html_recent_updates.js
toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js
toolkit/mozapps/extensions/test/browser/browser_html_updates.js
toolkit/mozapps/extensions/test/browser/browser_html_warning_messages.js
toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js
toolkit/mozapps/extensions/test/browser/browser_interaction_telemetry.js
toolkit/mozapps/extensions/test/browser/browser_langpack_signing.js
toolkit/mozapps/extensions/test/browser/browser_legacy.js
toolkit/mozapps/extensions/test/browser/browser_legacy_pre57.js
toolkit/mozapps/extensions/test/browser/browser_list.js
toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js
toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
toolkit/mozapps/extensions/test/browser/browser_pluginprefs_is_not_disabled.js
toolkit/mozapps/extensions/test/browser/browser_reinstall.js
toolkit/mozapps/extensions/test/browser/browser_sorting.js
toolkit/mozapps/extensions/test/browser/browser_sorting_plugins.js
toolkit/mozapps/extensions/test/browser/browser_tabsettings.js
toolkit/mozapps/extensions/test/browser/browser_theme_previews.js
toolkit/mozapps/extensions/test/browser/browser_types.js
toolkit/mozapps/extensions/test/browser/browser_uninstalling.js
toolkit/mozapps/extensions/test/browser/browser_updateid.js
toolkit/mozapps/extensions/test/browser/browser_webext_icon.js
toolkit/mozapps/extensions/test/browser/browser_webext_incognito.js
toolkit/mozapps/extensions/test/browser/browser_webext_options.js
toolkit/mozapps/extensions/test/browser/browser_webext_options_addon_reload.js
toolkit/mozapps/extensions/test/browser/head.js
--- a/browser/base/content/test/webextensions/browser.ini
+++ b/browser/base/content/test/webextensions/browser.ini
@@ -24,10 +24,9 @@ support-files =
 [browser_permissions_local_file.js]
 [browser_permissions_mozAddonManager.js]
 [browser_permissions_optional.js]
 skip-if = !e10s
 [browser_permissions_pointerevent.js]
 [browser_permissions_unsigned.js]
 skip-if = require_signing
 [browser_update_checkForUpdates.js]
-[browser_update_findUpdates.js]
 [browser_update_interactive_noprompt.js]
--- a/browser/base/content/test/webextensions/browser_extension_sideloading.js
+++ b/browser/base/content/test/webextensions/browser_extension_sideloading.js
@@ -33,82 +33,46 @@ async function createWebExtension(detail
 }
 
 function promiseEvent(eventEmitter, event) {
   return new Promise(resolve => {
     eventEmitter.once(event, resolve);
   });
 }
 
-async function getAddonElement(managerWindow, addonId) {
-  if (managerWindow.useHtmlViews) {
-    // about:addons is using the new HTML page.
-    const { contentDocument: doc } = managerWindow.document.getElementById(
-      "html-view-browser"
-    );
-    const card = await BrowserTestUtils.waitForCondition(
-      () => doc.querySelector(`addon-card[addon-id="${addonId}"]`),
-      `Found entry for sideload extension addon "${addonId}" in HTML about:addons`
-    );
-
-    return card;
-  }
-
-  // about:addons is using the XUL-based views.
-  let list = managerWindow.document.getElementById("addon-list");
-  // Make sure XBL bindings are applied
-  list.clientHeight;
-  const item = Array.from(list.children).find(_item => _item.value == addonId);
-  ok(item, "Found entry for sideloaded extension in about:addons");
-
-  return item;
+function getAddonElement(managerWindow, addonId) {
+  const { contentDocument: doc } = managerWindow.document.getElementById(
+    "html-view-browser"
+  );
+  return BrowserTestUtils.waitForCondition(
+    () => doc.querySelector(`addon-card[addon-id="${addonId}"]`),
+    `Found entry for sideload extension addon "${addonId}" in HTML about:addons`
+  );
 }
 
 function assertDisabledSideloadedAddonElement(managerWindow, addonElement) {
-  if (managerWindow.useHtmlViews) {
-    // about:addons is using the new HTML page.
-    const doc = addonElement.ownerDocument;
-    const enableBtn = addonElement.querySelector('[action="toggle-disabled"]');
-    is(
-      doc.l10n.getAttributes(enableBtn).id,
-      "enable-addon-button",
-      "The button has the enable label"
-    );
-  } else {
-    addonElement.scrollIntoView({ behavior: "instant" });
-    ok(
-      BrowserTestUtils.is_visible(addonElement._enableBtn),
-      "Enable button is visible for sideloaded extension"
-    );
-    ok(
-      BrowserTestUtils.is_hidden(addonElement._disableBtn),
-      "Disable button is not visible for sideloaded extension"
-    );
-  }
+  const doc = addonElement.ownerDocument;
+  const enableBtn = addonElement.querySelector('[action="toggle-disabled"]');
+  is(
+    doc.l10n.getAttributes(enableBtn).id,
+    "enable-addon-button",
+    "The button has the enable label"
+  );
 }
 
 function clickEnableExtension(managerWindow, addonElement) {
-  if (managerWindow.useHtmlViews) {
-    addonElement.querySelector('[action="toggle-disabled"]').click();
-  } else {
-    BrowserTestUtils.synthesizeMouseAtCenter(
-      addonElement._enableBtn,
-      {},
-      gBrowser.selectedBrowser
-    );
-  }
+  addonElement.querySelector('[action="toggle-disabled"]').click();
 }
 
-async function test_sideloading({ useHtmlViews }) {
+add_task(async function test_sideloading() {
   const DEFAULT_ICON_URL =
     "chrome://mozapps/skin/extensions/extensionGeneric.svg";
 
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["extensions.htmlaboutaddons.enabled", useHtmlViews],
       ["xpinstall.signatures.required", false],
       ["extensions.autoDisableScopes", 15],
       ["extensions.ui.ignoreUnsigned", true],
       ["extensions.allowPrivateBrowsingByDefault", false],
     ],
   });
 
   const ID1 = "addon1@tests.mozilla.org";
@@ -431,17 +395,9 @@ async function test_sideloading({ useHtm
     );
   }
 
   is(
     collectedEventsAddon2.length,
     expectedEventsAddon2.length,
     "Got the expected number of telemetry events for addon2"
   );
-}
-
-add_task(async function test_xul_aboutaddons_sideloading() {
-  await test_sideloading({ useHtmlViews: false });
 });
-
-add_task(async function test_html_aboutaddons_sideloading() {
-  await test_sideloading({ useHtmlViews: true });
-});
--- a/browser/base/content/test/webextensions/browser_update_checkForUpdates.js
+++ b/browser/base/content/test/webextensions/browser_update_checkForUpdates.js
@@ -8,34 +8,10 @@ function checkAll(win) {
         resolve();
       },
     };
     Services.obs.addObserver(observer, "EM-update-check-finished");
   });
 }
 
 // Test "Check for Updates" with both auto-update settings
-async function test_check_for_updates() {
-  info("Test 'Check for Updates' with auto-update true");
-  await interactiveUpdateTest(true, checkAll);
-  info("Test 'Check for Updates' with auto-update false");
-  await interactiveUpdateTest(false, checkAll);
-}
-
-add_task(async function test_xul_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-
-  await test_check_for_updates();
-
-  await SpecialPowers.popPrefEnv();
-});
-
-add_task(async function test_html_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-
-  await test_check_for_updates();
-
-  await SpecialPowers.popPrefEnv();
-});
+add_task(() => interactiveUpdateTest(true, checkAll));
+add_task(() => interactiveUpdateTest(false, checkAll));
deleted file mode 100644
--- a/browser/base/content/test/webextensions/browser_update_findUpdates.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Invoke an invidual extension's "Find Updates" menu item
-function checkOne(win, addon) {
-  win.gViewController.doCommand("cmd_findItemUpdates", addon);
-}
-
-// Test "Find Updates" with both auto-update settings
-async function test_find_updates() {
-  info("Test 'Find Updates' with auto-update true");
-  await interactiveUpdateTest(true, checkOne);
-  info("Test 'Find Updates' with auto-update false");
-  await interactiveUpdateTest(false, checkOne);
-}
-
-add_task(async function test_xul_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-
-  await test_find_updates();
-
-  await SpecialPowers.popPrefEnv();
-});
-
-add_task(async function test_html_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-
-  await test_find_updates();
-
-  await SpecialPowers.popPrefEnv();
-});
--- a/browser/base/content/test/webextensions/head.js
+++ b/browser/base/content/test/webextensions/head.js
@@ -465,39 +465,27 @@ async function interactiveUpdateTest(aut
       });
     }
 
     let promise = checkFn(win, addon);
 
     if (manualUpdatePromise) {
       await manualUpdatePromise;
 
-      if (win.useHtmlViews) {
-        // about:addons is using the new HTML views.
-        const availableUpdates = win.document.getElementById(
-          "updates-manualUpdatesFound-btn"
-        );
-        availableUpdates.click();
-        let doc = win.getHtmlBrowser().contentDocument;
-        let card = await BrowserTestUtils.waitForCondition(() => {
-          return doc.querySelector(`addon-card[addon-id="${ID}"]`);
-        }, `Wait addon card for "${ID}"`);
-        let updateBtn = card.querySelector(
-          'panel-item[action="install-update"]'
-        );
-        ok(updateBtn, `Found update button for "${ID}"`);
-        updateBtn.click();
-      } else {
-        // about:addons is still using the legacy XUL views.
-        let list = win.document.getElementById("addon-list");
-        // Make sure we have XBL bindings
-        list.clientHeight;
-        let item = list.itemChildren.find(_item => _item.value == ID);
-        EventUtils.synthesizeMouseAtCenter(item._updateBtn, {}, win);
-      }
+      const availableUpdates = win.document.getElementById(
+        "updates-manualUpdatesFound-btn"
+      );
+      availableUpdates.click();
+      let doc = win.getHtmlBrowser().contentDocument;
+      let card = await BrowserTestUtils.waitForCondition(() => {
+        return doc.querySelector(`addon-card[addon-id="${ID}"]`);
+      }, `Wait addon card for "${ID}"`);
+      let updateBtn = card.querySelector('panel-item[action="install-update"]');
+      ok(updateBtn, `Found update button for "${ID}"`);
+      updateBtn.click();
     }
 
     return { promise };
   }
 
   // Navigate away from the starting page to force about:addons to load
   // in a new tab during the tests below.
   BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:robots");
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js
@@ -6,72 +6,48 @@ const labelTextAskToActivate = "Ask to A
 const labelTextNeverActivate = "Never Activate";
 
 function restore_prefs() {
   Services.prefs.clearUserPref("plugin.state.flash");
 }
 registerCleanupFunction(restore_prefs);
 
 async function assert_flash_locked_status(win, locked, expectedLabelText) {
-  if (win.useHtmlViews) {
-    // Tests while running on HTML about:addons page.
-    let addonCard = await BrowserTestUtils.waitForCondition(async () => {
-      let doc = win.getHtmlBrowser().contentDocument;
-      await win.htmlBrowserLoaded;
-      return doc.querySelector(`addon-card[addon-id*="Shockwave Flash"]`);
-    }, "Get HTML about:addons card for flash plugin");
+  let addonCard = await BrowserTestUtils.waitForCondition(async () => {
+    let doc = win.getHtmlBrowser().contentDocument;
+    await win.htmlBrowserLoaded;
+    return doc.querySelector(`addon-card[addon-id*="Shockwave Flash"]`);
+  }, "Get HTML about:addons card for flash plugin");
 
-    const pluginOptions = addonCard.querySelector("plugin-options");
-    const pluginAction = pluginOptions.querySelector("panel-item[checked]");
-    ok(
-      pluginAction.textContent.includes(expectedLabelText),
-      `Got plugin action "${expectedLabelText}"`
-    );
+  const pluginOptions = addonCard.querySelector("plugin-options");
+  const pluginAction = pluginOptions.querySelector("panel-item[checked]");
+  ok(
+    pluginAction.textContent.includes(expectedLabelText),
+    `Got plugin action "${expectedLabelText}"`
+  );
 
-    // All other buttons (besides the checked one and the expand action)
-    // are expected to be disabled if locked is true.
-    for (const item of pluginOptions.querySelectorAll("panel-item")) {
-      const actionName = item.getAttribute("action");
-      if (actionName.includes("always")) {
-        ok(item.hidden, `Plugin action "${actionName}" should be hidden.`);
-      } else if (
-        !item.hasAttribute("checked") &&
-        actionName !== "expand" &&
-        actionName !== "preferences"
-      ) {
-        is(
-          item.shadowRoot.querySelector("button").disabled,
-          locked,
-          `Plugin action "${actionName}" should be ${
-            locked ? "disabled" : "enabled"
-          }`
-        );
-      }
+  // All other buttons (besides the checked one and the expand action)
+  // are expected to be disabled if locked is true.
+  for (const item of pluginOptions.querySelectorAll("panel-item")) {
+    const actionName = item.getAttribute("action");
+    if (actionName.includes("always")) {
+      ok(item.hidden, `Plugin action "${actionName}" should be hidden.`);
+    } else if (
+      !item.hasAttribute("checked") &&
+      actionName !== "expand" &&
+      actionName !== "preferences"
+    ) {
+      is(
+        item.shadowRoot.querySelector("button").disabled,
+        locked,
+        `Plugin action "${actionName}" should be ${
+          locked ? "disabled" : "enabled"
+        }`
+      );
     }
-  } else {
-    // Tests while running on XUL about:addons page.
-    let list = win.document.getElementById("addon-list");
-    let flashEntry = await BrowserTestUtils.waitForCondition(() => {
-      return list.getElementsByAttribute("name", "Shockwave Flash")[0];
-    }, "Get XUL about:addons entry for flash plugin");
-    let dropDown = win.document.getAnonymousElementByAttribute(
-      flashEntry,
-      "anonid",
-      "state-menulist"
-    );
-    is(
-      dropDown.label,
-      expectedLabelText,
-      "Flash setting text should match the expected value"
-    );
-    is(
-      dropDown.disabled,
-      locked,
-      "Flash controls disabled state should match policy locked state"
-    );
   }
 }
 
 async function test_flash_status({ expectedLabelText, locked }) {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
   const win = await BrowserOpenAddonsMgr("addons://list/plugin");
 
   await assert_flash_locked_status(win, locked, expectedLabelText);
@@ -89,118 +65,100 @@ add_task(async function test_enabled() {
   await setupPolicyEngineWithJson({
     policies: {
       FlashPlugin: {
         Default: true,
       },
     },
   });
 
-  const testCase = () =>
-    test_flash_status({
-      expectedLabelText: labelTextAskToActivate,
-      locked: false,
-    });
-  await testOnAboutAddonsType("XUL", testCase);
-  await testOnAboutAddonsType("HTML", testCase);
+  await test_flash_status({
+    expectedLabelText: labelTextAskToActivate,
+    locked: false,
+  });
 
   restore_prefs();
 });
 
 add_task(async function test_enabled_locked() {
   await setupPolicyEngineWithJson({
     policies: {
       FlashPlugin: {
         Default: true,
         Locked: true,
       },
     },
   });
 
-  const testCase = () =>
-    test_flash_status({
-      expectedLabelText: labelTextAskToActivate,
-      locked: true,
-    });
-  await testOnAboutAddonsType("XUL", testCase);
-  await testOnAboutAddonsType("HTML", testCase);
+  await test_flash_status({
+    expectedLabelText: labelTextAskToActivate,
+    locked: true,
+  });
 
   restore_prefs();
 });
 
 add_task(async function test_disabled() {
   await setupPolicyEngineWithJson({
     policies: {
       FlashPlugin: {
         Default: false,
       },
     },
   });
 
-  const testCase = () =>
-    test_flash_status({
-      expectedLabelText: labelTextNeverActivate,
-      locked: false,
-    });
-  await testOnAboutAddonsType("XUL", testCase);
-  await testOnAboutAddonsType("HTML", testCase);
+  await test_flash_status({
+    expectedLabelText: labelTextNeverActivate,
+    locked: false,
+  });
 
   restore_prefs();
 });
 
 add_task(async function test_disabled_locked() {
   await setupPolicyEngineWithJson({
     policies: {
       FlashPlugin: {
         Default: false,
         Locked: true,
       },
     },
   });
 
-  const testCase = () =>
-    test_flash_status({
-      expectedLabelText: labelTextNeverActivate,
-      locked: true,
-    });
-  await testOnAboutAddonsType("XUL", testCase);
-  await testOnAboutAddonsType("HTML", testCase);
+  await test_flash_status({
+    expectedLabelText: labelTextNeverActivate,
+    locked: true,
+  });
 
   restore_prefs();
 });
 
 add_task(async function test_ask() {
   await setupPolicyEngineWithJson({
     policies: {
       FlashPlugin: {},
     },
   });
 
-  const testCase = () =>
-    test_flash_status({
-      expectedLabelText: labelTextAskToActivate,
-      locked: false,
-    });
-  await testOnAboutAddonsType("XUL", testCase);
-  await testOnAboutAddonsType("HTML", testCase);
+  await test_flash_status({
+    expectedLabelText: labelTextAskToActivate,
+    locked: false,
+  });
 
   restore_prefs();
 });
 
 add_task(async function test_ask_locked() {
   await setupPolicyEngineWithJson({
     policies: {
       FlashPlugin: {
         Locked: true,
       },
     },
   });
 
-  const testCase = () =>
-    test_flash_status({
-      expectedLabelText: labelTextAskToActivate,
-      locked: true,
-    });
-  await testOnAboutAddonsType("XUL", testCase);
-  await testOnAboutAddonsType("HTML", testCase);
+  await test_flash_status({
+    expectedLabelText: labelTextAskToActivate,
+    locked: true,
+  });
 
   restore_prefs();
 });
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
@@ -2,60 +2,27 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 const ADDON_ID = "policytest@mozilla.com";
 const BASE_URL =
   "http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser";
 
 async function isExtensionLocked(win, addonID) {
-  if (win.useHtmlViews) {
-    // Test on HTML about:addons page.
-    let addonCard = await BrowserTestUtils.waitForCondition(async () => {
-      let doc = win.getHtmlBrowser().contentDocument;
-      await win.htmlBrowserLoaded;
-      return doc.querySelector(`addon-card[addon-id="${addonID}"]`);
-    }, `Get addon-card for "${addonID}"`);
-    let disableBtn = addonCard.querySelector(
-      'panel-item[action="toggle-disabled"]'
-    );
-    let removeBtn = addonCard.querySelector('panel-item[action="remove"]');
-    ok(removeBtn.hidden, "Remove button should be hidden");
-    ok(disableBtn.hidden, "Disable button should be hidden");
-  } else {
-    // Test on XUL about:addons page.
-    const doc = win.document;
-    let list = doc.getElementById("addon-list");
-    let addonEntry = await BrowserTestUtils.waitForCondition(
-      () => list.getElementsByAttribute("value", addonID)[0],
-      `Get addon entry for "${addonID}"`
-    );
-    let disableBtn = doc.getAnonymousElementByAttribute(
-      addonEntry,
-      "anonid",
-      "disable-btn"
-    );
-    let removeBtn = doc.getAnonymousElementByAttribute(
-      addonEntry,
-      "anonid",
-      "remove-btn"
-    );
-    ok(removeBtn.hidden, "Remove button should be hidden");
-    ok(disableBtn.hidden, "Disable button should be hidden");
-  }
-}
-
-// This test case will run on both the XUL and HTML about:addons views.
-async function test_addon_locked() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-  const win = await BrowserOpenAddonsMgr("addons://list/extension");
-
-  await isExtensionLocked(win, ADDON_ID);
-
-  BrowserTestUtils.removeTab(tab);
+  let addonCard = await BrowserTestUtils.waitForCondition(async () => {
+    let doc = win.getHtmlBrowser().contentDocument;
+    await win.htmlBrowserLoaded;
+    return doc.querySelector(`addon-card[addon-id="${addonID}"]`);
+  }, `Get addon-card for "${addonID}"`);
+  let disableBtn = addonCard.querySelector(
+    'panel-item[action="toggle-disabled"]'
+  );
+  let removeBtn = addonCard.querySelector('panel-item[action="remove"]');
+  ok(removeBtn.hidden, "Remove button should be hidden");
+  ok(disableBtn.hidden, "Disable button should be hidden");
 }
 
 add_task(async function test_addon_install() {
   let installPromise = wait_for_addon_install();
   await setupPolicyEngineWithJson({
     policies: {
       Extensions: {
         Install: [`${BASE_URL}/policytest_v0.1.xpi`],
@@ -70,22 +37,23 @@ add_task(async function test_addon_insta
 
   Assert.deepEqual(
     addon.installTelemetryInfo,
     { source: "enterprise-policy" },
     "Got the expected addon.installTelemetryInfo"
   );
 });
 
-add_task(async function test_XUL_aboutaddons_addon_locked() {
-  await testOnAboutAddonsType("XUL", test_addon_locked);
-});
+add_task(async function test_addon_locked() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  const win = await BrowserOpenAddonsMgr("addons://list/extension");
 
-add_task(async function test_HTML_aboutaddons_addon_locked() {
-  await testOnAboutAddonsType("HTML", test_addon_locked);
+  await isExtensionLocked(win, ADDON_ID);
+
+  BrowserTestUtils.removeTab(tab);
 });
 
 add_task(async function test_addon_reinstall() {
   // Test that uninstalling and reinstalling the same addon ID works as expected.
   // This can be used to update an addon.
 
   let uninstallPromise = wait_for_addon_uninstall();
   let installPromise = wait_for_addon_install();
--- a/browser/components/enterprisepolicies/tests/browser/head.js
+++ b/browser/components/enterprisepolicies/tests/browser/head.js
@@ -78,28 +78,8 @@ registerCleanupFunction(async function p
     Services.policies.status,
     Ci.nsIEnterprisePolicies.INACTIVE,
     "Engine is inactive at the end of the test"
   );
 
   EnterprisePolicyTesting.resetRunOnceState();
   PoliciesPrefTracker.stop();
 });
-
-async function testOnAboutAddonsType(type, fn) {
-  let useHtmlAboutAddons;
-  switch (type) {
-    case "XUL":
-      useHtmlAboutAddons = false;
-      break;
-    case "HTML":
-      useHtmlAboutAddons = true;
-      break;
-    default:
-      throw new Error(`Unknown about:addons type ${type}`);
-  }
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", useHtmlAboutAddons]],
-  });
-  info(`Run tests on ${type} about:addons`);
-  await fn();
-  await SpecialPowers.popPrefEnv();
-}
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
@@ -7,22 +7,16 @@ const { TelemetryTestUtils } = ChromeUti
 );
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "ABUSE_REPORT_ENABLED",
   "extensions.abuseReport.enabled",
   false
 );
-XPCOMUtils.defineLazyPreferenceGetter(
-  this,
-  "HTML_ABOUTADDONS_ENABLED",
-  "extensions.htmlaboutaddons.enabled",
-  false
-);
 
 let extData = {
   manifest: {
     permissions: ["contextMenus"],
     browser_action: {
       default_popup: "popup.html",
     },
   },
@@ -203,17 +197,17 @@ add_task(async function browseraction_co
     );
     is(
       manageExtension.hidden,
       !visible,
       `Manage Extension should be ${expected}`
     );
     is(
       reportExtension.hidden,
-      !ABUSE_REPORT_ENABLED || !HTML_ABOUTADDONS_ENABLED || !visible,
+      !ABUSE_REPORT_ENABLED || !visible,
       `Report Extension should be ${expected}`
     );
     is(
       separator.hidden,
       !visible,
       `Separator after Manage Extension should be ${expected}`
     );
   }
@@ -229,31 +223,26 @@ add_task(async function browseraction_co
       "about:addons",
       true
     );
     let manageExtension = menu.querySelector(
       ".customize-context-manageExtension"
     );
     await closeChromeContextMenu(menuId, manageExtension, win);
     let managerWindow = (await addonManagerPromise).linkedBrowser.contentWindow;
-    if (managerWindow.useHtmlViews) {
-      // Check the UI to make sure that the correct view is loaded.
-      is(
-        managerWindow.gViewController.currentViewId,
-        `addons://detail/${encodeURIComponent(id)}`,
-        "Expected extension details view in about:addons"
-      );
-      // In HTML about:addons, the default view does not show the inline
-      // options browser, so we should not receive an "options-loaded" event.
-      // (if we do, the test will fail due to the unexpected message).
-    } else {
-      info("Waiting for inline options page in XUL about:addons");
-      // In XUL about:addons, the inline options page is shown by default.
-      await extension.awaitMessage("options-loaded");
-    }
+
+    // Check the UI to make sure that the correct view is loaded.
+    is(
+      managerWindow.gViewController.currentViewId,
+      `addons://detail/${encodeURIComponent(id)}`,
+      "Expected extension details view in about:addons"
+    );
+    // In HTML about:addons, the default view does not show the inline
+    // options browser, so we should not receive an "options-loaded" event.
+    // (if we do, the test will fail due to the unexpected message).
 
     info(
       `Remove the opened tab, and await customize mode to be restored if necessary`
     );
     let tab = win.gBrowser.selectedTab;
     is(tab.linkedBrowser.currentURI.spec, "about:addons");
     if (customizing) {
       let customizationReady = BrowserTestUtils.waitForEvent(
@@ -570,20 +559,17 @@ add_task(async function browseraction_co
 });
 
 // This test case verify reporting an extension from the browserAction
 // context menu (when the browserAction is in the toolbox and in the
 // overwflow menu, and repeat the test with and without the customize
 // mode enabled).
 add_task(async function browseraction_contextmenu_report_extension() {
   SpecialPowers.pushPrefEnv({
-    set: [
-      ["extensions.htmlaboutaddons.enabled", true],
-      ["extensions.abuseReport.enabled", true],
-    ],
+    set: [["extensions.abuseReport.enabled", true]],
   });
   let win = await BrowserTestUtils.openNewBrowserWindow();
   let id = "addon_id@example.com";
   let name = "Bad Add-on";
   let buttonId = `${makeWidgetId(id)}-browser-action`;
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       name,
--- a/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js
+++ b/browser/components/extensions/test/browser/browser_ext_runtime_openOptionsPage.js
@@ -57,17 +57,17 @@ async function loadExtension(options) {
     background: options.background,
   });
 
   await extension.startup();
 
   return extension;
 }
 
-async function run_test_inline_options() {
+add_task(async function run_test_inline_options() {
   let tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
     "http://example.com/"
   );
 
   let extension = await loadExtension({
     manifest: {
       applications: { gecko: { id: "inline_options@tests.mozilla.org" } },
@@ -251,29 +251,16 @@ async function run_test_inline_options()
 
   extension.sendMessage("ports-done");
 
   await extension.awaitFinish("options-ui");
 
   await extension.unload();
 
   BrowserTestUtils.removeTab(tab);
-}
-
-add_task(async function test_inline_options() {
-  for (let htmlEnabled of [false, true]) {
-    info(
-      `Test options opened inline ${htmlEnabled ? "HTML" : "XUL"} about:addons`
-    );
-    await SpecialPowers.pushPrefEnv({
-      set: [["extensions.htmlaboutaddons.enabled", htmlEnabled]],
-    });
-    await run_test_inline_options();
-    await SpecialPowers.popPrefEnv();
-  }
 });
 
 add_task(async function test_tab_options() {
   info(`Test options opened in a tab`);
 
   let tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
     "http://example.com/"
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -41,40 +41,29 @@ generated-files =
   addons/browser_installssl.xpi
   addons/browser_theme.xpi
   addons/options_signed.xpi
 
 [browser_CTP_plugins.js]
 tags = blocklist
 [browser_about_debugging_link.js]
 [browser_bug523784.js]
-[browser_bug562890.js]
-skip-if = os == 'win' && !debug # Disabled on Windows opt/PGO builds due to intermittent failures (bug 1135866)
-[browser_bug562899.js]
-[browser_bug562992.js]
 [browser_bug567127.js]
 skip-if = (!debug && os == 'win') #Bug 1489496
 [browser_bug567137.js]
 [browser_bug570760.js]
 skip-if = verify
 [browser_bug572561.js]
 [browser_bug577990.js]
-[browser_bug580298.js]
 [browser_bug586574.js]
-[browser_bug587970.js]
 [browser_bug591465.js]
 skip-if = os == "linux" && !debug # Bug 1395539 - fails on multi-core
-[browser_bug591663.js]
-[browser_bug618502.js]
 [browser_bug679604.js]
-[browser_bug590347.js]
 [browser_checkAddonCompatibility.js]
-[browser_details.js]
 [browser_discovery.js]
-[browser_discovery_clientid.js]
 [browser_dragdrop.js]
 [browser_extension_sideloading_permission.js]
 [browser_file_xpi_no_process_switch.js]
 skip-if = true # Bug 1449071 - Frequent failures
 [browser_globalwarnings.js]
 [browser_gmpProvider.js]
 skip-if = os == 'linux' && !debug # Bug 1398766
 [browser_history_navigation.js]
@@ -91,50 +80,30 @@ skip-if = os == 'win' # Bug 1562792
 [browser_html_options_ui.js]
 [browser_html_options_ui_in_tab.js]
 [browser_html_plugins.js]
 skip-if = (os == 'win' && processor == 'aarch64') # aarch64 has no plugin support, bug 1525174 and 1547495
 [browser_html_recent_updates.js]
 [browser_html_recommendations.js]
 [browser_html_updates.js]
 [browser_html_warning_messages.js]
-[browser_inlinesettings_browser.js]
-skip-if = os == 'mac' || os == 'linux' # Bug 1483347
 [browser_installssl.js]
 skip-if = verify
 [browser_interaction_telemetry.js]
-[browser_langpack_signing.js]
-[browser_legacy.js]
-[browser_legacy_pre57.js]
-[browser_list.js]
 [browser_manage_shortcuts.js]
 [browser_manage_shortcuts_hidden.js]
-[browser_manualupdates.js]
 [browser_pluginprefs.js]
-[browser_pluginprefs_is_not_disabled.js]
-[browser_plugin_enabled_state_locked.js]
 [browser_recentupdates.js]
 [browser_reinstall.js]
-[browser_sorting.js]
-[browser_sorting_plugins.js]
-[browser_tabsettings.js]
 [browser_task_next_test.js]
-[browser_theme_previews.js]
-[browser_types.js]
-[browser_uninstalling.js]
 [browser_updateid.js]
 [browser_updatessl.js]
 [browser_webapi.js]
 [browser_webapi_access.js]
 [browser_webapi_addon_listener.js]
 [browser_webapi_enable.js]
 [browser_webapi_install.js]
 [browser_webapi_install_disabled.js]
 [browser_webapi_theme.js]
 [browser_webapi_uninstall.js]
 [browser_webext_icon.js]
 [browser_webext_incognito.js]
 [browser_webext_incognito_doorhanger_telemetry.js]
-[browser_webext_options.js]
-tags = webextensions
-skip-if = os == 'linux' || (os == 'mac' && debug) # bug 1483347
-[browser_webext_options_addon_reload.js]
-tags = webextensions
--- a/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js
@@ -51,167 +51,60 @@ function setAndUpdateBlocklist(aURL, aCa
   }
   updateBlocklist(aURL, aCallback);
 }
 
 function resetBlocklist() {
   Services.prefs.setCharPref("extensions.blocklist.url", _originalBlocklistURL);
 }
 
-function getXULPluginUI(plugin, anonid) {
-  if (
-    plugin.openOrClosedShadowRoot &&
-    plugin.openOrClosedShadowRoot.isUAWidget()
-  ) {
-    return plugin.openOrClosedShadowRoot.getElementById(anonid);
-  }
-  return plugin.ownerDocument.getAnonymousElementByAttribute(
-    plugin,
-    "anonid",
-    anonid
-  );
-}
-
-function assertPluginActiveState({
-  managerWindow,
-  pluginId,
-  expectedActivateState,
-}) {
-  let pluginEl = get_addon_element(managerWindow, pluginId);
-  ok(pluginEl, `Got the about:addon entry for "${pluginId}"`);
-
-  if (managerWindow.useHtmlViews) {
-    const pluginOptions = pluginEl.querySelector("plugin-options");
-    const pluginCheckedItem = pluginOptions.querySelector(
-      "panel-item[checked]"
-    );
-    is(
-      pluginCheckedItem.getAttribute("action"),
-      expectedActivateState,
-      `plugin should have ${expectedActivateState} state selected`
-    );
-  } else {
-    // Assertions for the XUL about:addons views.
-    pluginEl.parentNode.ensureElementIsVisible(pluginEl);
-    let enableButton = getXULPluginUI(pluginEl, "enable-btn");
-    let disableButton = getXULPluginUI(pluginEl, "disable-btn");
-    is_element_hidden(enableButton, "enable button should be hidden");
-    is_element_hidden(disableButton, "disable button should be hidden");
-    let menu = getXULPluginUI(pluginEl, "state-menulist");
-    is_element_visible(menu, "state menu should be visible");
-    let activateItem = getXULPluginUI(
-      pluginEl,
-      `${expectedActivateState}-menuitem`
-    );
-    ok(
-      activateItem,
-      `Got a menu item for the ${expectedActivateState} plugin activate state`
-    );
-    is(
-      menu.selectedItem,
-      activateItem,
-      `state menu should have '${expectedActivateState}' selected`
-    );
-  }
-}
-
 function setPluginActivateState({ managerWindow, pluginId, activateState }) {
   let pluginEl = get_addon_element(managerWindow, pluginId);
   ok(pluginEl, `Got the about:addon entry for "${pluginId}"`);
 
-  if (managerWindow.useHtmlViews) {
-    // Activate plugin on the HTML about:addons views.
-    let activateAction = pluginEl.querySelector(`[action="${activateState}"]`);
-    ok(activateAction, `Got element for ${activateState} plugin action`);
-    activateAction.click();
-  } else {
-    // Activate plugin on the XUL about:addons views.
-    let activateItem = getXULPluginUI(pluginEl, `${activateState}-menuitem`);
-    ok(
-      activateItem,
-      `Got a menu item for the ${activateState} plugin activate state`
-    );
-    let menu = getXULPluginUI(pluginEl, "state-menulist");
-    menu.selectedItem = activateItem;
-    activateItem.doCommand();
-  }
-}
-
-async function assertPluginAppDisabled({ managerWindow, pluginId }) {
-  const pluginEl = get_addon_element(managerWindow, pluginId);
-  ok(pluginEl, `Got the about:addon entry for "${pluginId}"`);
-
-  if (managerWindow.useHtmlViews) {
-    // Open the options menu (needed to check the disabled buttons).
-    const pluginOptions = pluginEl.querySelector("plugin-options");
-    pluginOptions.querySelector("panel-list").open = true;
-    // tests all buttons disabled (besides the checked one and the expand action)
-    // are expected to be disabled if locked is true.
-    for (const item of pluginOptions.querySelectorAll(
-      "panel-item:not([hidden])"
-    )) {
-      const actionName = item.getAttribute("action");
-      if (
-        !item.hasAttribute("checked") &&
-        actionName !== "expand" &&
-        actionName !== "preferences"
-      ) {
-        ok(
-          item.shadowRoot.querySelector("button").disabled,
-          `Plugin action "${actionName}" should be disabled`
-        );
-      }
-    }
-    pluginOptions.querySelector("panel-list").open = false;
-  } else {
-    // Assertions for the XUL about:addons views.
-    let menu = getXULPluginUI(pluginEl, "state-menulist");
-    pluginEl.parentNode.ensureElementIsVisible(pluginEl);
-    menu = getXULPluginUI(pluginEl, "state-menulist");
-    is(menu.disabled, true, "state menu should be disabled");
-
-    EventUtils.synthesizeMouseAtCenter(pluginEl, {}, managerWindow);
-    await BrowserTestUtils.waitForEvent(managerWindow.document, "ViewChanged");
-
-    menu = managerWindow.document.getElementById("detail-state-menulist");
-    is(menu.disabled, true, "detail state menu should be disabled");
-  }
+  // Activate plugin on the HTML about:addons views.
+  let activateAction = pluginEl.querySelector(`[action="${activateState}"]`);
+  ok(activateAction, `Got element for ${activateState} plugin action`);
+  activateAction.click();
 }
 
 async function getTestPluginAddon() {
   const plugins = await AddonManager.getAddonsByTypes(["plugin"]);
 
   for (const plugin of plugins) {
     if (plugin.name == "Test Plug-in") {
       return plugin;
     }
   }
 
   return undefined;
 }
 
-async function test_CTP_plugins(aboutAddonsType) {
+add_task(async function test_CTP_plugins() {
   let pluginTag = getTestPluginTag();
   pluginTag.enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
   let managerWindow = await open_manager("addons://list/plugin");
 
   let testPluginAddon = await getTestPluginAddon();
   isnot(testPluginAddon, null, "part2: Test Plug-in should exist");
 
   let testPluginId = testPluginAddon.id;
 
   let pluginEl = get_addon_element(managerWindow, testPluginId);
   ok(pluginEl, `Got the about:addon entry for "${testPluginId}"`);
 
   info("part3: test plugin add-on actions status");
-  assertPluginActiveState({
-    managerWindow,
-    pluginId: testPluginId,
-    expectedActivateState: "ask-to-activate",
-  });
+
+  let pluginOptions = pluginEl.querySelector("plugin-options");
+  let pluginCheckedItem = pluginOptions.querySelector("panel-item[checked]");
+  is(
+    pluginCheckedItem.getAttribute("action"),
+    "ask-to-activate",
+    "plugin should have ask-to-activate state selected"
+  );
 
   let pluginTab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
     gHttpTestRoot + "plugin_test.html"
   );
   let pluginBrowser = pluginTab.linkedBrowser;
 
   let condition = () =>
@@ -269,21 +162,25 @@ async function test_CTP_plugins(aboutAdd
       Ci.nsIObjectLoadingContent
     );
     ok(!objLoadingContent.activated, "part7: plugin should not be activated");
   });
 
   BrowserTestUtils.removeTab(pluginTab);
 
   info("part8: test plugin state is never-activate");
-  assertPluginActiveState({
-    managerWindow,
-    pluginId: testPluginId,
-    expectedActivateState: "never-activate",
-  });
+  pluginEl = get_addon_element(managerWindow, testPluginId);
+
+  pluginOptions = pluginEl.querySelector("plugin-options");
+  const pluginCheckItem = pluginOptions.querySelector("panel-item[checked]");
+  is(
+    pluginCheckItem.getAttribute("action"),
+    "never-activate",
+    "plugin should have never-activate state selected"
+  );
 
   info("part9: set plugin state to always-activate");
   setPluginActivateState({
     managerWindow,
     pluginId: testPluginId,
     activateState: "always-activate",
   });
 
@@ -325,33 +222,16 @@ async function test_CTP_plugins(aboutAdd
     PopupNotifications.getNotification("click-to-play-plugins", pluginBrowser);
   await BrowserTestUtils.waitForCondition(
     condition,
     "part11: should have a click-to-play notification"
   );
 
   BrowserTestUtils.removeTab(pluginTab);
   await close_manager(managerWindow);
-  await SpecialPowers.popPrefEnv();
-}
-
-add_task(async function test_CTP_plugins_XUL_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  await test_CTP_plugins("XUL");
-  await SpecialPowers.popPrefEnv();
-});
-
-add_task(async function test_CTP_plugins_HTML_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  await test_CTP_plugins("HTML");
-  await SpecialPowers.popPrefEnv();
 });
 
 add_task(async function test_blocklisted_plugin_disabled() {
   async function ensurePluginEnabled() {
     let pluginTag = getTestPluginTag();
     pluginTag.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
     await new Promise(resolve => {
       setAndUpdateBlocklist(gHttpTestRoot + "blockNoPlugins.xml", resolve);
@@ -387,26 +267,38 @@ add_task(async function test_blocklisted
   await SpecialPowers.flushPrefEnv();
 });
 
 async function checkPlugins() {
   let testPluginAddon = await getTestPluginAddon();
   isnot(testPluginAddon, null, "Test Plug-in should exist");
   let testPluginId = testPluginAddon.id;
 
-  let managerWindow;
+  let managerWindow = await open_manager("addons://list/plugin");
+
+  let pluginEl = get_addon_element(managerWindow, testPluginId);
+  ok(pluginEl, `Got about:addons entry for ${testPluginId}`);
+
+  // Open the options menu (needed to check the disabled buttons).
+  const pluginOptions = pluginEl.querySelector("plugin-options");
+  pluginOptions.querySelector("panel-list").open = true;
 
-  info("Test blocklisted plugin actions disabled in XUL about:addons");
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  managerWindow = await open_manager("addons://list/plugin");
-  await assertPluginAppDisabled({ managerWindow, pluginId: testPluginId });
-  await close_manager(managerWindow);
+  // tests all buttons disabled (besides the checked one and the expand action)
+  // are expected to be disabled if locked is true.
+  for (const item of pluginOptions.querySelectorAll(
+    "panel-item:not([hidden])"
+  )) {
+    const actionName = item.getAttribute("action");
+    if (
+      !item.hasAttribute("checked") &&
+      actionName !== "expand" &&
+      actionName !== "preferences"
+    ) {
+      ok(
+        item.shadowRoot.querySelector("button").disabled,
+        `Plugin action "${actionName}" should be disabled`
+      );
+    }
+  }
+  pluginOptions.querySelector("panel-list").open = false;
 
-  info("Test blocklisted plugin actions disabled in HTML about:addons");
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  managerWindow = await open_manager("addons://list/plugin");
-  await assertPluginAppDisabled({ managerWindow, pluginId: testPluginId });
   await close_manager(managerWindow);
 }
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562890.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * Tests the Preferences button for addons in list view
- */
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files for these test cases).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function test() {
-  requestLongerTimeout(2);
-
-  waitForExplicitFinish();
-
-  var addonPrefsURI = CHROMEROOT + "addon_prefs.xul";
-
-  var gProvider = new MockProvider();
-  gProvider.createAddons([
-    {
-      id: "test1@tests.mozilla.org",
-      name: "Test add-on 1",
-      description: "foo",
-    },
-    {
-      id: "test2@tests.mozilla.org",
-      name: "Test add-on 2",
-      description: "bar",
-      optionsURL: addonPrefsURI,
-    },
-  ]);
-
-  let aManager = await open_manager("addons://list/extension");
-  var addonList = aManager.document.getElementById("addon-list");
-  for (var addonItem of addonList.childNodes) {
-    if (
-      addonItem.hasAttribute("name") &&
-      addonItem.getAttribute("name") == "Test add-on 1"
-    ) {
-      break;
-    }
-  }
-  var prefsBtn = aManager.document.getAnonymousElementByAttribute(
-    addonItem,
-    "anonid",
-    "preferences-btn"
-  );
-  is(
-    prefsBtn.hidden,
-    true,
-    "Prefs button should be hidden for addon with no optionsURL set"
-  );
-
-  for (addonItem of addonList.childNodes) {
-    if (
-      addonItem.hasAttribute("name") &&
-      addonItem.getAttribute("name") == "Test add-on 2"
-    ) {
-      break;
-    }
-  }
-  prefsBtn = aManager.document.getAnonymousElementByAttribute(
-    addonItem,
-    "anonid",
-    "preferences-btn"
-  );
-  is(
-    prefsBtn.hidden,
-    true,
-    "Prefs button should not be shown for addon with just an optionsURL set"
-  );
-
-  close_manager(aManager, finish);
-}
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562899.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Simulates quickly switching between different list views to verify that only
-// the last selected is displayed
-
-const { PromiseTestUtils } = ChromeUtils.import(
-  "resource://testing-common/PromiseTestUtils.jsm"
-);
-
-PromiseTestUtils.whitelistRejectionsGlobally(/this\._errorLink/);
-
-var gManagerWindow;
-var gCategoryUtilities;
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files and these test cases should be added in Bug 1552170).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function test() {
-  waitForExplicitFinish();
-
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-  run_next_test();
-}
-
-async function end_test() {
-  await close_manager(gManagerWindow);
-  finish();
-}
-
-// Tests that loading a second view before the first has not finished loading
-// does not merge the results
-add_test(async function() {
-  var themeCount = null;
-  var pluginCount = null;
-  var themeItem = gCategoryUtilities.get("theme");
-  var pluginItem = gCategoryUtilities.get("plugin");
-  var list = gManagerWindow.document.getElementById("addon-list");
-
-  await gCategoryUtilities.open(themeItem);
-  themeCount = list.childNodes.length;
-  ok(themeCount > 0, "Test is useless if there are no themes");
-
-  await gCategoryUtilities.open(pluginItem);
-  pluginCount = list.childNodes.length;
-  ok(pluginCount > 0, "Test is useless if there are no plugins");
-
-  gCategoryUtilities.open(themeItem);
-
-  await gCategoryUtilities.open(pluginItem);
-  is(list.childNodes.length, pluginCount, "Should only see the plugins");
-
-  var item = list.firstChild;
-  while (item) {
-    is(item.getAttribute("type"), "plugin", "All items should be plugins");
-    item = item.nextSibling;
-  }
-
-  // Tests that switching to, from, to the same pane in quick succession
-  // still only shows the right number of results
-
-  gCategoryUtilities.open(themeItem);
-  gCategoryUtilities.open(pluginItem);
-  await gCategoryUtilities.open(themeItem);
-  is(list.childNodes.length, themeCount, "Should only see the theme");
-
-  item = list.firstChild;
-  while (item) {
-    is(item.getAttribute("type"), "theme", "All items should be theme");
-    item = item.nextSibling;
-  }
-
-  run_next_test();
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562992.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-/**
- * This test ensures that when the extension manager UI is open and a
- * restartless extension is installed from the web, its correct name appears
- * when the download and installation complete.  See bug 562992.
- */
-
-var gManagerWindow;
-var gProvider;
-var gInstall;
-
-const EXTENSION_NAME = "Wunderbar";
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files for these test cases).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  let aWindow = await open_manager("addons://list/extension");
-  gManagerWindow = aWindow;
-  run_next_test();
-}
-
-async function end_test() {
-  await close_manager(gManagerWindow);
-  finish();
-}
-
-// Create a MockInstall with a MockAddon payload and add it to the provider,
-// causing the onNewInstall event to fire, which in turn will cause a new
-// "installing" item to appear in the list of extensions.
-add_test(function() {
-  let addon = new MockAddon(undefined, EXTENSION_NAME, "extension", true);
-  gInstall = new MockInstall(undefined, undefined, addon);
-  gInstall.addTestListener({
-    onNewInstall: run_next_test,
-  });
-  gProvider.addInstall(gInstall);
-});
-
-// Finish the install, which will cause the "installing" item to be converted
-// to an "installed" item, which should have the correct add-on name.
-add_test(function() {
-  gInstall.addTestListener({
-    onInstallEnded() {
-      let list = gManagerWindow.document.getElementById("addon-list");
-
-      // To help prevent future breakage, don't assume the item is the only one
-      // in the list, or that it's first in the list.  Find it by name.
-      for (let i = 0; i < list.itemCount; i++) {
-        let item = list.getItemAtIndex(i);
-        if (item.getAttribute("name") === EXTENSION_NAME) {
-          ok(true, "Item with correct name found");
-          run_next_test();
-          return;
-        }
-      }
-      ok(false, "Item with correct name was not found");
-      run_next_test();
-    },
-  });
-  gInstall.install();
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug580298.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests that certain types of addons do not have their version number
-// displayed. This currently only includes lightweight themes.
-
-var gManagerWindow;
-var gCategoryUtilities;
-var gProvider;
-
-// This test is testing XUL about:addons UI (and the HTML about:addons
-// actually shows the version also on themes).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-add_task(async function test() {
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([
-    {
-      id: "extension@tests.mozilla.org",
-      name: "Extension 1",
-      type: "extension",
-      version: "123",
-    },
-    {
-      id: "theme@tests.mozilla.org",
-      name: "Theme 2",
-      type: "theme",
-      version: "456",
-    },
-    {
-      id: "lwtheme@personas.mozilla.org",
-      name: "Persona 3",
-      type: "theme",
-      version: "789",
-    },
-  ]);
-
-  gManagerWindow = await open_manager();
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-});
-
-function get(aId) {
-  return gManagerWindow.document.getElementById(aId);
-}
-
-function get_node(parent, anonid) {
-  return parent.ownerDocument.getAnonymousElementByAttribute(
-    parent,
-    "anonid",
-    anonid
-  );
-}
-
-function open_details(aList, aItem, aCallback) {
-  aList.ensureElementIsVisible(aItem);
-  EventUtils.synthesizeMouseAtCenter(aItem, {}, gManagerWindow);
-  return new Promise(resolve => wait_for_view_load(gManagerWindow, resolve));
-}
-
-var check_addon_has_version = async function(aList, aName, aVersion) {
-  for (let i = 0; i < aList.itemCount; i++) {
-    let item = aList.getItemAtIndex(i);
-    if (get_node(item, "name").textContent === aName) {
-      ok(true, "Item with correct name found");
-      let { version } = await get_tooltip_info(item);
-      is(version, aVersion, "Item has correct version");
-      return item;
-    }
-  }
-  ok(false, "Item with correct name was not found");
-  return null;
-};
-
-add_task(async function() {
-  await gCategoryUtilities.openType("extension");
-  info("Extension");
-  let list = gManagerWindow.document.getElementById("addon-list");
-  let item = await check_addon_has_version(list, "Extension 1", "123");
-  await open_details(list, item);
-  is_element_visible(get("detail-version"), "Details view has version visible");
-  is(get("detail-version").value, "123", "Details view has correct version");
-});
-
-add_task(async function() {
-  await gCategoryUtilities.openType("theme");
-  info("Normal theme");
-  let list = gManagerWindow.document.getElementById("addon-list");
-  let item = await check_addon_has_version(list, "Theme 2", "456");
-  await open_details(list, item);
-  is_element_visible(get("detail-version"), "Details view has version visible");
-  is(get("detail-version").value, "456", "Details view has correct version");
-});
-
-add_task(async function() {
-  await gCategoryUtilities.openType("theme");
-  info("Lightweight theme");
-  let list = gManagerWindow.document.getElementById("addon-list");
-  // See that the version isn't displayed
-  let item = await check_addon_has_version(list, "Persona 3", undefined);
-  await open_details(list, item);
-  is_element_hidden(get("detail-version"), "Details view has version hidden");
-  // If the version element is hidden then we don't care about its value
-});
-
-add_task(function end_test() {
-  close_manager(gManagerWindow, finish);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug587970.js
+++ /dev/null
@@ -1,294 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-
-// Bug 587970 - Provide ability "Update all now" within 'Available Updates' screen
-
-var gManagerWindow;
-var gProvider;
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files for these test cases, "Update all now" has been deprecated
-// and not supported in HTML about:addons).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "addon 1",
-      version: "1.0",
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE,
-    },
-    {
-      id: "addon2@tests.mozilla.org",
-      name: "addon 2",
-      version: "2.0",
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE,
-    },
-    {
-      id: "addon3@tests.mozilla.org",
-      name: "addon 3",
-      version: "3.0",
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE,
-    },
-  ]);
-
-  let aWindow = await open_manager("addons://updates/available");
-  gManagerWindow = aWindow;
-  run_next_test();
-}
-
-function end_test() {
-  close_manager(gManagerWindow, finish);
-}
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  is(list.childNodes.length, 0, "Available updates list should be empty");
-
-  var emptyNotice = gManagerWindow.document.getElementById(
-    "empty-availableUpdates-msg"
-  );
-  is_element_visible(emptyNotice, "Empty notice should be visible");
-
-  var updateSelected = gManagerWindow.document.getElementById(
-    "update-selected-btn"
-  );
-  is_element_hidden(updateSelected, "Update Selected button should be hidden");
-
-  info("Adding updates");
-  gProvider.createInstalls([
-    {
-      name: "addon 1",
-      version: "1.1",
-      existingAddon: gProvider.addons[0],
-    },
-    {
-      name: "addon 2",
-      version: "2.1",
-      existingAddon: gProvider.addons[1],
-    },
-    {
-      name: "addon 3",
-      version: "3.1",
-      existingAddon: gProvider.addons[2],
-    },
-  ]);
-
-  function wait_for_refresh() {
-    if (
-      list.childNodes.length == 3 &&
-      list.childNodes[0].mManualUpdate &&
-      list.childNodes[1].mManualUpdate &&
-      list.childNodes[2].mManualUpdate
-    ) {
-      run_next_test();
-    } else {
-      info("Waiting for pane to refresh");
-      setTimeout(wait_for_refresh, 10);
-    }
-  }
-  info("Waiting for pane to refresh");
-  setTimeout(wait_for_refresh, 10);
-});
-
-add_test(function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  is(list.childNodes.length, 3, "Available updates list should have 2 items");
-
-  var item1 = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
-  isnot(item1, null, "Item for addon1@tests.mozilla.org should be in list");
-  var item2 = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
-  isnot(item2, null, "Item for addon2@tests.mozilla.org should be in list");
-  var item3 = get_addon_element(gManagerWindow, "addon3@tests.mozilla.org");
-  isnot(item3, null, "Item for addon3@tests.mozilla.org should be in list");
-
-  var emptyNotice = gManagerWindow.document.getElementById(
-    "empty-availableUpdates-msg"
-  );
-  is_element_hidden(emptyNotice, "Empty notice should be hidden");
-
-  var updateSelected = gManagerWindow.document.getElementById(
-    "update-selected-btn"
-  );
-  is_element_visible(
-    updateSelected,
-    "Update Selected button should be visible"
-  );
-  is(
-    updateSelected.disabled,
-    false,
-    "Update Selected button should be enabled by default"
-  );
-
-  is(
-    item1._includeUpdate.checked,
-    true,
-    "Include Update checkbox should be checked by default for addon1"
-  );
-  is(
-    item2._includeUpdate.checked,
-    true,
-    "Include Update checkbox should be checked by default for addon2"
-  );
-  is(
-    item3._includeUpdate.checked,
-    true,
-    "Include Update checkbox should be checked by default for addon3"
-  );
-
-  info("Unchecking Include Update checkbox for addon1");
-  EventUtils.synthesizeMouse(item1._includeUpdate, 2, 2, {}, gManagerWindow);
-  is(
-    item1._includeUpdate.checked,
-    false,
-    "Include Update checkbox should now be be unchecked for addon1"
-  );
-  is(
-    updateSelected.disabled,
-    false,
-    "Update Selected button should still be enabled"
-  );
-
-  info("Unchecking Include Update checkbox for addon2");
-  EventUtils.synthesizeMouse(item2._includeUpdate, 2, 2, {}, gManagerWindow);
-  is(
-    item2._includeUpdate.checked,
-    false,
-    "Include Update checkbox should now be be unchecked for addon2"
-  );
-  is(
-    updateSelected.disabled,
-    false,
-    "Update Selected button should still be enabled"
-  );
-
-  info("Unchecking Include Update checkbox for addon3");
-  EventUtils.synthesizeMouse(item3._includeUpdate, 2, 2, {}, gManagerWindow);
-  is(
-    item3._includeUpdate.checked,
-    false,
-    "Include Update checkbox should now be be unchecked for addon3"
-  );
-  is(
-    updateSelected.disabled,
-    true,
-    "Update Selected button should now be disabled"
-  );
-
-  info("Checking Include Update checkbox for addon2");
-  EventUtils.synthesizeMouse(item2._includeUpdate, 2, 2, {}, gManagerWindow);
-  is(
-    item2._includeUpdate.checked,
-    true,
-    "Include Update checkbox should now be be checked for addon2"
-  );
-  is(
-    updateSelected.disabled,
-    false,
-    "Update Selected button should now be enabled"
-  );
-
-  info("Checking Include Update checkbox for addon3");
-  EventUtils.synthesizeMouse(item3._includeUpdate, 2, 2, {}, gManagerWindow);
-  is(
-    item3._includeUpdate.checked,
-    true,
-    "Include Update checkbox should now be be checked for addon3"
-  );
-  is(
-    updateSelected.disabled,
-    false,
-    "Update Selected button should now be enabled"
-  );
-
-  var installCount = 0;
-  var listener = {
-    onDownloadStarted(aInstall) {
-      isnot(
-        aInstall.existingAddon.id,
-        "addon1@tests.mozilla.org",
-        "Should not have seen a download start for addon1"
-      );
-    },
-
-    onInstallEnded(aInstall) {
-      if (++installCount < 2) {
-        return;
-      }
-
-      gProvider.installs[0].removeTestListener(listener);
-      gProvider.installs[1].removeTestListener(listener);
-      gProvider.installs[2].removeTestListener(listener);
-
-      // Installs are started synchronously so by the time an executeSoon is
-      // executed all installs that are going to start will have started
-      executeSoon(function() {
-        is(
-          gProvider.installs[0].state,
-          AddonManager.STATE_AVAILABLE,
-          "addon1 should not have been upgraded"
-        );
-        is(
-          gProvider.installs[1].state,
-          AddonManager.STATE_INSTALLED,
-          "addon2 should have been upgraded"
-        );
-        is(
-          gProvider.installs[2].state,
-          AddonManager.STATE_INSTALLED,
-          "addon3 should have been upgraded"
-        );
-
-        run_next_test();
-      });
-    },
-  };
-  gProvider.installs[0].addTestListener(listener);
-  gProvider.installs[1].addTestListener(listener);
-  gProvider.installs[2].addTestListener(listener);
-  info("Clicking Update Selected button");
-  EventUtils.synthesizeMouseAtCenter(updateSelected, {}, gManagerWindow);
-});
-
-add_test(function() {
-  var updateSelected = gManagerWindow.document.getElementById(
-    "update-selected-btn"
-  );
-  is(
-    updateSelected.disabled,
-    true,
-    "Update Selected button should be disabled"
-  );
-
-  var item1 = get_addon_element(gManagerWindow, "addon1@tests.mozilla.org");
-  isnot(item1, null, "Item for addon1@tests.mozilla.org should be in list");
-  is(
-    item1._includeUpdate.checked,
-    false,
-    "Include Update checkbox should not have changed"
-  );
-
-  info("Checking Include Update checkbox for addon1");
-  EventUtils.synthesizeMouse(item1._includeUpdate, 2, 2, {}, gManagerWindow);
-  is(
-    item1._includeUpdate.checked,
-    true,
-    "Include Update checkbox should now be be checked for addon1"
-  );
-  is(
-    updateSelected.disabled,
-    false,
-    "Update Selected button should now not be disabled"
-  );
-
-  run_next_test();
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug590347.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 590347
-// Tests if softblock notifications are exposed in preference to incompatible
-// notifications when compatibility checking is disabled
-
-var gProvider;
-var gManagerWindow;
-var gCategoryUtilities;
-
-var gApp = document.getElementById("bundle_brand").getString("brandShortName");
-var gVersion = Services.appinfo.version;
-
-// Tested in browser_html_warning_messages.js for HTML.
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-// Opens the details view of an add-on
-async function open_details(aId, aType, aCallback) {
-  requestLongerTimeout(2);
-
-  await gCategoryUtilities.openType(aType);
-  var list = gManagerWindow.document.getElementById("addon-list");
-  var item = list.firstChild;
-  while (item) {
-    if ("mAddon" in item && item.mAddon.id == aId) {
-      list.ensureElementIsVisible(item);
-      EventUtils.synthesizeMouseAtCenter(
-        item,
-        { clickCount: 1 },
-        gManagerWindow
-      );
-      EventUtils.synthesizeMouseAtCenter(
-        item,
-        { clickCount: 2 },
-        gManagerWindow
-      );
-      wait_for_view_load(gManagerWindow, aCallback);
-      return;
-    }
-    item = item.nextSibling;
-  }
-  ok(false, "Should have found the add-on in the list");
-}
-
-function get_list_view_warning_node() {
-  let item = gManagerWindow.document.getElementById("addon-list").firstChild;
-  let found = false;
-  while (item) {
-    if (item.mAddon.name == "Test add-on") {
-      found = true;
-      break;
-    }
-    item = item.nextSibling;
-  }
-  ok(found, "Test add-on node should have been found.");
-  return item.ownerDocument.getAnonymousElementByAttribute(
-    item,
-    "anonid",
-    "warning"
-  );
-}
-
-function get_detail_view_warning_node(aManagerWindow) {
-  if (aManagerWindow) {
-    return aManagerWindow.document.getElementById("detail-warning");
-  }
-  return undefined;
-}
-
-async function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "Test add-on",
-      description: "A test add-on",
-      isCompatible: false,
-      blocklistState: Ci.nsIBlocklistService.STATE_SOFTBLOCKED,
-    },
-  ]);
-
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-  run_next_test();
-}
-
-async function end_test() {
-  await close_manager(gManagerWindow);
-  finish();
-}
-
-// Check with compatibility checking enabled
-add_test(async function() {
-  await gCategoryUtilities.openType("extension");
-  Services.prefs.setBoolPref(PREF_CHECK_COMPATIBILITY, true);
-  let warning_node = get_list_view_warning_node();
-  is_element_visible(warning_node, "Warning message should be visible");
-  is(
-    warning_node.textContent,
-    "Test add-on is incompatible with " + gApp + " " + gVersion + ".",
-    "Warning message should be correct"
-  );
-  run_next_test();
-});
-
-add_test(function() {
-  open_details("addon1@tests.mozilla.org", "extension", function() {
-    let warning_node = get_detail_view_warning_node(gManagerWindow);
-    is_element_visible(warning_node, "Warning message should be visible");
-    is(
-      warning_node.textContent,
-      "Test add-on is incompatible with " + gApp + " " + gVersion + ".",
-      "Warning message should be correct"
-    );
-    Services.prefs.setBoolPref(PREF_CHECK_COMPATIBILITY, false);
-    run_next_test();
-  });
-});
-
-// Check with compatibility checking disabled
-add_test(async function() {
-  await gCategoryUtilities.openType("extension");
-  let warning_node = get_list_view_warning_node();
-  is_element_visible(warning_node, "Warning message should be visible");
-  is(
-    warning_node.textContent,
-    "Test add-on is known to cause security or stability issues.",
-    "Warning message should be correct"
-  );
-  run_next_test();
-});
-
-add_test(function() {
-  open_details("addon1@tests.mozilla.org", "extension", function() {
-    let warning_node = get_detail_view_warning_node(gManagerWindow);
-    is_element_visible(warning_node, "Warning message should be visible");
-    is(
-      warning_node.textContent,
-      "Test add-on is known to cause security or stability issues.",
-      "Warning message should be correct"
-    );
-    run_next_test();
-  });
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Test that the empty notice in the list view disappears as it should
-
-// Don't use a standard list view (e.g. "extension") to ensure that the list is
-// initially empty. Don't need to worry about the list of categories displayed
-// since only the list view itself is tested.
-var VIEW_ID = "addons://list/mock-addon";
-
-var LIST_ID = "addon-list";
-var EMPTY_ID = "addon-list-empty";
-
-var gManagerWindow;
-var gProvider;
-var gItem;
-
-var gInstallProperties = {
-  name: "Bug 591663 Mock Install",
-  type: "mock-addon",
-};
-var gAddonProperties = {
-  id: "test1@tests.mozilla.org",
-  name: "Bug 591663 Mock Add-on",
-  type: "mock-addon",
-};
-var gExtensionProperties = {
-  name: "Bug 591663 Extension Install",
-  type: "extension",
-};
-
-// Not implemented yet on HTML about:addons (Bug 1550911).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider(true, [
-    {
-      id: "mock-addon",
-      name: "Mock Add-ons",
-      uiPriority: 4500,
-      flags: AddonManager.TYPE_UI_VIEW_LIST,
-    },
-  ]);
-
-  let aWindow = await open_manager(VIEW_ID);
-  gManagerWindow = aWindow;
-  run_next_test();
-}
-
-function end_test() {
-  close_manager(gManagerWindow, finish);
-}
-
-/**
- * Check that the list view is as expected
- *
- * @param  aItem
- *         The expected item in the list, or null if list should be empty
- */
-function check_list(aItem) {
-  // Check state of the empty notice
-  let emptyNotice = gManagerWindow.document.getElementById(EMPTY_ID);
-  ok(emptyNotice != null, "Should have found the empty notice");
-  is(
-    !emptyNotice.hidden,
-    aItem == null,
-    "Empty notice should be showing if list empty"
-  );
-
-  // Check the children of the list
-  let list = gManagerWindow.document.getElementById(LIST_ID);
-  is(
-    list.childNodes.length,
-    aItem ? 1 : 0,
-    "Should get expected number of items in list"
-  );
-  if (aItem != null) {
-    let itemName = list.firstChild.getAttribute("name");
-    is(itemName, aItem.name, "List item should have correct name");
-  }
-}
-
-// Test that the empty notice is showing and no items are showing in list
-add_test(function() {
-  check_list(null);
-  run_next_test();
-});
-
-// Test that a new, non-active, install does not affect the list view
-add_test(function() {
-  gItem = gProvider.createInstalls([gInstallProperties])[0];
-  check_list(null);
-  run_next_test();
-});
-
-// Test that onInstallStarted properly hides empty notice and adds install to list
-add_test(function() {
-  gItem.addTestListener({
-    onDownloadStarted() {
-      // Install type unknown until download complete
-      check_list(null);
-    },
-    onInstallStarted() {
-      check_list(gItem);
-    },
-    onInstallEnded() {
-      check_list(gItem);
-      run_next_test();
-    },
-  });
-
-  gItem.install();
-});
-
-// Test that restarting the manager does not change list
-add_test(async function() {
-  let aManagerWindow = await restart_manager(gManagerWindow, VIEW_ID);
-  gManagerWindow = aManagerWindow;
-  check_list(gItem);
-  run_next_test();
-});
-
-// Test that onInstallCancelled removes install and shows empty notice
-add_test(function() {
-  gItem.cancel();
-  gItem = null;
-  check_list(null);
-  run_next_test();
-});
-
-// Test that add-ons of a different type do not show up in the list view
-add_test(function() {
-  let extension = gProvider.createInstalls([gExtensionProperties])[0];
-  check_list(null);
-
-  extension.addTestListener({
-    onDownloadStarted() {
-      check_list(null);
-    },
-    onInstallStarted() {
-      check_list(null);
-    },
-    onInstallEnded() {
-      check_list(null);
-      extension.cancel();
-      run_next_test();
-    },
-  });
-
-  extension.install();
-});
-
-// Test that onExternalInstall properly hides empty notice and adds install to list
-add_test(function() {
-  gItem = gProvider.createAddons([gAddonProperties])[0];
-  check_list(gItem);
-  run_next_test();
-});
-
-// Test that restarting the manager does not change list
-add_test(async function() {
-  let aManagerWindow = await restart_manager(gManagerWindow, VIEW_ID);
-  gManagerWindow = aManagerWindow;
-  check_list(gItem);
-  run_next_test();
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug618502.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 608316 - Test that opening the manager to an add-on that doesn't exist
-// just loads the default view
-
-var gCategoryUtilities;
-
-// Not implemented yet on HTML about:addons (Bug 1552184), once supported
-// this test case will be included in the HTML about:addons test files.
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-function test() {
-  waitForExplicitFinish();
-
-  run_next_test();
-}
-
-function end_test() {
-  finish();
-}
-
-add_test(async function() {
-  let aManager = await open_manager("addons://detail/foo");
-  gCategoryUtilities = new CategoryUtilities(aManager);
-  is(
-    gCategoryUtilities.selectedCategory,
-    "discover",
-    "Should fall back to the discovery pane"
-  );
-
-  close_manager(aManager, run_next_test);
-});
-
-// Also test that opening directly to an add-on that does exist doesn't break
-// and selects the right category
-add_test(async function() {
-  new MockProvider().createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "addon 1",
-      version: "1.0",
-    },
-  ]);
-
-  let aManager = await open_manager("addons://detail/addon1@tests.mozilla.org");
-  gCategoryUtilities = new CategoryUtilities(aManager);
-  is(
-    gCategoryUtilities.selectedCategory,
-    "extension",
-    "Should have selected the right category"
-  );
-
-  close_manager(aManager, run_next_test);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ /dev/null
@@ -1,1240 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests various aspects of the details view
-
-const { AppConstants } = ChromeUtils.import(
-  "resource://gre/modules/AppConstants.jsm"
-);
-
-const PREF_AUTOUPDATE_DEFAULT = "extensions.update.autoUpdateDefault";
-
-var gManagerWindow;
-var gCategoryUtilities;
-var gProvider;
-
-var gApp = document.getElementById("bundle_brand").getString("brandShortName");
-var gVersion = Services.appinfo.version;
-var gDate = new Date(2010, 7, 1);
-var infoURL =
-  Services.urlFormatter.formatURLPref("app.support.baseURL") +
-  "unsigned-addons";
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files for these test cases).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function open_details(aId, aType, aCallback) {
-  requestLongerTimeout(2);
-
-  await gCategoryUtilities.openType(aType);
-  var list = gManagerWindow.document.getElementById("addon-list");
-  var item = list.firstChild;
-  while (item) {
-    if ("mAddon" in item && item.mAddon.id == aId) {
-      list.ensureElementIsVisible(item);
-      EventUtils.synthesizeMouseAtCenter(
-        item,
-        { clickCount: 1 },
-        gManagerWindow
-      );
-      EventUtils.synthesizeMouseAtCenter(
-        item,
-        { clickCount: 2 },
-        gManagerWindow
-      );
-      wait_for_view_load(gManagerWindow, aCallback);
-      return;
-    }
-    item = item.nextSibling;
-  }
-  ok(false, "Should have found the add-on in the list");
-}
-
-function get(aId) {
-  return gManagerWindow.document.getElementById(aId);
-}
-
-async function test() {
-  requestLongerTimeout(2);
-
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "Test add-on 1",
-      version: "2.1",
-      description: "Short description",
-      fullDescription: "Longer description",
-      type: "extension",
-      iconURL: "chrome://foo/skin/icon.png",
-      contributionURL: "http://foo.com",
-      contributionAmount: "$0.99",
-      sourceURI: Services.io.newURI("http://example.com/foo"),
-      averageRating: 4,
-      reviewCount: 5,
-      reviewURL: "http://example.com/reviews",
-      homepageURL: "http://example.com/addon1",
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_ENABLE,
-    },
-    {
-      id: "addon2@tests.mozilla.org",
-      name: "Test add-on 2",
-      version: "2.2",
-      description: "Short description",
-      creator: { name: "Mozilla", url: null },
-      type: "extension",
-      iconURL: "chrome://foo/skin/icon.png",
-      contributionURL: "http://foo.com",
-      contributionAmount: null,
-      updateDate: gDate,
-      permissions: AddonManager.PERM_CAN_CHANGE_PRIVATEBROWSING_ACCESS,
-    },
-    {
-      id: "addon-theme@tests.mozilla.org",
-      name: "Test add-on theme",
-      version: "2.3",
-      description: "Short description",
-      creator: { name: "Mozilla", url: null },
-      type: "theme",
-      iconURL: "chrome://foo/skin/icon.png",
-      contributionURL: "http://foo.com",
-      contributionAmount: null,
-      updateDate: gDate,
-      permissions: 0,
-    },
-    {
-      id: "addon3@tests.mozilla.org",
-      name: "Test add-on 3",
-      description: "Short description",
-      creator: { name: "Mozilla", url: "http://www.mozilla.org" },
-      type: "extension",
-      sourceURI: Services.io.newURI("http://example.com/foo"),
-      updateDate: gDate,
-      reviewCount: 1,
-      reviewURL: "http://example.com/reviews",
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE,
-      isActive: false,
-      isCompatible: false,
-      appDisabled: true,
-      permissions:
-        AddonManager.PERM_CAN_ENABLE |
-        AddonManager.PERM_CAN_DISABLE |
-        AddonManager.PERM_CAN_UPGRADE,
-    },
-    {
-      id: "addon5@tests.mozilla.org",
-      blocklistURL: "http://example.com/addon5@tests.mozilla.org",
-      name: "Test add-on 5",
-      isActive: false,
-      blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
-      appDisabled: true,
-    },
-    {
-      id: "addon8@tests.mozilla.org",
-      blocklistURL: "http://example.com/addon8@tests.mozilla.org",
-      name: "Test add-on 8",
-      blocklistState: Ci.nsIBlocklistService.STATE_OUTDATED,
-    },
-    {
-      id: "addon9@tests.mozilla.org",
-      name: "Test add-on 9",
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-    },
-    {
-      id: "addon10@tests.mozilla.org",
-      name: "Test add-on 10",
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-      isActive: false,
-      appDisabled: true,
-      isCompatible: false,
-    },
-    {
-      id: "addon11@tests.mozilla.org",
-      name: "Test add-on 11",
-      signedState: AddonManager.SIGNEDSTATE_PRELIMINARY,
-      foreignInstall: true,
-      isActive: false,
-      appDisabled: true,
-      isCompatible: false,
-    },
-    {
-      id: "addon12@tests.mozilla.org",
-      name: "Test add-on 12",
-      signedState: AddonManager.SIGNEDSTATE_SIGNED,
-      foreignInstall: true,
-      isCorrectlySigned: true,
-      permissions:
-        AddonManager.PERM_CAN_UNINSTALL |
-        AddonManager.PERM_CAN_ENABLE |
-        AddonManager.PERM_CAN_DISABLE |
-        (AddonManager.PERM_CAN_UPGRADE &
-          ~AddonManager.PERM_CAN_CHANGE_PRIVATEBROWSING_ACCESS),
-    },
-  ]);
-
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  run_next_test();
-}
-
-async function end_test() {
-  await close_manager(gManagerWindow);
-  finish();
-}
-
-// Opens and tests the details view for add-on 2
-add_test(async function() {
-  open_details("addon2@tests.mozilla.org", "extension", async () => {
-    is(
-      get("detail-name").textContent,
-      "Test add-on 2",
-      "Name should be correct"
-    );
-    is_element_visible(get("detail-version"), "Version should not be hidden");
-    is(get("detail-version").value, "2.2", "Version should be correct");
-    is(
-      get("detail-icon").src,
-      "chrome://foo/skin/icon.png",
-      "Icon should be correct"
-    );
-
-    is_element_visible(get("detail-creator"), "Creator should not be hidden");
-    is_element_visible(
-      get("detail-creator")._creatorName,
-      "Creator name should not be hidden"
-    );
-    is(
-      get("detail-creator")._creatorName.value,
-      "Mozilla",
-      "Creator should be correct"
-    );
-    is_element_hidden(
-      get("detail-creator")._creatorLink,
-      "Creator link should be hidden"
-    );
-
-    is(
-      get("detail-desc").textContent,
-      "Short description",
-      "Description should be correct"
-    );
-    is_element_hidden(
-      get("detail-fulldesc"),
-      "Full description should be hidden"
-    );
-
-    is_element_visible(
-      get("detail-contributions"),
-      "Contributions section should be visible"
-    );
-
-    is_element_visible(
-      get("detail-dateUpdated"),
-      "Update date should not be hidden"
-    );
-    is(
-      get("detail-dateUpdated").value,
-      formatDate(gDate),
-      "Update date should be correct"
-    );
-
-    is_element_visible(
-      get("detail-privateBrowsing-row"),
-      "Private browsing should not be hidden"
-    );
-    is_element_visible(
-      get("detail-privateBrowsing-row-footer"),
-      "Private browsing footer should not be hidden"
-    );
-    is(
-      get("detail-privateBrowsing").value,
-      "0",
-      "Private browsing should be off"
-    );
-
-    is_element_hidden(get("detail-rating-row"), "Rating should be hidden");
-
-    is_element_hidden(
-      get("detail-homepage-row"),
-      "Homepage should not be visible"
-    );
-    is_element_hidden(
-      get("detail-repository-row"),
-      "Repository profile should not be visible"
-    );
-
-    is_element_hidden(get("detail-updates-row"), "Updates should be hidden");
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-uninstall-btn"),
-      "Remove button should be hidden"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
-    is_element_hidden(
-      get("detail-pending"),
-      "Pending message should be hidden"
-    );
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on theme
-add_test(async function() {
-  // This is a duplicate of addon-2, so we're only testing that private browsing is
-  // not visible.
-  open_details("addon-theme@tests.mozilla.org", "theme", async () => {
-    is(
-      get("detail-name").textContent,
-      "Test add-on theme",
-      "Name should be correct"
-    );
-    is_element_visible(get("detail-version"), "Version should not be hidden");
-    is(get("detail-version").value, "2.3", "Version should be correct");
-    is(
-      get("detail-icon").src,
-      "chrome://foo/skin/icon.png",
-      "Icon should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-privateBrowsing-row"),
-      "Private browsing should be hidden"
-    );
-    is_element_hidden(
-      get("detail-privateBrowsing-row-footer"),
-      "Private browsing footer should be hidden"
-    );
-    is(
-      get("detail-privateBrowsing").value,
-      "0",
-      "Private browsing should be off"
-    );
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on 3
-add_test(function() {
-  open_details("addon3@tests.mozilla.org", "extension", function() {
-    is(
-      get("detail-name").textContent,
-      "Test add-on 3",
-      "Name should be correct"
-    );
-    is_element_hidden(get("detail-version"), "Version should be hidden");
-    is(get("detail-icon").src, "", "Icon should be correct");
-
-    is_element_visible(get("detail-creator"), "Creator should not be hidden");
-    is_element_hidden(
-      get("detail-creator")._creatorName,
-      "Creator name should be hidden"
-    );
-    is_element_visible(
-      get("detail-creator")._creatorLink,
-      "Creator link should not be hidden"
-    );
-    is(
-      get("detail-creator")._creatorLink.value,
-      "Mozilla",
-      "Creator link should be correct"
-    );
-    is(
-      get("detail-creator")._creatorLink.href,
-      "http://www.mozilla.org",
-      "Creator link href should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-contributions"),
-      "Contributions section should be hidden"
-    );
-
-    is_element_visible(
-      get("detail-updates-row"),
-      "Updates should not be hidden"
-    );
-    is_element_visible(
-      get("detail-dateUpdated"),
-      "Update date should not be hidden"
-    );
-    is(
-      get("detail-dateUpdated").value,
-      formatDate(gDate),
-      "Update date should be correct"
-    );
-
-    is_element_visible(
-      get("detail-rating-row"),
-      "Rating row should not be hidden"
-    );
-    is_element_hidden(get("detail-rating"), "Rating should be hidden");
-    is_element_visible(get("detail-reviews"), "Reviews should not be hidden");
-    is(
-      get("detail-reviews").href,
-      "http://example.com/reviews",
-      "Review URL should be correct"
-    );
-    is(
-      get("detail-reviews").value,
-      "1 review",
-      "Review text should be correct"
-    );
-
-    is_element_visible(
-      get("detail-autoUpdate"),
-      "Updates should not be hidden"
-    );
-    ok(get("detail-autoUpdate").lastChild.selected, "Updates should be manual");
-    is_element_visible(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be visible"
-    );
-    EventUtils.synthesizeMouseAtCenter(
-      get("detail-autoUpdate").childNodes[1],
-      {},
-      gManagerWindow
-    );
-    ok(
-      get("detail-autoUpdate").childNodes[1].selected,
-      "Updates should be automatic"
-    );
-    is_element_hidden(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be hidden"
-    );
-    EventUtils.synthesizeMouseAtCenter(
-      get("detail-autoUpdate").lastChild,
-      {},
-      gManagerWindow
-    );
-    ok(get("detail-autoUpdate").lastChild.selected, "Updates should be manual");
-    is_element_visible(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be visible"
-    );
-
-    info("Setting " + PREF_AUTOUPDATE_DEFAULT + " to true");
-    Services.prefs.setBoolPref(PREF_AUTOUPDATE_DEFAULT, true);
-    EventUtils.synthesizeMouseAtCenter(
-      get("detail-autoUpdate").firstChild,
-      {},
-      gManagerWindow
-    );
-    ok(
-      get("detail-autoUpdate").firstChild.selected,
-      "Updates should be default"
-    );
-    is_element_hidden(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be hidden"
-    );
-
-    info("Setting " + PREF_AUTOUPDATE_DEFAULT + " to false");
-    Services.prefs.setBoolPref(PREF_AUTOUPDATE_DEFAULT, false);
-    ok(
-      get("detail-autoUpdate").firstChild.selected,
-      "Updates should be default"
-    );
-    is_element_visible(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be visible"
-    );
-    EventUtils.synthesizeMouseAtCenter(
-      get("detail-autoUpdate").childNodes[1],
-      {},
-      gManagerWindow
-    );
-    ok(
-      get("detail-autoUpdate").childNodes[1].selected,
-      "Updates should be automatic"
-    );
-    is_element_hidden(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be hidden"
-    );
-    EventUtils.synthesizeMouseAtCenter(
-      get("detail-autoUpdate").firstChild,
-      {},
-      gManagerWindow
-    );
-    ok(
-      get("detail-autoUpdate").firstChild.selected,
-      "Updates should be default"
-    );
-    is_element_visible(
-      get("detail-findUpdates-btn"),
-      "Check for updates should be visible"
-    );
-    Services.prefs.clearUserPref(PREF_AUTOUPDATE_DEFAULT);
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-uninstall-btn"),
-      "Remove button should be hidden"
-    );
-
-    is_element_visible(
-      get("detail-warning"),
-      "Warning message should be visible"
-    );
-    is(
-      get("detail-warning").textContent,
-      "Test add-on 3 is incompatible with " + gApp + " " + gVersion + ".",
-      "Warning message should be correct"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
-    is_element_hidden(
-      get("detail-pending"),
-      "Pending message should be hidden"
-    );
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on 5
-add_test(function() {
-  open_details("addon5@tests.mozilla.org", "extension", async function() {
-    await TestUtils.waitForCondition(
-      () => !BrowserTestUtils.is_hidden(get("detail-error-link"))
-    );
-    is(
-      get("detail-name").textContent,
-      "Test add-on 5",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_visible(get("detail-error"), "Error message should be visible");
-    is(
-      get("detail-error").textContent,
-      "Test add-on 5 has been disabled due to security or stability issues.",
-      "Error message should be correct"
-    );
-    is_element_visible(
-      get("detail-error-link"),
-      "Error link should be visible"
-    );
-    is(
-      get("detail-error-link").value,
-      "More Information",
-      "Error link text should be correct"
-    );
-    is(
-      get("detail-error-link").href,
-      "http://example.com/addon5@tests.mozilla.org",
-      "Error link should be correct"
-    );
-    is_element_hidden(
-      get("detail-pending"),
-      "Pending message should be hidden"
-    );
-
-    run_next_test();
-  });
-});
-
-// These tests are only appropriate when signing can be turned off
-if (!AppConstants.MOZ_REQUIRE_SIGNING) {
-  // Opens and tests the details view for add-on 9
-  add_test(function() {
-    open_details("addon9@tests.mozilla.org", "extension", function() {
-      is(
-        get("detail-name").textContent,
-        "Test add-on 9",
-        "Name should be correct"
-      );
-
-      is_element_hidden(
-        get("detail-prefs-btn"),
-        "Preferences button should be hidden"
-      );
-      is_element_hidden(
-        get("detail-enable-btn"),
-        "Enable button should be hidden"
-      );
-      is_element_visible(
-        get("detail-disable-btn"),
-        "Disable button should be visible"
-      );
-      is_element_visible(
-        get("detail-uninstall-btn"),
-        "Remove button should be visible"
-      );
-
-      is_element_hidden(get("detail-error"), "Error message should be hidden");
-      is_element_hidden(
-        get("detail-error-link"),
-        "Error link should be hidden"
-      );
-      is_element_visible(
-        get("detail-warning"),
-        "Error message should be visible"
-      );
-      is(
-        get("detail-warning").textContent,
-        "Test add-on 9 could not be verified for use in " +
-          gApp +
-          ". Proceed with caution.",
-        "Warning message should be correct"
-      );
-      is_element_visible(
-        get("detail-warning-link"),
-        "Warning link should be visible"
-      );
-      is(
-        get("detail-warning-link").value,
-        "More Information",
-        "Warning link text should be correct"
-      );
-      is(
-        get("detail-warning-link").href,
-        infoURL,
-        "Warning link should be correct"
-      );
-      is_element_hidden(
-        get("detail-pending"),
-        "Pending message should be hidden"
-      );
-
-      run_next_test();
-    });
-  });
-}
-
-// Opens and tests the details view for add-on 9 with signing required
-add_test(async function() {
-  await close_manager(gManagerWindow);
-  Services.prefs.setBoolPref("xpinstall.signatures.required", true);
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  open_details("addon9@tests.mozilla.org", "extension", async function() {
-    await TestUtils.waitForCondition(
-      () => !BrowserTestUtils.is_hidden(get("detail-error-link"))
-    );
-    is(
-      get("detail-name").textContent,
-      "Test add-on 9",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-disable-btn"),
-      "Disable button should be visible"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_visible(get("detail-error"), "Error message should be visible");
-    is(
-      get("detail-error").textContent,
-      "Test add-on 9 could not be verified for use in " +
-        gApp +
-        " and has been disabled.",
-      "Error message should be correct"
-    );
-    is_element_visible(
-      get("detail-error-link"),
-      "Error link should be visible"
-    );
-    is(
-      get("detail-error-link").value,
-      "More Information",
-      "Error link text should be correct"
-    );
-    is(get("detail-error-link").href, infoURL, "Error link should be correct");
-
-    await close_manager(gManagerWindow);
-    Services.prefs.setBoolPref("xpinstall.signatures.required", false);
-    aWindow = await open_manager(null);
-    gManagerWindow = aWindow;
-    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-    run_next_test();
-  });
-});
-
-// These tests are only appropriate when signing can be turned off
-if (!AppConstants.REQUIRE_SIGNING) {
-  // Opens and tests the details view for add-on 10
-  add_test(function() {
-    open_details("addon10@tests.mozilla.org", "extension", function() {
-      is(
-        get("detail-name").textContent,
-        "Test add-on 10",
-        "Name should be correct"
-      );
-
-      is_element_hidden(
-        get("detail-prefs-btn"),
-        "Preferences button should be hidden"
-      );
-      is_element_hidden(
-        get("detail-enable-btn"),
-        "Enable button should be hidden"
-      );
-      is_element_hidden(
-        get("detail-disable-btn"),
-        "Disable button should be hidden"
-      );
-      is_element_visible(
-        get("detail-uninstall-btn"),
-        "Remove button should be visible"
-      );
-
-      is_element_visible(
-        get("detail-warning"),
-        "Warning message should be visible"
-      );
-      is(
-        get("detail-warning").textContent,
-        "Test add-on 10 is incompatible with " + gApp + " " + gVersion + ".",
-        "Warning message should be correct"
-      );
-      is_element_hidden(
-        get("detail-warning-link"),
-        "Warning link should be hidden"
-      );
-      is_element_hidden(get("detail-error"), "Error message should be hidden");
-      is_element_hidden(
-        get("detail-error-link"),
-        "Error link should be hidden"
-      );
-      is_element_hidden(
-        get("detail-pending"),
-        "Pending message should be hidden"
-      );
-
-      run_next_test();
-    });
-  });
-}
-
-// Opens and tests the details view for add-on 10 with signing required
-add_test(async function() {
-  await close_manager(gManagerWindow);
-  Services.prefs.setBoolPref("xpinstall.signatures.required", true);
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  open_details("addon10@tests.mozilla.org", "extension", async function() {
-    await TestUtils.waitForCondition(
-      () => !BrowserTestUtils.is_hidden(get("detail-error-link"))
-    );
-    is(
-      get("detail-name").textContent,
-      "Test add-on 10",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_visible(get("detail-error"), "Error message should be visible");
-    is(
-      get("detail-error").textContent,
-      "Test add-on 10 could not be verified for use in " +
-        gApp +
-        " and has been disabled.",
-      "Error message should be correct"
-    );
-    is_element_visible(
-      get("detail-error-link"),
-      "Error link should be visible"
-    );
-    is(
-      get("detail-error-link").value,
-      "More Information",
-      "Error link text should be correct"
-    );
-    is(get("detail-error-link").href, infoURL, "Error link should be correct");
-
-    await close_manager(gManagerWindow);
-    Services.prefs.setBoolPref("xpinstall.signatures.required", false);
-    aWindow = await open_manager(null);
-    gManagerWindow = aWindow;
-    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on 11
-add_test(function() {
-  open_details("addon11@tests.mozilla.org", "extension", function() {
-    is(
-      get("detail-name").textContent,
-      "Test add-on 11",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_visible(
-      get("detail-warning"),
-      "Warning message should be visible"
-    );
-    is(
-      get("detail-warning").textContent,
-      "Test add-on 11 is incompatible with " + gApp + " " + gVersion + ".",
-      "Warning message should be correct"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
-    is_element_hidden(
-      get("detail-pending"),
-      "Pending message should be hidden"
-    );
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on 11 with signing required
-add_test(async function() {
-  await close_manager(gManagerWindow);
-  Services.prefs.setBoolPref("xpinstall.signatures.required", true);
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  open_details("addon11@tests.mozilla.org", "extension", async function() {
-    is(
-      get("detail-name").textContent,
-      "Test add-on 11",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_visible(
-      get("detail-warning"),
-      "Warning message should be visible"
-    );
-    is(
-      get("detail-warning").textContent,
-      "Test add-on 11 is incompatible with " + gApp + " " + gVersion + ".",
-      "Warning message should be correct"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
-
-    await close_manager(gManagerWindow);
-    Services.prefs.setBoolPref("xpinstall.signatures.required", false);
-    aWindow = await open_manager(null);
-    gManagerWindow = aWindow;
-    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on 12
-add_test(function() {
-  open_details("addon12@tests.mozilla.org", "extension", function() {
-    is(
-      get("detail-name").textContent,
-      "Test add-on 12",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-disable-btn"),
-      "Disable button should be visible"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
-    is_element_hidden(
-      get("detail-pending"),
-      "Pending message should be hidden"
-    );
-
-    // Ensure that for a visible privileged addon (which is still going to be allowed
-    // on PB windows automatically on every extension startup) the private browsing
-    // row is hidden (See Bug 1533150 for a rationale).
-    is_element_hidden(
-      get("detail-privateBrowsing-row"),
-      "Private browsing should be hidden"
-    );
-    is_element_hidden(
-      get("detail-privateBrowsing-row-footer"),
-      "Private browsing footer should be hidden"
-    );
-
-    run_next_test();
-  });
-});
-
-// Opens and tests the details view for add-on 12 with signing required
-add_test(async function() {
-  await close_manager(gManagerWindow);
-  Services.prefs.setBoolPref("xpinstall.signatures.required", true);
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  open_details("addon12@tests.mozilla.org", "extension", async function() {
-    is(
-      get("detail-name").textContent,
-      "Test add-on 12",
-      "Name should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-disable-btn"),
-      "Disable button should be visible"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
-
-    await close_manager(gManagerWindow);
-    Services.prefs.setBoolPref("xpinstall.signatures.required", false);
-    aWindow = await open_manager(null);
-    gManagerWindow = aWindow;
-    gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-    run_next_test();
-  });
-});
-
-// Tests that upgrades with onExternalInstall apply immediately
-add_test(function() {
-  open_details("addon1@tests.mozilla.org", "extension", function() {
-    gProvider.createAddons([
-      {
-        id: "addon1@tests.mozilla.org",
-        name: "Test add-on replacement",
-        version: "2.5",
-        description: "Short description replacement",
-        fullDescription: "Longer description replacement",
-        type: "extension",
-        iconURL: "chrome://foo/skin/icon.png",
-        sourceURI: Services.io.newURI("http://example.com/foo"),
-        averageRating: 2,
-        optionsURL: "chrome://foo/content/options.xul",
-        applyBackgroundUpdates: AddonManager.AUTOUPDATE_ENABLE,
-        operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE,
-      },
-    ]);
-
-    is(
-      get("detail-name").textContent,
-      "Test add-on replacement",
-      "Name should be correct"
-    );
-    is_element_visible(get("detail-version"), "Version should not be hidden");
-    is(get("detail-version").value, "2.5", "Version should be correct");
-    is(
-      get("detail-icon").src,
-      "chrome://foo/skin/icon.png",
-      "Icon should be correct"
-    );
-    is_element_hidden(get("detail-creator"), "Creator should be hidden");
-    is(
-      get("detail-desc").textContent,
-      "Short description replacement",
-      "Description should be correct"
-    );
-    is(
-      get("detail-fulldesc").textContent,
-      "Longer description replacement",
-      "Full description should be correct"
-    );
-
-    is_element_hidden(
-      get("detail-contributions"),
-      "Contributions section should be hidden"
-    );
-
-    is_element_hidden(
-      get("detail-dateUpdated"),
-      "Update date should be hidden"
-    );
-
-    is_element_visible(
-      get("detail-rating-row"),
-      "Rating row should not be hidden"
-    );
-    is_element_visible(get("detail-rating"), "Rating should not be hidden");
-    is(get("detail-rating").averageRating, 2, "Rating should be correct");
-    is_element_hidden(get("detail-reviews"), "Reviews should be hidden");
-
-    is_element_hidden(get("detail-homepage-row"), "Homepage should be hidden");
-
-    is_element_hidden(
-      get("detail-prefs-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get("detail-enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_visible(
-      get("detail-disable-btn"),
-      "Disable button should be visible"
-    );
-    is_element_visible(
-      get("detail-uninstall-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should be hidden"
-    );
-    is_element_hidden(
-      get("detail-warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(get("detail-error"), "Error message should be hidden");
-    is_element_hidden(
-      get("detail-pending"),
-      "Pending message should be hidden"
-    );
-
-    run_next_test();
-  });
-});
-
-// Check that onPropertyChanges for appDisabled updates the UI
-add_test(async function() {
-  info("Checking that onPropertyChanges for appDisabled updates the UI");
-
-  let aAddon = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
-  await aAddon.disable();
-  aAddon.isCompatible = true;
-  aAddon.appDisabled = false;
-
-  open_details("addon1@tests.mozilla.org", "extension", function() {
-    is(
-      get("detail-view").getAttribute("active"),
-      "false",
-      "Addon should not be marked as active"
-    );
-    is_element_hidden(
-      get("detail-warning"),
-      "Warning message should not be visible"
-    );
-
-    info("Making addon incompatible and appDisabled");
-    aAddon.isCompatible = false;
-    aAddon.appDisabled = true;
-
-    is(
-      get("detail-view").getAttribute("active"),
-      "false",
-      "Addon should not be marked as active"
-    );
-    is_element_visible(
-      get("detail-warning"),
-      "Warning message should be visible"
-    );
-    is(
-      get("detail-warning").textContent,
-      "Test add-on replacement is incompatible with " +
-        gApp +
-        " " +
-        gVersion +
-        ".",
-      "Warning message should be correct"
-    );
-
-    run_next_test();
-  });
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_discovery.js
@@ -7,22 +7,18 @@
 const MAIN_URL = "https://example.com/" + RELATIVE_DIR + "discovery.html";
 
 var gManagerWindow;
 var gCategoryUtilities;
 var gProvider;
 
 var gLoadCompleteCallback = null;
 
-// This test file is testing the old XUL disco pane.
 SpecialPowers.pushPrefEnv({
-  set: [
-    ["extensions.htmlaboutaddons.enabled", false],
-    ["extensions.htmlaboutaddons.discover.enabled", false],
-  ],
+  set: [["extensions.htmlaboutaddons.discover.enabled", false]],
 });
 
 var gProgressListener = {
   onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
     // Only care about the network stop status events
     if (
       !(aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) ||
       !(aStateFlags & Ci.nsIWebProgressListener.STATE_STOP)
@@ -648,32 +644,16 @@ async function bug_601442_test_elements(
       "Discover category should be visible"
     );
   } else {
     ok(
       !gCategoryUtilities.isTypeVisible("discover"),
       "Discover category should not be visible"
     );
   }
-
-  gManagerWindow.loadView("addons://list/dictionary");
-  let aManager = await wait_for_view_load(gManagerWindow);
-  var button = aManager.document.getElementById("discover-button-install");
-  if (visible) {
-    ok(
-      !BrowserTestUtils.is_hidden(button),
-      "Discover button should be visible!"
-    );
-  } else {
-    ok(
-      BrowserTestUtils.is_hidden(button),
-      "Discover button should not be visible!"
-    );
-  }
-
   close_manager(gManagerWindow, run_next_test);
 }
 
 add_test(function() {
   Services.prefs.setBoolPref(PREF_DISCOVER_ENABLED, false);
   Services.prefs.setBoolPref(PREF_XPI_ENABLED, true);
   bug_601442_test_elements(false);
 });
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery_clientid.js
+++ /dev/null
@@ -1,77 +0,0 @@
-"use strict";
-
-const { ClientID } = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
-
-const MAIN_URL = "https://example.com/" + RELATIVE_DIR + "discovery.html";
-
-// This test is testing XUL about:addons UI (the HTML about:addons is tested in
-// browser_html_discover_view_clientid.js).
-SpecialPowers.pushPrefEnv({
-  set: [
-    ["extensions.htmlaboutaddons.discover.enabled", false],
-    ["extensions.htmlaboutaddons.enabled", false],
-  ],
-});
-
-function waitForHeader() {
-  return new Promise(resolve => {
-    let observer = (subject, topic, state) => {
-      let channel = subject.QueryInterface(Ci.nsIHttpChannel);
-      if (channel.URI.spec != MAIN_URL) {
-        return;
-      }
-      try {
-        resolve(channel.getRequestHeader("Moz-Client-Id"));
-      } catch (e) {
-        if (e.result == Cr.NS_ERROR_NOT_AVAILABLE) {
-          // The header was not set.
-          resolve(null);
-        }
-      } finally {
-        Services.obs.removeObserver(observer, "http-on-modify-request");
-      }
-    };
-    Services.obs.addObserver(observer, "http-on-modify-request");
-  });
-}
-
-add_task(async function setup() {
-  SpecialPowers.pushPrefEnv({
-    set: [
-      [PREF_DISCOVERURL, MAIN_URL],
-      ["datareporting.healthreport.uploadEnabled", true],
-      ["browser.discovery.enabled", true],
-    ],
-  });
-});
-
-add_task(async function test_no_private_clientid() {
-  let privateWindow = await BrowserTestUtils.openNewBrowserWindow({
-    private: true,
-  });
-  let [header, manager] = await Promise.all([
-    waitForHeader(),
-    open_manager(
-      "addons://discover/",
-      undefined,
-      undefined,
-      undefined,
-      privateWindow
-    ),
-  ]);
-  ok(PrivateBrowsingUtils.isContentWindowPrivate(manager), "window is private");
-  is(header, null, "header was not set");
-  await close_manager(manager);
-  await BrowserTestUtils.closeWindow(privateWindow);
-});
-
-add_task(async function test_clientid() {
-  let clientId = await ClientID.getClientIdHash();
-  ok(!!clientId, "clientId is avialable");
-  let [header, manager] = await Promise.all([
-    waitForHeader(),
-    open_manager("addons://discover/"),
-  ]);
-  is(header, clientId, "header was set");
-  await close_manager(manager);
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
@@ -70,20 +70,17 @@ async function checkInstallConfirmation(
     notificationCount,
     names.length,
     `Saw ${names.length} addon-install-started notification`
   );
   Services.obs.removeObserver(observer, "addon-install-started");
 }
 
 function getViewContainer(gManagerWindow) {
-  if (gManagerWindow.useHtmlViews) {
-    return gManagerWindow.document.getElementById("category-box");
-  }
-  return gManagerWindow.document.getElementById("view-port");
+  return gManagerWindow.document.getElementById("category-box");
 }
 
 // Simulates dropping a URL onto the manager
 add_task(async function test_drop_url() {
   let url = TESTROOT + "addons/browser_dragdrop1.xpi";
   gManagerWindow = await open_manager("addons://list/extension");
   let promise = checkInstallConfirmation("Drag Drop test 1");
   let viewContainer = getViewContainer(gManagerWindow);
--- a/toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js
@@ -9,84 +9,44 @@ const { AddonTestUtils } = ChromeUtils.i
   "resource://testing-common/AddonTestUtils.jsm"
 );
 const ADDON_ID = "addon1@test.mozilla.org";
 
 AddonTestUtils.initMochitest(this);
 
 function assertDisabledSideloadedExtensionElement(managerWindow, addonElement) {
   const doc = addonElement.ownerDocument;
-  if (managerWindow.useHtmlViews) {
-    const toggleDisabled = addonElement.querySelector(
-      '[action="toggle-disabled"]'
-    );
-    is(
-      doc.l10n.getAttributes(toggleDisabled).id,
-      "enable-addon-button",
-      "Addon toggle-disabled action has the enable label"
-    );
-  } else {
-    let el = doc.getAnonymousElementByAttribute(
-      addonElement,
-      "anonid",
-      "disable-btn"
-    );
-    is_element_hidden(el, "Disable button not visible.");
-    el = doc.getAnonymousElementByAttribute(
-      addonElement,
-      "anonid",
-      "enable-btn"
-    );
-    is_element_visible(el, "Enable button visible");
-  }
+  const toggleDisabled = addonElement.querySelector(
+    '[action="toggle-disabled"]'
+  );
+  is(
+    doc.l10n.getAttributes(toggleDisabled).id,
+    "enable-addon-button",
+    "Addon toggle-disabled action has the enable label"
+  );
 }
 
 function assertEnabledSideloadedExtensionElement(managerWindow, addonElement) {
   const doc = addonElement.ownerDocument;
-  if (managerWindow.useHtmlViews) {
-    const toggleDisabled = addonElement.querySelector(
-      '[action="toggle-disabled"]'
-    );
-    is(
-      doc.l10n.getAttributes(toggleDisabled).id,
-      "enable-addon-button",
-      "Addon toggle-disabled action has the enable label"
-    );
-  } else {
-    let el = doc.getAnonymousElementByAttribute(
-      addonElement,
-      "anonid",
-      "disable-btn"
-    );
-    is_element_hidden(el, "Disable button not visible.");
-    el = doc.getAnonymousElementByAttribute(
-      addonElement,
-      "anonid",
-      "enable-btn"
-    );
-    is_element_visible(el, "Enable button visible");
-  }
+  const toggleDisabled = addonElement.querySelector(
+    '[action="toggle-disabled"]'
+  );
+  is(
+    doc.l10n.getAttributes(toggleDisabled).id,
+    "enable-addon-button",
+    "Addon toggle-disabled action has the enable label"
+  );
 }
 
 function clickEnableExtension(managerWindow, addonElement) {
-  if (managerWindow.useHtmlViews) {
-    addonElement.querySelector('[action="toggle-disabled"]').click();
-  } else {
-    const doc = addonElement.ownerDocument;
-    const el = doc.getAnonymousElementByAttribute(
-      addonElement,
-      "anonid",
-      "enable-btn"
-    );
-    EventUtils.synthesizeMouseAtCenter(el, { clickCount: 1 }, managerWindow);
-  }
+  addonElement.querySelector('[action="toggle-disabled"]').click();
 }
 
 // Loading extension by sideloading method
-async function test_sideloaded_extension_permissions_prompt() {
+add_task(async function test_sideloaded_extension_permissions_prompt() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["xpinstall.signatures.required", false],
       ["extensions.autoDisableScopes", 15],
       ["extensions.ui.ignoreUnsigned", true],
     ],
   });
 
@@ -159,25 +119,9 @@ async function test_sideloaded_extension
 
   addon = await AddonManager.getAddonByID(ADDON_ID);
   ok(addon.seen, "Seen flag should be true after permissions are accepted");
 
   ok(!PopupNotifications.isPanelOpen, "Permission popup should not be visible");
 
   await close_manager(manager);
   await addon.uninstall();
-}
-
-add_task(async function test_XUL_aboutaddons_sideloaded_permissions_prompt() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  await test_sideloaded_extension_permissions_prompt();
-  await SpecialPowers.popPrefEnv();
 });
-
-add_task(async function test_HTML_aboutaddons_sideloaded_permissions_prompt() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  await test_sideloaded_extension_permissions_prompt();
-  await SpecialPowers.popPrefEnv();
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
@@ -2,45 +2,44 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Bug 566194 - safe mode / security & compatibility check status are not exposed in new addon manager UI
 
 async function loadDetail(aWindow, id) {
   let loaded = wait_for_view_load(aWindow, undefined, true);
   // Check the detail view.
-  if (aWindow.useHtmlViews) {
-    let browser = await aWindow.getHtmlBrowser();
-    let card = browser.contentDocument.querySelector(
-      `addon-card[addon-id="${id}"]`
-    );
-    EventUtils.synthesizeMouseAtCenter(card, {}, browser.contentWindow);
-  } else {
-    let card = aWindow.document.querySelector(`.addon.card[value="${id}"]`);
-    EventUtils.synthesizeMouseAtCenter(card, {}, aWindow);
-  }
+  let browser = await aWindow.getHtmlBrowser();
+  let card = browser.contentDocument.querySelector(
+    `addon-card[addon-id="${id}"]`
+  );
+  EventUtils.synthesizeMouseAtCenter(card, {}, browser.contentWindow);
   await loaded;
 }
 
-async function checkCompatibility(hboxSelector, buttonSelector) {
+add_task(async function checkCompatibility() {
   info("Testing compatibility checking warning");
 
   info("Setting checkCompatibility to false");
   AddonManager.checkCompatibility = false;
 
   let id = "test@mochi.test";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: { applications: { gecko: { id } } },
     useAddonManager: "temporary",
   });
   await extension.startup();
 
   let aWindow = await open_manager("addons://list/extension");
-  let hbox = aWindow.document.querySelector(hboxSelector);
-  let button = aWindow.document.querySelector(buttonSelector);
+  let hbox = aWindow.document.querySelector(
+    "#html-view .global-warning-checkcompatibility"
+  );
+  let button = aWindow.document.querySelector(
+    "#html-view .global-warning-checkcompatibility button"
+  );
 
   function checkMessage(visible) {
     if (visible) {
       is_element_visible(
         hbox,
         "Check Compatibility warning hbox should be visible"
       );
       is_element_visible(
@@ -81,35 +80,39 @@ async function checkCompatibility(hboxSe
     AddonManager.checkCompatibility,
     true,
     "Check Compatibility pref should be cleared"
   );
   checkMessage(false);
 
   await close_manager(aWindow);
   await extension.unload();
-}
+});
 
-async function checkSecurity(hboxSelector, buttonSelector) {
+add_task(async function checkSecurity() {
   info("Testing update security checking warning");
 
   var pref = "extensions.checkUpdateSecurity";
   info("Setting " + pref + " pref to false");
   Services.prefs.setBoolPref(pref, false);
 
   let id = "test-security@mochi.test";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: { applications: { gecko: { id } } },
     useAddonManager: "temporary",
   });
   await extension.startup();
 
   let aWindow = await open_manager("addons://list/extension");
-  let hbox = aWindow.document.querySelector(hboxSelector);
-  let button = aWindow.document.querySelector(buttonSelector);
+  let hbox = aWindow.document.querySelector(
+    "#html-view .global-warning-updatesecurity"
+  );
+  let button = aWindow.document.querySelector(
+    "#html-view .global-warning-updatesecurity button"
+  );
 
   function checkMessage(visible) {
     if (visible) {
       is_element_visible(
         hbox,
         "Check Update Security warning hbox should be visible"
       );
       is_element_visible(
@@ -150,30 +153,32 @@ async function checkSecurity(hboxSelecto
     Services.prefs.prefHasUserValue(pref),
     false,
     "Check Update Security pref should be cleared"
   );
   checkMessage(false);
 
   await close_manager(aWindow);
   await extension.unload();
-}
+});
 
-async function checkSafeMode(hboxSelector) {
+add_task(async function checkSafeMode() {
   info("Testing safe mode warning");
 
   let id = "test-safemode@mochi.test";
   let extension = ExtensionTestUtils.loadExtension({
     manifest: { applications: { gecko: { id } } },
     useAddonManager: "temporary",
   });
   await extension.startup();
 
   let aWindow = await open_manager("addons://list/extension");
-  let hbox = aWindow.document.querySelector(hboxSelector);
+  let hbox = aWindow.document.querySelector(
+    "#html-view .global-warning-safemode"
+  );
 
   function checkMessage(visible) {
     if (visible) {
       is_element_visible(
         hbox,
         "Check safe mode warning hbox should be visible"
       );
     } else {
@@ -197,69 +202,9 @@ async function checkSafeMode(hboxSelecto
   let categoryUtilities = new CategoryUtilities(aWindow);
   await categoryUtilities.openType("theme");
   checkMessage(true);
   await categoryUtilities.openType("plugin");
   checkMessage(false);
 
   await close_manager(aWindow);
   await extension.unload();
-}
-
-add_task(async function testCompatCheckXUL() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  await checkCompatibility(
-    "#list-view hbox.global-warning-checkcompatibility",
-    "#list-view button.global-warning-checkcompatibility"
-  );
-  // No popPrefEnv because of bug 1557397.
 });
-
-add_task(async function testCompatCheckHTML() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  await checkCompatibility(
-    "#html-view .global-warning-checkcompatibility",
-    "#html-view .global-warning-checkcompatibility button"
-  );
-  // No popPrefEnv because of bug 1557397.
-});
-
-add_task(async function testSecurityCheckXUL() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  await checkSecurity(
-    "#list-view hbox.global-warning-updatesecurity",
-    "#list-view button.global-warning-updatesecurity"
-  );
-  // No popPrefEnv because of bug 1557397.
-});
-
-add_task(async function testSecurityCheckHTML() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  await checkSecurity(
-    "#html-view .global-warning-updatesecurity",
-    "#html-view .global-warning-updatesecurity button"
-  );
-  // No popPrefEnv because of bug 1557397.
-});
-
-add_task(async function testSafeModeXUL() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  await checkSafeMode("#list-view hbox.global-warning-safemode");
-  // No popPrefEnv because of bug 1557397.
-});
-
-add_task(async function testSafeModeHTML() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  await checkSafeMode("#html-view .global-warning-safemode");
-  // No popPrefEnv because of bug 1557397.
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -50,48 +50,36 @@ MockGMPInstallManager.prototype = {
     gInstalledAddonId = addon.id;
     gInstallDeferred.resolve();
     return Promise.resolve();
   },
 };
 
 function openDetailsView(aId) {
   let view = get_current_view(gManagerWindow);
-  if (gManagerWindow.useHtmlViews) {
-    Assert.equal(
-      view.id,
-      "html-view",
-      "Should be in the list view to use this function"
-    );
-  } else {
-    Assert.equal(
-      view.id,
-      "list-view",
-      "Should be in the list view to use this function"
-    );
-  }
+  Assert.equal(
+    view.id,
+    "html-view",
+    "Should be in the list view to use this function"
+  );
 
   let item = get_addon_element(gManagerWindow, aId);
   Assert.ok(item, "Should have got add-on element.");
   is_element_visible(item, "Add-on element should be visible.");
 
   item.scrollIntoView();
   EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, item.ownerGlobal);
   EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, item.ownerGlobal);
 
   return new Promise(resolve => {
     wait_for_view_load(gManagerWindow, resolve);
   });
 }
 
-async function initializeState({ useHtmlViews }) {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", useHtmlViews]],
-  });
-
+async function initializeState() {
   gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_LOGGING_DUMP, true);
   gPrefs.setIntPref(GMPScope.GMPPrefs.KEY_LOGGING_LEVEL, 0);
 
   gManagerWindow = await open_manager();
 
   gCategoryUtilities = new CategoryUtilities(gManagerWindow);
 
   registerCleanupFunction(async function() {
@@ -158,76 +146,28 @@ async function initializeState({ useHtml
 
 async function testNotInstalledDisabled() {
   Assert.ok(gCategoryUtilities.isTypeVisible("plugin"), "Plugin tab visible.");
   await gCategoryUtilities.openType("plugin");
 
   for (let addon of gMockAddons) {
     let item = get_addon_element(gManagerWindow, addon.id);
     Assert.ok(item, "Got add-on element:" + addon.id);
-    if (gManagerWindow.useHtmlViews) {
-      is(item.parentNode.getAttribute("section"), "1", "Should be disabled");
-      // Open the options menu (needed to check the disabled buttons).
-      const pluginOptions = item.querySelector("plugin-options");
-      pluginOptions.querySelector("panel-list").open = true;
-      const neverActivate = pluginOptions.querySelector(
-        "panel-item[action=never-activate]"
-      );
-      ok(
-        neverActivate.hasAttribute("checked"),
-        "Plugin state should be never-activate"
-      );
-      pluginOptions.querySelector("panel-list").open = false;
-    } else {
-      item.parentNode.ensureElementIsVisible(item);
-      is(item.getAttribute("active"), "false", "Should be disabled");
-
-      let el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "warning"
-      );
-      is_element_hidden(el, "Warning notification is hidden.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "class",
-        "disabled-postfix"
-      );
-      is_element_visible(el, "disabled-postfix is visible.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "disable-btn"
-      );
-      is_element_hidden(el, "Disable button not visible.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "enable-btn"
-      );
-      is_element_hidden(el, "Enable button not visible.");
-
-      let menu = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "state-menulist"
-      );
-      is_element_visible(menu, "State menu should be visible.");
-
-      let neverActivate = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "never-activate-menuitem"
-      );
-      is(
-        menu.selectedItem,
-        neverActivate,
-        "Plugin state should be never-activate."
-      );
-    }
+    is(item.parentNode.getAttribute("section"), "1", "Should be disabled");
+    // Open the options menu (needed to check the disabled buttons).
+    const pluginOptions = item.querySelector("plugin-options");
+    pluginOptions.querySelector("panel-list").open = true;
+    const neverActivate = pluginOptions.querySelector(
+      "panel-item[action=never-activate]"
+    );
+    ok(
+      neverActivate.hasAttribute("checked"),
+      "Plugin state should be never-activate"
+    );
+    pluginOptions.querySelector("panel-list").open = false;
   }
 }
 
 async function testNotInstalledDisabledDetails() {
   for (let addon of gMockAddons) {
     await openDetailsView(addon.id);
     let doc = gManagerWindow.document;
 
@@ -246,97 +186,41 @@ async function testNotInstalledDisabledD
 async function testNotInstalled() {
   for (let addon of gMockAddons) {
     gPrefs.setBoolPref(
       getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id),
       true
     );
     let item = get_addon_element(gManagerWindow, addon.id);
     Assert.ok(item, "Got add-on element:" + addon.id);
-    if (gManagerWindow.useHtmlViews) {
-      is(item.parentNode.getAttribute("section"), "0", "Should be enabled");
-      // Open the options menu (needed to check the disabled buttons).
-      const pluginOptions = item.querySelector("plugin-options");
-      pluginOptions.querySelector("panel-list").open = true;
-      const alwaysActivate = pluginOptions.querySelector(
-        "panel-item[action=always-activate]"
-      );
-      ok(
-        alwaysActivate.hasAttribute("checked"),
-        "Plugin state should be always-activate"
-      );
-      pluginOptions.querySelector("panel-list").open = false;
-    } else {
-      item.parentNode.ensureElementIsVisible(item);
-      is(item.getAttribute("active"), "true");
 
-      let el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "warning"
-      );
-      is_element_visible(el, "Warning notification is visible.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "class",
-        "disabled-postfix"
-      );
-      is_element_hidden(el, "disabled-postfix is hidden.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "disable-btn"
-      );
-      is_element_hidden(el, "Disable button not visible.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "enable-btn"
-      );
-      is_element_hidden(el, "Enable button not visible.");
-
-      let menu = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "state-menulist"
-      );
-      is_element_visible(menu, "State menu should be visible.");
-
-      let alwaysActivate = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "always-activate-menuitem"
-      );
-      is(
-        menu.selectedItem,
-        alwaysActivate,
-        "Plugin state should be always-activate."
-      );
-    }
+    is(item.parentNode.getAttribute("section"), "0", "Should be enabled");
+    // Open the options menu (needed to check the disabled buttons).
+    const pluginOptions = item.querySelector("plugin-options");
+    pluginOptions.querySelector("panel-list").open = true;
+    const alwaysActivate = pluginOptions.querySelector(
+      "panel-item[action=always-activate]"
+    );
+    ok(
+      alwaysActivate.hasAttribute("checked"),
+      "Plugin state should be always-activate"
+    );
+    pluginOptions.querySelector("panel-list").open = false;
   }
 }
 
 async function testNotInstalledDetails() {
   for (let addon of gMockAddons) {
     await openDetailsView(addon.id);
-    if (gManagerWindow.useHtmlViews) {
-      const addonCard = get_addon_element(gManagerWindow, addon.id);
-      let el = addonCard.querySelector("[action=update-check]");
-      is_element_visible(el, "Check for Updates action is visible");
-      // TODO: add assertion for the warning notification once implemented
-      // as part of Bug 1544950.
-    } else {
-      let doc = gManagerWindow.document;
-      let el = doc.getElementsByClassName("disabled-postfix")[0];
-      is_element_hidden(el, "disabled-postfix is hidden.");
-      el = doc.getElementById("detail-findUpdates-btn");
-      is_element_visible(el, "Find updates link is visible.");
-      el = doc.getElementById("detail-warning");
-      is_element_visible(el, "Warning notification is visible.");
-    }
+
+    const addonCard = get_addon_element(gManagerWindow, addon.id);
+    let el = addonCard.querySelector("[action=update-check]");
+    is_element_visible(el, "Check for Updates action is visible");
+    // TODO: add assertion for the warning notification once implemented
+    // as part of Bug 1544950.
 
     await gCategoryUtilities.openType("plugin");
   }
 }
 
 async function testInstalled() {
   for (let addon of gMockAddons) {
     gPrefs.setIntPref(
@@ -349,147 +233,63 @@ async function testInstalled() {
     );
     gPrefs.setCharPref(
       getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
       "1.2.3.4"
     );
 
     let item = get_addon_element(gManagerWindow, addon.id);
     Assert.ok(item, "Got add-on element.");
-    if (gManagerWindow.useHtmlViews) {
-      is(item.parentNode.getAttribute("section"), "0", "Should be enabled");
-      // Open the options menu (needed to check the disabled buttons).
-      const pluginOptions = item.querySelector("plugin-options");
-      pluginOptions.querySelector("panel-list").open = true;
-      const alwaysActivate = pluginOptions.querySelector(
-        "panel-item[action=always-activate]"
-      );
-      ok(
-        alwaysActivate.hasAttribute("checked"),
-        "Plugin state should be always-activate"
-      );
-      pluginOptions.querySelector("panel-list").open = false;
-    } else {
-      item.parentNode.ensureElementIsVisible(item);
-      is(item.getAttribute("active"), "true");
 
-      let el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "warning"
-      );
-      is_element_hidden(el, "Warning notification is hidden.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "class",
-        "disabled-postfix"
-      );
-      is_element_hidden(el, "disabled-postfix is hidden.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "disable-btn"
-      );
-      is_element_hidden(el, "Disable button not visible.");
-      el = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "enable-btn"
-      );
-      is_element_hidden(el, "Enable button not visible.");
-
-      let menu = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "state-menulist"
-      );
-      is_element_visible(menu, "State menu should be visible.");
-
-      let alwaysActivate = item.ownerDocument.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "always-activate-menuitem"
-      );
-      is(
-        menu.selectedItem,
-        alwaysActivate,
-        "Plugin state should be always-activate."
-      );
-    }
+    is(item.parentNode.getAttribute("section"), "0", "Should be enabled");
+    // Open the options menu (needed to check the disabled buttons).
+    const pluginOptions = item.querySelector("plugin-options");
+    pluginOptions.querySelector("panel-list").open = true;
+    const alwaysActivate = pluginOptions.querySelector(
+      "panel-item[action=always-activate]"
+    );
+    ok(
+      alwaysActivate.hasAttribute("checked"),
+      "Plugin state should be always-activate"
+    );
+    pluginOptions.querySelector("panel-list").open = false;
   }
 }
 
 async function testInstalledDetails() {
   for (let addon of gMockAddons) {
     await openDetailsView(addon.id);
 
-    if (gManagerWindow.useHtmlViews) {
-      let card = get_addon_element(gManagerWindow, addon.id);
-      is_element_visible(
-        card.querySelector("[action=update-check]"),
-        "Find updates link is bisible"
-      );
-    } else {
-      let doc = gManagerWindow.document;
-
-      let el = doc.getElementsByClassName("disabled-postfix")[0];
-      is_element_hidden(el, "disabled-postfix is hidden.");
-      el = doc.getElementById("detail-findUpdates-btn");
-      is_element_visible(el, "Find updates link is visible.");
-      el = doc.getElementById("detail-warning");
-      is_element_hidden(el, "Warning notification is hidden.");
-      el = doc.getElementsByTagName("setting")[0];
-
-      let contextMenu = doc.getElementById("addonitem-popup");
-      await new Promise(resolve => {
-        let listener = () => {
-          contextMenu.removeEventListener("popupshown", listener);
-          resolve();
-        };
-        contextMenu.addEventListener("popupshown", listener);
-        el = doc.getElementsByClassName("detail-view-container")[0];
-        EventUtils.synthesizeMouse(el, 4, 4, {}, gManagerWindow);
-        EventUtils.synthesizeMouse(
-          el,
-          4,
-          4,
-          { type: "contextmenu", button: 2 },
-          gManagerWindow
-        );
-      });
-      let menuSep = doc.getElementById("addonitem-menuseparator");
-      is_element_hidden(menuSep, "Menu separator is hidden.");
-      contextMenu.hidePopup();
-    }
+    let card = get_addon_element(gManagerWindow, addon.id);
+    is_element_visible(
+      card.querySelector("[action=update-check]"),
+      "Find updates link is bisible"
+    );
 
     await gCategoryUtilities.openType("plugin");
   }
 }
 
 async function testInstalledGlobalEmeDisabled() {
   gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, false);
   for (let addon of gMockAddons) {
     let item = get_addon_element(gManagerWindow, addon.id);
     if (addon.isEME) {
-      if (gManagerWindow.useHtmlViews) {
-        is(item.parentNode.getAttribute("section"), "1", "Should be disabled");
-        // Open the options menu (needed to check the disabled buttons).
-        const pluginOptions = item.querySelector("plugin-options");
-        pluginOptions.querySelector("panel-list").open = true;
-        const askActivate = pluginOptions.querySelector(
-          "panel-item[action=ask-to-activate]"
-        );
-        ok(
-          askActivate.shadowRoot.querySelector("button").disabled,
-          "ask-to-activate should be disabled"
-        );
-        pluginOptions.querySelector("panel-list").open = false;
-      } else {
-        Assert.ok(!item, "Couldn't get add-on element.");
-      }
+      is(item.parentNode.getAttribute("section"), "1", "Should be disabled");
+      // Open the options menu (needed to check the disabled buttons).
+      const pluginOptions = item.querySelector("plugin-options");
+      pluginOptions.querySelector("panel-list").open = true;
+      const askActivate = pluginOptions.querySelector(
+        "panel-item[action=ask-to-activate]"
+      );
+      ok(
+        askActivate.shadowRoot.querySelector("button").disabled,
+        "ask-to-activate should be disabled"
+      );
+      pluginOptions.querySelector("panel-list").open = false;
     } else {
       Assert.ok(item, "Got add-on element.");
     }
   }
   gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, true);
 }
 
 async function testPreferencesButton() {
@@ -515,44 +315,29 @@ async function testPreferencesButton() {
         preferences.version
       );
       gPrefs.setBoolPref(
         getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id),
         preferences.enabled
       );
 
       await gCategoryUtilities.openType("plugin");
-      let doc = gManagerWindow.document;
       let item = get_addon_element(gManagerWindow, addon.id);
 
-      if (gManagerWindow.useHtmlViews) {
-        // Open the options menu (needed to check the more options action is enabled).
-        const pluginOptions = item.querySelector("plugin-options");
-        pluginOptions.querySelector("panel-list").open = true;
-        const moreOptions = pluginOptions.querySelector(
-          "panel-item[action=expand]"
-        );
-        ok(
-          !moreOptions.shadowRoot.querySelector("button").disabled,
-          "more options action should be enabled"
-        );
-        moreOptions.click();
-      } else {
-        let button = doc.getAnonymousElementByAttribute(
-          item,
-          "anonid",
-          "preferences-btn"
-        );
-        is_element_visible(button);
-        EventUtils.synthesizeMouseAtCenter(
-          button,
-          { clickCount: 1 },
-          gManagerWindow
-        );
-      }
+      // Open the options menu (needed to check the more options action is enabled).
+      const pluginOptions = item.querySelector("plugin-options");
+      pluginOptions.querySelector("panel-list").open = true;
+      const moreOptions = pluginOptions.querySelector(
+        "panel-item[action=expand]"
+      );
+      ok(
+        !moreOptions.shadowRoot.querySelector("button").disabled,
+        "more options action should be enabled"
+      );
+      moreOptions.click();
 
       await wait_for_view_load(gManagerWindow);
     }
   }
 }
 
 async function testUpdateButton() {
   gPrefs.clearUserPref(GMPScope.GMPPrefs.KEY_UPDATE_LAST_CHECK);
@@ -562,48 +347,25 @@ async function testUpdateButton() {
     value: MockGMPInstallManager,
     writable: true,
     enumerable: true,
     configurable: true,
   });
 
   for (let addon of gMockAddons) {
     await gCategoryUtilities.openType("plugin");
-    let doc = gManagerWindow.document;
     let item = get_addon_element(gManagerWindow, addon.id);
 
     gInstalledAddonId = "";
     gInstallDeferred = Promise.defer();
 
-    if (gManagerWindow.useHtmlViews) {
-      item.querySelector("[action=expand]").click();
-      await wait_for_view_load(gManagerWindow);
-      let detail = get_addon_element(gManagerWindow, addon.id);
-      detail.querySelector("[action=update-check]").click();
-    } else {
-      let button = doc.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "preferences-btn"
-      );
-      EventUtils.synthesizeMouseAtCenter(
-        button,
-        { clickCount: 1 },
-        gManagerWindow
-      );
-      await wait_for_view_load(gManagerWindow);
-
-      button = doc.getElementById("detail-findUpdates-btn");
-      Assert.ok(button != null, "Got detail-findUpdates-btn");
-      EventUtils.synthesizeMouseAtCenter(
-        button,
-        { clickCount: 1 },
-        gManagerWindow
-      );
-    }
+    item.querySelector("[action=expand]").click();
+    await wait_for_view_load(gManagerWindow);
+    let detail = get_addon_element(gManagerWindow, addon.id);
+    detail.querySelector("[action=update-check]").click();
 
     await gInstallDeferred.promise;
     Assert.equal(gInstalledAddonId, addon.id);
   }
   Object.defineProperty(GMPScope, "GMPInstallManager", {
     value: originalInstallManager,
     writable: true,
     enumerable: true,
@@ -667,30 +429,22 @@ async function testEmeSupport() {
 async function testCleanupState() {
   await SpecialPowers.popPrefEnv();
   await close_manager(gManagerWindow);
 }
 
 // This function run the sequence of all the gmpProvider tests
 // under the same initializeStateOptions (which will enable or disable
 // the HTML about:addons views).
-async function test_gmpProvider(initializeStateOptions) {
-  await initializeState(initializeStateOptions);
+add_task(async function test_gmpProvider(initializeStateOptions) {
+  await initializeState();
   await testNotInstalledDisabled();
   await testNotInstalledDisabledDetails();
   await testNotInstalled();
   await testNotInstalledDetails();
   await testInstalled();
   await testInstalledDetails();
   await testInstalledGlobalEmeDisabled();
   await testPreferencesButton();
   await testUpdateButton();
   await testEmeSupport();
   await testCleanupState();
-}
-
-add_task(function test_gmpProvider_on_XUL_aboutaddons() {
-  return test_gmpProvider({ useHtmlViews: false });
 });
-
-add_task(async function test_gmpProvider_on_HTML_aboutaddons() {
-  return test_gmpProvider({ useHtmlViews: true });
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
@@ -14,17 +14,16 @@ requestLongerTimeout(4);
 
 const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
 AddonTestUtils.initMochitest(this);
 
 const MAIN_URL = `https://example.com/${RELATIVE_DIR}discovery.html`;
-const SECOND_URL = `https://example.com/${RELATIVE_DIR}releaseNotes.xhtml`;
 const DISCOAPI_URL = `http://example.com/${RELATIVE_DIR}/discovery/api_response_empty.json`;
 
 // Clearing this pref is currently done from a cleanup function registered
 // by the head.js file.
 Services.prefs.setCharPref(PREF_DISCOVERURL, MAIN_URL);
 
 var gProvider = new MockProvider();
 gProvider.createAddons([
@@ -41,77 +40,16 @@ gProvider.createAddons([
   {
     id: "test3@tests.mozilla.org",
     name: "Test add-on 3",
     type: "theme",
     description: "bar",
   },
 ]);
 
-var gLoadCompleteCallback = null;
-
-var gProgressListener = {
-  onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
-    // Only care about the network stop status events
-    if (
-      !(aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) ||
-      !(aStateFlags & Ci.nsIWebProgressListener.STATE_STOP)
-    ) {
-      return;
-    }
-
-    if (gLoadCompleteCallback) {
-      executeSoon(gLoadCompleteCallback);
-    }
-    gLoadCompleteCallback = null;
-  },
-
-  onLocationChange() {},
-  onSecurityChange() {},
-  onProgressChange() {},
-  onStatusChange() {},
-  onContentBlockingEvent() {},
-
-  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
-  ]),
-};
-
-function waitForLoad(aManager, aCallback) {
-  let promise = new Promise(resolve => {
-    var browser = aManager.document.getElementById("discover-browser");
-    browser.addProgressListener(gProgressListener);
-
-    gLoadCompleteCallback = function() {
-      browser.removeProgressListener(gProgressListener);
-      resolve();
-    };
-  });
-  if (aCallback) {
-    promise.then(aCallback);
-  }
-  return promise;
-}
-
-function clickLink(aManager, aId, aCallback) {
-  let promise = new Promise(async resolve => {
-    waitForLoad(aManager, resolve);
-
-    var browser = aManager.document.getElementById("discover-browser");
-
-    var link = browser.contentDocument.getElementById(aId);
-    EventUtils.sendMouseEvent({ type: "click" }, link);
-  });
-  if (aCallback) {
-    promise.then(aCallback);
-  }
-  return promise;
-}
-
 function go_back() {
   gBrowser.goBack();
 }
 
 function go_back_backspace() {
   EventUtils.synthesizeKey("KEY_Backspace");
 }
 
@@ -132,66 +70,50 @@ function is_in_list(aManager, view, canG
   var doc = aManager.document;
 
   is(
     doc.getElementById("categories").selectedItem.value,
     view,
     "Should be on the right category"
   );
 
-  if (aManager.useHtmlViews) {
-    is(
-      get_current_view(aManager).id,
-      "html-view",
-      "the current view should be set to the HTML about:addons browser"
-    );
-    const doc = aManager.getHtmlBrowser().contentDocument;
-    ok(
-      doc.querySelector("addon-list"),
-      "Got a list-view in the HTML about:addons browser"
-    );
-  } else {
-    is(
-      get_current_view(aManager).id,
-      "list-view",
-      "Should be on the right view"
-    );
-  }
+  is(
+    get_current_view(aManager).id,
+    "html-view",
+    "the current view should be set to the HTML about:addons browser"
+  );
+  doc = aManager.getHtmlBrowser().contentDocument;
+  ok(
+    doc.querySelector("addon-list"),
+    "Got a list-view in the HTML about:addons browser"
+  );
 
   check_state(canGoBack, canGoForward);
 }
 
 function is_in_detail(aManager, view, canGoBack, canGoForward) {
   var doc = aManager.document;
 
   is(
     doc.getElementById("categories").selectedItem.value,
     view,
     "Should be on the right category"
   );
 
-  if (aManager.useHtmlViews) {
-    is(
-      get_current_view(aManager).id,
-      "html-view",
-      "the current view should be set to the HTML about:addons browser"
-    );
-    const doc = aManager.getHtmlBrowser().contentDocument;
-    is(
-      doc.querySelectorAll("addon-card").length,
-      1,
-      "Got a detail-view in the HTML about:addons browser"
-    );
-  } else {
-    is(
-      get_current_view(aManager).id,
-      "detail-view",
-      "Should be on the right view"
-    );
-  }
+  is(
+    get_current_view(aManager).id,
+    "html-view",
+    "the current view should be set to the HTML about:addons browser"
+  );
+  doc = aManager.getHtmlBrowser().contentDocument;
+  is(
+    doc.querySelectorAll("addon-card").length,
+    1,
+    "Got a detail-view in the HTML about:addons browser"
+  );
 
   check_state(canGoBack, canGoForward);
 }
 
 function is_in_discovery(aManager, url, canGoBack, canGoForward) {
   if (
     Services.prefs.getBoolPref("extensions.htmlaboutaddons.discover.enabled")
   ) {
@@ -223,23 +145,17 @@ function is_in_discovery(aManager, url, 
     is(spec, url, "Should have loaded the right url");
   }
 
   check_state(canGoBack, canGoForward);
 }
 
 async function expand_addon_element(aManager, aId) {
   var addon = get_addon_element(aManager, aId);
-  if (aManager.useHtmlViews) {
-    addon.click();
-  } else {
-    addon.parentNode.ensureElementIsVisible(addon);
-    EventUtils.synthesizeMouseAtCenter(addon, { clickCount: 1 }, aManager);
-    EventUtils.synthesizeMouseAtCenter(addon, { clickCount: 2 }, aManager);
-  }
+  addon.click();
 }
 
 function wait_for_page_show(browser) {
   let promise = new Promise(resolve => {
     let removeFunc;
     let listener = () => {
       removeFunc();
       resolve();
@@ -252,947 +168,498 @@ function wait_for_page_show(browser) {
       event => event.target.location == "http://example.com/",
       false,
       false
     );
   });
   return promise;
 }
 
-async function runTestOnPrefEnvs(prefEnvs, testFn) {
-  for (const [message, prefEnv] of prefEnvs) {
-    info(`${message}: ${JSON.stringify(prefEnv)}`);
-    await SpecialPowers.pushPrefEnv(prefEnv);
-    await testFn();
-    await SpecialPowers.popPrefEnv();
-  }
-}
-
 // Tests simple forward and back navigation and that the right heading and
 // category is selected
 add_task(async function test_navigate_history() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/extension");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/extension", false, false);
+  let aManager = await open_manager("addons://list/extension");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/extension", false, false);
+
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-plugin"),
+    {},
+    aManager
+  );
 
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-plugin"),
-        {},
-        aManager
-      );
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_list(aManager, "addons://list/plugin", true, false);
+
+  go_back();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
-      is_in_list(aManager, "addons://list/plugin", true, false);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 3");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      go_back();
+  go_forward();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 3");
-      is_in_list(aManager, "addons://list/extension", false, true);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 4");
+  is_in_list(aManager, "addons://list/plugin", true, false);
 
-      go_forward();
+  go_back();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 4");
-      is_in_list(aManager, "addons://list/plugin", true, false);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 5");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      go_back();
-
-      aManager = await wait_for_view_load(aManager);
-      info("Part 5");
-      is_in_list(aManager, "addons://list/extension", false, true);
+  await expand_addon_element(aManager, "test1@tests.mozilla.org");
 
-      await expand_addon_element(aManager, "test1@tests.mozilla.org");
+  aManager = await wait_for_view_load(aManager);
+  info("Part 6");
+  is_in_detail(aManager, "addons://list/extension", true, false);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 6");
-      is_in_detail(aManager, "addons://list/extension", true, false);
-
-      go_back();
+  go_back();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 7");
-      is_in_list(aManager, "addons://list/extension", false, true);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 7");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that browsing to the add-ons manager from a website and going back works
 add_task(async function test_navigate_between_webpage_and_aboutaddons() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      info("Part 1");
-      await BrowserTestUtils.openNewForegroundTab(
-        gBrowser,
-        "http://example.com/",
-        true,
-        true
-      );
+  info("Part 1");
+  await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "http://example.com/",
+    true,
+    true
+  );
 
-      info("Part 2");
-      ok(!gBrowser.canGoBack, "Should not be able to go back");
-      ok(!gBrowser.canGoForward, "Should not be able to go forward");
+  info("Part 2");
+  ok(!gBrowser.canGoBack, "Should not be able to go back");
+  ok(!gBrowser.canGoForward, "Should not be able to go forward");
 
-      await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:addons");
-      await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:addons");
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
-      let manager = await wait_for_manager_load(gBrowser.contentWindow);
+  let manager = await wait_for_manager_load(gBrowser.contentWindow);
 
-      info("Part 3");
-      is_in_list(manager, "addons://list/extension", true, false);
+  info("Part 3");
+  is_in_list(manager, "addons://list/extension", true, false);
 
-      // XXX: This is less than ideal, as it's currently difficult to deal with
-      // the browser frame switching between remote/non-remote in e10s mode.
-      let promiseLoaded;
-      if (gMultiProcessBrowser) {
-        promiseLoaded = BrowserTestUtils.browserLoaded(
-          gBrowser.selectedBrowser
-        );
-      } else {
-        promiseLoaded = BrowserTestUtils.waitForEvent(
-          gBrowser.selectedBrowser,
-          "pageshow"
-        );
-      }
+  // XXX: This is less than ideal, as it's currently difficult to deal with
+  // the browser frame switching between remote/non-remote in e10s mode.
+  let promiseLoaded;
+  if (gMultiProcessBrowser) {
+    promiseLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  } else {
+    promiseLoaded = BrowserTestUtils.waitForEvent(
+      gBrowser.selectedBrowser,
+      "pageshow"
+    );
+  }
 
-      go_back(manager);
-      await promiseLoaded;
+  go_back(manager);
+  await promiseLoaded;
 
-      info("Part 4");
-      is(
-        gBrowser.currentURI.spec,
-        "http://example.com/",
-        "Should be showing the webpage"
-      );
-      ok(!gBrowser.canGoBack, "Should not be able to go back");
-      ok(gBrowser.canGoForward, "Should be able to go forward");
+  info("Part 4");
+  is(
+    gBrowser.currentURI.spec,
+    "http://example.com/",
+    "Should be showing the webpage"
+  );
+  ok(!gBrowser.canGoBack, "Should not be able to go back");
+  ok(gBrowser.canGoForward, "Should be able to go forward");
 
-      promiseLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-      go_forward(manager);
-      await promiseLoaded;
+  promiseLoaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  go_forward(manager);
+  await promiseLoaded;
 
-      manager = gBrowser.selectedBrowser.contentWindow;
-      info("Part 5");
-      is_in_list(manager, "addons://list/extension", true, false);
+  manager = gBrowser.selectedBrowser.contentWindow;
+  info("Part 5");
+  is_in_list(manager, "addons://list/extension", true, false);
 
-      await close_manager(manager);
-    }
-  );
+  await close_manager(manager);
 });
 
 // Tests simple forward and back navigation and that the right heading and
 // category is selected -- Keyboard navigation [Bug 565359]
 // Only add the test if the backspace key navigates back and addon-manager
 // loaded in a tab
 add_task(async function test_keyboard_history_navigation() {
   if (Services.prefs.getIntPref("browser.backspace_action") != 0) {
     info("Test skipped on browser.backspace_action != 0");
     return;
   }
 
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/extension");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/extension", false, false);
+  let aManager = await open_manager("addons://list/extension");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/extension", false, false);
+
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-plugin"),
+    {},
+    aManager
+  );
 
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-plugin"),
-        {},
-        aManager
-      );
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_list(aManager, "addons://list/plugin", true, false);
+
+  go_back_backspace();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
-      is_in_list(aManager, "addons://list/plugin", true, false);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 3");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      go_back_backspace();
+  go_forward_backspace();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 3");
-      is_in_list(aManager, "addons://list/extension", false, true);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 4");
+  is_in_list(aManager, "addons://list/plugin", true, false);
 
-      go_forward_backspace();
+  go_back_backspace();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 4");
-      is_in_list(aManager, "addons://list/plugin", true, false);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 5");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      go_back_backspace();
-
-      aManager = await wait_for_view_load(aManager);
-      info("Part 5");
-      is_in_list(aManager, "addons://list/extension", false, true);
+  await expand_addon_element(aManager, "test1@tests.mozilla.org");
 
-      await expand_addon_element(aManager, "test1@tests.mozilla.org");
+  aManager = await wait_for_view_load(aManager);
+  info("Part 6");
+  is_in_detail(aManager, "addons://list/extension", true, false);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 6");
-      is_in_detail(aManager, "addons://list/extension", true, false);
-
-      go_back_backspace();
+  go_back_backspace();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 7");
-      is_in_list(aManager, "addons://list/extension", false, true);
+  aManager = await wait_for_view_load(aManager);
+  info("Part 7");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that opening a custom first view only stores a single history entry
 add_task(async function test_single_history_entry() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/plugin");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/plugin", false, false);
+  let aManager = await open_manager("addons://list/plugin");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/plugin", false, false);
+
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-extension"),
+    {},
+    aManager
+  );
 
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-extension"),
-        {},
-        aManager
-      );
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_list(aManager, "addons://list/extension", true, false);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
-      is_in_list(aManager, "addons://list/extension", true, false);
+  go_back();
 
-      go_back();
+  aManager = await wait_for_view_load(aManager);
+  info("Part 3");
+  is_in_list(aManager, "addons://list/plugin", false, true);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 3");
-      is_in_list(aManager, "addons://list/plugin", false, true);
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that opening a view while the manager is already open adds a new
 // history entry
 add_task(async function test_new_history_entry_while_opened() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/extension");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/extension", false, false);
+  let aManager = await open_manager("addons://list/extension");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/extension", false, false);
+
+  aManager.loadView("addons://list/plugin");
+
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_list(aManager, "addons://list/plugin", true, false);
+
+  go_back();
 
-      aManager.loadView("addons://list/plugin");
+  aManager = await wait_for_view_load(aManager);
+  info("Part 3");
+  is_in_list(aManager, "addons://list/extension", false, true);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
-      is_in_list(aManager, "addons://list/plugin", true, false);
-
-      go_back();
+  go_forward();
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 3");
-      is_in_list(aManager, "addons://list/extension", false, true);
-
-      go_forward();
+  aManager = await wait_for_view_load(aManager);
+  info("Part 4");
+  is_in_list(aManager, "addons://list/plugin", true, false);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 4");
-      is_in_list(aManager, "addons://list/plugin", true, false);
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests than navigating to a website and then going back returns to the
 // previous view
 add_task(async function test_navigate_back_from_website() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", false],
-            ["security.allow_eval_with_system_principal", true],
-          ],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", true],
-            ["security.allow_eval_with_system_principal", true],
-          ],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/plugin");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/plugin", false, false);
+  let aManager = await open_manager("addons://list/plugin");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/plugin", false, false);
+
+  BrowserTestUtils.loadURI(gBrowser, "http://example.com/");
+  await wait_for_page_show(gBrowser.selectedBrowser);
+
+  info("Part 2");
 
-      BrowserTestUtils.loadURI(gBrowser, "http://example.com/");
-      await wait_for_page_show(gBrowser.selectedBrowser);
-
-      info("Part 2");
+  await new Promise(resolve =>
+    executeSoon(function() {
+      ok(gBrowser.canGoBack, "Should be able to go back");
+      ok(!gBrowser.canGoForward, "Should not be able to go forward");
 
-      await new Promise(resolve =>
-        executeSoon(function() {
-          ok(gBrowser.canGoBack, "Should be able to go back");
-          ok(!gBrowser.canGoForward, "Should not be able to go forward");
+      go_back();
 
-          go_back();
+      gBrowser.addEventListener("pageshow", async function listener(event) {
+        if (event.target.location != "about:addons") {
+          return;
+        }
+        gBrowser.removeEventListener("pageshow", listener);
 
-          gBrowser.addEventListener("pageshow", async function listener(event) {
-            if (event.target.location != "about:addons") {
-              return;
-            }
-            gBrowser.removeEventListener("pageshow", listener);
+        aManager = await wait_for_view_load(
+          gBrowser.contentWindow.wrappedJSObject
+        );
+        info("Part 3");
+        is_in_list(aManager, "addons://list/plugin", false, true);
 
-            aManager = await wait_for_view_load(
-              gBrowser.contentWindow.wrappedJSObject
-            );
-            info("Part 3");
-            is_in_list(aManager, "addons://list/plugin", false, true);
+        executeSoon(() => go_forward());
+        wait_for_page_show(gBrowser.selectedBrowser).then(() => {
+          info("Part 4");
 
-            executeSoon(() => go_forward());
-            wait_for_page_show(gBrowser.selectedBrowser).then(() => {
-              info("Part 4");
+          executeSoon(function() {
+            ok(gBrowser.canGoBack, "Should be able to go back");
+            ok(!gBrowser.canGoForward, "Should not be able to go forward");
 
-              executeSoon(function() {
-                ok(gBrowser.canGoBack, "Should be able to go back");
-                ok(!gBrowser.canGoForward, "Should not be able to go forward");
-
-                go_back();
+            go_back();
 
-                gBrowser.addEventListener("pageshow", async function listener(
-                  event
-                ) {
-                  if (event.target.location != "about:addons") {
-                    return;
-                  }
-                  gBrowser.removeEventListener("pageshow", listener);
-                  aManager = await wait_for_view_load(
-                    gBrowser.contentWindow.wrappedJSObject
-                  );
-                  info("Part 5");
-                  is_in_list(aManager, "addons://list/plugin", false, true);
+            gBrowser.addEventListener("pageshow", async function listener(
+              event
+            ) {
+              if (event.target.location != "about:addons") {
+                return;
+              }
+              gBrowser.removeEventListener("pageshow", listener);
+              aManager = await wait_for_view_load(
+                gBrowser.contentWindow.wrappedJSObject
+              );
+              info("Part 5");
+              is_in_list(aManager, "addons://list/plugin", false, true);
 
-                  resolve();
-                });
-              });
+              resolve();
             });
           });
-        })
-      );
+        });
+      });
+    })
+  );
 
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that refreshing a list view does not affect the history
 add_task(async function test_refresh_listview_donot_add_history_entries() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/extension");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/extension", false, false);
+  let aManager = await open_manager("addons://list/extension");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/extension", false, false);
+
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-plugin"),
+    {},
+    aManager
+  );
 
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-plugin"),
-        {},
-        aManager
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_list(aManager, "addons://list/plugin", true, false);
+
+  await new Promise(resolve => {
+    gBrowser.reload();
+    gBrowser.addEventListener("pageshow", async function listener(event) {
+      if (event.target.location != "about:addons") {
+        return;
+      }
+      gBrowser.removeEventListener("pageshow", listener);
+
+      aManager = await wait_for_view_load(
+        gBrowser.contentWindow.wrappedJSObject
       );
-
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
+      info("Part 3");
       is_in_list(aManager, "addons://list/plugin", true, false);
 
-      await new Promise(resolve => {
-        gBrowser.reload();
-        gBrowser.addEventListener("pageshow", async function listener(event) {
-          if (event.target.location != "about:addons") {
-            return;
-          }
-          gBrowser.removeEventListener("pageshow", listener);
+      go_back();
+      aManager = await wait_for_view_load(aManager);
+      info("Part 4");
+      is_in_list(aManager, "addons://list/extension", false, true);
+      resolve();
+    });
+  });
 
-          aManager = await wait_for_view_load(
-            gBrowser.contentWindow.wrappedJSObject
-          );
-          info("Part 3");
-          is_in_list(aManager, "addons://list/plugin", true, false);
-
-          go_back();
-          aManager = await wait_for_view_load(aManager);
-          info("Part 4");
-          is_in_list(aManager, "addons://list/extension", false, true);
-          resolve();
-        });
-      });
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that refreshing a detail view does not affect the history
 add_task(async function test_refresh_detailview_donot_add_history_entries() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager(null);
-      info("Part 1");
-      is_in_list(aManager, "addons://list/extension", false, false);
+  let aManager = await open_manager(null);
+  info("Part 1");
+  is_in_list(aManager, "addons://list/extension", false, false);
+
+  await expand_addon_element(aManager, "test1@tests.mozilla.org");
+
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_detail(aManager, "addons://list/extension", true, false);
 
-      await expand_addon_element(aManager, "test1@tests.mozilla.org");
+  await new Promise(resolve => {
+    gBrowser.reload();
+    gBrowser.addEventListener("pageshow", async function listener(event) {
+      if (event.target.location != "about:addons") {
+        return;
+      }
+      gBrowser.removeEventListener("pageshow", listener);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
+      aManager = await wait_for_view_load(
+        gBrowser.contentWindow.wrappedJSObject
+      );
+      info("Part 3");
       is_in_detail(aManager, "addons://list/extension", true, false);
 
-      await new Promise(resolve => {
-        gBrowser.reload();
-        gBrowser.addEventListener("pageshow", async function listener(event) {
-          if (event.target.location != "about:addons") {
-            return;
-          }
-          gBrowser.removeEventListener("pageshow", listener);
+      go_back();
+      aManager = await wait_for_view_load(aManager);
+      info("Part 4");
+      is_in_list(aManager, "addons://list/extension", false, true);
+      resolve();
+    });
+  });
 
-          aManager = await wait_for_view_load(
-            gBrowser.contentWindow.wrappedJSObject
-          );
-          info("Part 3");
-          is_in_detail(aManager, "addons://list/extension", true, false);
-
-          go_back();
-          aManager = await wait_for_view_load(aManager);
-          info("Part 4");
-          is_in_list(aManager, "addons://list/extension", false, true);
-          resolve();
-        });
-      });
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that removing an extension from the detail view goes back and doesn't
 // allow you to go forward again.
 add_task(async function test_history_on_detailview_extension_removed() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/extension");
+  let aManager = await open_manager("addons://list/extension");
+
+  info("Part 1");
+  is_in_list(aManager, "addons://list/extension", false, false);
 
-      info("Part 1");
-      is_in_list(aManager, "addons://list/extension", false, false);
+  await expand_addon_element(aManager, "test1@tests.mozilla.org");
 
-      await expand_addon_element(aManager, "test1@tests.mozilla.org");
+  aManager = await wait_for_view_load(aManager);
+  info("Part 2");
+  is_in_detail(aManager, "addons://list/extension", true, false);
 
-      aManager = await wait_for_view_load(aManager);
-      info("Part 2");
-      is_in_detail(aManager, "addons://list/extension", true, false);
+  const doc = aManager.getHtmlBrowser().contentDocument;
+  const addonCard = doc.querySelector(
+    'addon-card[addon-id="test1@tests.mozilla.org"]'
+  );
+  const promptService = mockPromptService();
+  promptService._response = 0;
+  addonCard.querySelector("[action=remove]").click();
 
-      if (aManager.useHtmlViews) {
-        const doc = aManager.getHtmlBrowser().contentDocument;
-        const addonCard = doc.querySelector(
-          'addon-card[addon-id="test1@tests.mozilla.org"]'
-        );
-        const promptService = mockPromptService();
-        promptService._response = 0;
-        addonCard.querySelector("[action=remove]").click();
-      } else {
-        EventUtils.synthesizeMouseAtCenter(
-          aManager.document.getElementById("detail-uninstall-btn"),
-          {},
-          aManager
-        );
-      }
+  await wait_for_view_load(aManager);
+  is_in_list(aManager, "addons://list/extension", true, false);
 
-      await wait_for_view_load(aManager);
-      is_in_list(aManager, "addons://list/extension", true, false);
+  const addon = await AddonManager.getAddonByID("test1@tests.mozilla.org");
+  addon.cancelUninstall();
 
-      const addon = await AddonManager.getAddonByID("test1@tests.mozilla.org");
-      addon.cancelUninstall();
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that opening the manager opens the last view
 add_task(async function test_open_last_view() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", false]],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [["extensions.htmlaboutaddons.enabled", true]],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/plugin");
-      info("Part 1");
-      is_in_list(aManager, "addons://list/plugin", false, false);
+  let aManager = await open_manager("addons://list/plugin");
+  info("Part 1");
+  is_in_list(aManager, "addons://list/plugin", false, false);
 
-      await close_manager(aManager);
-      aManager = await open_manager(null);
-      info("Part 2");
-      is_in_list(aManager, "addons://list/plugin", false, false);
+  await close_manager(aManager);
+  aManager = await open_manager(null);
+  info("Part 2");
+  is_in_list(aManager, "addons://list/plugin", false, false);
 
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that navigating the discovery page works when that was the first view
 add_task(async function test_discopane_first_history_entry() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", false],
-            ["extensions.htmlaboutaddons.discover.enabled", false],
-          ],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", true],
-            ["extensions.htmlaboutaddons.discover.enabled", true],
-            ["extensions.getAddons.discovery.api_url", DISCOAPI_URL],
-          ],
-        },
-      ],
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["extensions.htmlaboutaddons.discover.enabled", true],
+      ["extensions.getAddons.discovery.api_url", DISCOAPI_URL],
     ],
-    async () => {
-      let aManager = await open_manager("addons://discover/");
-      info("1");
-      is_in_discovery(aManager, MAIN_URL, false, false);
+  });
 
-      let waitLoaded;
-      const isLegacyDiscoPane = !Services.prefs.getBoolPref(
-        "extensions.htmlaboutaddons.discover.enabled"
-      );
-
-      if (isLegacyDiscoPane) {
-        // This is a test for an old version of the discovery panel that was actually
-        // navigating links, skip if using the HTML about:addons.
-        await clickLink(aManager, "link-good");
-        info("2");
-        is_in_discovery(aManager, SECOND_URL, true, false);
+  let aManager = await open_manager("addons://discover/");
+  info("1");
+  is_in_discovery(aManager, MAIN_URL, false, false);
 
-        waitLoaded = waitForLoad(aManager);
-        // Execute go_back only after waitForLoad() has had a chance to setup
-        // its listeners.
-        executeSoon(go_back);
-        info("3");
-        await waitLoaded;
-        is_in_discovery(aManager, MAIN_URL, false, true);
-
-        // Execute go_forward only after waitForLoad() has had a chance to setup
-        // its listeners.
-        waitLoaded = waitForLoad(aManager);
-        executeSoon(go_forward);
-
-        await waitLoaded;
-        is_in_discovery(aManager, SECOND_URL, true, false);
-      }
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-plugin"),
+    {},
+    aManager
+  );
 
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-plugin"),
-        {},
-        aManager
-      );
-
-      aManager = await wait_for_view_load(aManager);
-      is_in_list(aManager, "addons://list/plugin", true, false);
-
-      if (isLegacyDiscoPane) {
-        go_back();
+  aManager = await wait_for_view_load(aManager);
+  is_in_list(aManager, "addons://list/plugin", true, false);
 
-        aManager = await wait_for_view_load(aManager);
-        is_in_discovery(aManager, SECOND_URL, true, true);
-
-        waitLoaded = waitForLoad(aManager);
-      }
+  go_back();
+  aManager = await wait_for_view_load(aManager);
 
-      go_back();
-      await waitLoaded;
-      aManager = await wait_for_view_load(aManager);
+  is_in_discovery(aManager, MAIN_URL, false, true);
 
-      is_in_discovery(aManager, MAIN_URL, false, true);
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 // Tests that navigating the discovery page works when that was the second view
 add_task(async function test_discopane_second_history_entry() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", false],
-            ["extensions.htmlaboutaddons.discover.enabled", false],
-          ],
-        },
-      ],
-      [
-        "Test on HTML about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", true],
-            ["extensions.htmlaboutaddons.discover.enabled", true],
-            ["extensions.getAddons.discovery.api_url", DISCOAPI_URL],
-          ],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/plugin");
-      is_in_list(aManager, "addons://list/plugin", false, false);
-
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-discover"),
-        {},
-        aManager
-      );
-
-      aManager = await wait_for_view_load(aManager);
-      is_in_discovery(aManager, MAIN_URL, true, false);
-
-      const isLegacyDiscoPane = !Services.prefs.getBoolPref(
-        "extensions.htmlaboutaddons.discover.enabled"
-      );
-
-      // This is a test for an old version of the discovery panel that was actually
-      // navigating links.
-      if (isLegacyDiscoPane) {
-        await clickLink(aManager, "link-good");
-        is_in_discovery(aManager, SECOND_URL, true, false);
+  let aManager = await open_manager("addons://list/plugin");
+  is_in_list(aManager, "addons://list/plugin", false, false);
 
-        // Execute go_back only after waitForLoad() has had a chance to setup
-        // its listeners.
-        executeSoon(go_back);
-
-        await waitForLoad(aManager);
-        is_in_discovery(aManager, MAIN_URL, true, true);
-
-        // Execute go_forward only after waitForLoad() has had a chance to setup
-        // its listeners.
-        executeSoon(go_forward);
-
-        await waitForLoad(aManager);
-        is_in_discovery(aManager, SECOND_URL, true, false);
-      }
-
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-plugin"),
-        {},
-        aManager
-      );
-
-      aManager = await wait_for_view_load(aManager);
-      is_in_list(aManager, "addons://list/plugin", true, false);
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-discover"),
+    {},
+    aManager
+  );
 
-      if (isLegacyDiscoPane) {
-        go_back();
-
-        aManager = await wait_for_view_load(aManager);
-        is_in_discovery(aManager, SECOND_URL, true, true);
-
-        go_back();
-
-        await waitForLoad(aManager);
-        is_in_discovery(aManager, MAIN_URL, true, true);
-
-        go_back();
-
-        aManager = await wait_for_view_load(aManager);
-        is_in_list(aManager, "addons://list/plugin", false, true);
-
-        go_forward();
-
-        aManager = await wait_for_view_load(aManager);
-        is_in_discovery(aManager, MAIN_URL, true, true);
-
-        // Execute go_forward only after waitForLoad() has had a chance to setup
-        // its listeners.
-        executeSoon(go_forward);
+  aManager = await wait_for_view_load(aManager);
+  is_in_discovery(aManager, MAIN_URL, true, false);
 
-        await waitForLoad(aManager);
-        is_in_discovery(aManager, SECOND_URL, true, true);
-      } else {
-        go_back();
-
-        aManager = await wait_for_view_load(aManager);
-        is_in_discovery(aManager, MAIN_URL, true, true);
-
-        go_back();
-
-        aManager = await wait_for_view_load(aManager);
-        is_in_list(aManager, "addons://list/plugin", false, true);
-      }
-
-      await close_manager(aManager);
-    }
+  EventUtils.synthesizeMouseAtCenter(
+    aManager.document.getElementById("category-plugin"),
+    {},
+    aManager
   );
-});
 
-// Tests that refreshing the discovery pane integrates properly with history
-add_task(async function test_legacy_discopane_history_navigation() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on XUL about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", false],
-            ["extensions.htmlaboutaddons.discover.enabled", false],
-          ],
-        },
-      ],
-    ],
-    async () => {
-      let aManager = await open_manager("addons://list/plugin");
-
-      is_in_list(aManager, "addons://list/plugin", false, false);
-
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-discover"),
-        {},
-        aManager
-      );
-
-      aManager = await wait_for_view_load(aManager);
-      is_in_discovery(aManager, MAIN_URL, true, false);
+  aManager = await wait_for_view_load(aManager);
+  is_in_list(aManager, "addons://list/plugin", true, false);
 
-      await clickLink(aManager, "link-good");
-      is_in_discovery(aManager, SECOND_URL, true, false);
-
-      EventUtils.synthesizeMouseAtCenter(
-        aManager.document.getElementById("category-discover"),
-        {},
-        aManager
-      );
-
-      await waitForLoad(aManager);
-      is_in_discovery(aManager, MAIN_URL, true, false);
+  go_back();
 
-      go_back();
-
-      await waitForLoad(aManager);
-      is_in_discovery(aManager, SECOND_URL, true, true);
-
-      go_back();
-
-      await waitForLoad(aManager);
-      is_in_discovery(aManager, MAIN_URL, true, true);
-
-      go_back();
+  aManager = await wait_for_view_load(aManager);
+  is_in_discovery(aManager, MAIN_URL, true, true);
 
-      aManager = await wait_for_view_load(aManager);
-      is_in_list(aManager, "addons://list/plugin", false, true);
-
-      go_forward();
-
-      aManager = await wait_for_view_load(aManager);
-      is_in_discovery(aManager, MAIN_URL, true, true);
-
-      // Execute go_forward only after waitForLoad() has had a chance to setup
-      // its listeners.
-      executeSoon(go_forward);
+  go_back();
 
-      await waitForLoad(aManager);
-      is_in_discovery(aManager, SECOND_URL, true, true);
-
-      // Execute go_forward only after waitForLoad() has had a chance to setup
-      // its listeners.
-      executeSoon(go_forward);
+  aManager = await wait_for_view_load(aManager);
+  is_in_list(aManager, "addons://list/plugin", false, true);
 
-      await waitForLoad(aManager);
-      is_in_discovery(aManager, MAIN_URL, true, false);
-
-      await close_manager(aManager);
-    }
-  );
+  await close_manager(aManager);
 });
 
 add_task(async function test_initialSelectedView_on_aboutaddons_reload() {
-  await runTestOnPrefEnvs(
-    [
-      [
-        "Test on HTML about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", true],
-            ["extensions.htmlaboutaddons.discover.enabled", true],
-            ["extensions.getAddons.discovery.api_url", DISCOAPI_URL],
-          ],
-        },
-      ],
-      [
-        "Test on XUL about:addons",
-        {
-          set: [
-            ["extensions.htmlaboutaddons.enabled", false],
-            ["extensions.htmlaboutaddons.discover.enabled", false],
-          ],
-        },
-      ],
-    ],
-    async () => {
-      let managerWindow = await open_manager("addons://list/extension");
-      ok(
-        managerWindow.gViewController.initialViewSelected,
-        "initialViewSelected is true as expected on first about:addons load"
-      );
+  let managerWindow = await open_manager("addons://list/extension");
+  ok(
+    managerWindow.gViewController.initialViewSelected,
+    "initialViewSelected is true as expected on first about:addons load"
+  );
 
-      managerWindow.location.reload();
-      await wait_for_manager_load(managerWindow);
-      await wait_for_view_load(managerWindow);
+  managerWindow.location.reload();
+  await wait_for_manager_load(managerWindow);
+  await wait_for_view_load(managerWindow);
 
-      ok(
-        managerWindow.gViewController.initialViewSelected,
-        "initialViewSelected is true as expected on first about:addons load"
-      );
-      is(
-        managerWindow.gPendingInitializations,
-        0,
-        "No pending initializations"
-      );
+  ok(
+    managerWindow.gViewController.initialViewSelected,
+    "initialViewSelected is true as expected on first about:addons load"
+  );
+  is(managerWindow.gPendingInitializations, 0, "No pending initializations");
 
-      await close_manager(managerWindow);
-    }
-  );
+  await close_manager(managerWindow);
 });
--- a/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js
@@ -265,17 +265,16 @@ function promiseMessageBars(expectedMess
     );
   });
 }
 
 add_task(async function setup() {
   // Enable html about:addons and the abuse reporting.
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["extensions.htmlaboutaddons.enabled", true],
       ["extensions.abuseReport.enabled", true],
       ["extensions.abuseReport.url", "http://test.addons.org/api/report/"],
     ],
   });
 
   gProvider = new MockProvider();
   gProvider.createAddons([
     {
--- a/toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js
@@ -102,20 +102,17 @@ function assertDeckHeadingButtons(group,
 
 async function hasPrivateAllowed(id) {
   let perms = await ExtensionPermissions.get(id);
   return perms.permissions.includes("internal:privateBrowsingAllowed");
 }
 
 add_task(async function enableHtmlViews() {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["extensions.htmlaboutaddons.enabled", true],
-      ["extensions.allowPrivateBrowsingByDefault", false],
-    ],
+    set: [["extensions.allowPrivateBrowsingByDefault", false]],
   });
 
   gProvider = new MockProvider();
   gProvider.createAddons([
     {
       id: "addon1@mochi.test",
       name: "Test add-on 1",
       creator: { name: "The creator", url: "http://example.com/me" },
--- a/toolkit/mozapps/extensions/test/browser/browser_html_discover_view.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_discover_view.js
@@ -284,18 +284,16 @@ async function testAddonUninstall(card) 
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [
         "extensions.getAddons.discovery.api_url",
         `http://${AMO_TEST_HOST}/discoapi`,
       ],
-      // Enable HTML for all because some tests load non-discopane views.
-      ["extensions.htmlaboutaddons.enabled", true],
       ["extensions.htmlaboutaddons.discover.enabled", true],
       // Disable non-discopane recommendations to avoid unexpected discovery
       // API requests.
       ["extensions.htmlaboutaddons.recommendations.enabled", false],
       // Disable the telemetry client ID (and its associated UI warning).
       // browser_html_discover_view_clientid.js covers this functionality.
       ["browser.discovery.enabled", false],
     ],
--- a/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js
@@ -43,17 +43,16 @@ add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // Enable clientid - see Discovery.jsm for the first two prefs.
       ["browser.discovery.enabled", true],
       ["datareporting.healthreport.uploadEnabled", true],
       ["extensions.getAddons.discovery.api_url", `${serverBaseUrl}discoapi`],
       ["app.support.baseURL", `${serverBaseUrl}sumo/`],
       ["extensions.htmlaboutaddons.discover.enabled", true],
-      ["extensions.htmlaboutaddons.enabled", true],
       // Discovery API requests can be triggered by the discopane and the
       // recommendations in the list view. To make sure that the every test
       // checks the behavior of the view they're testing, ensure that only one
       // of the two views is enabled at a time.
       ["extensions.htmlaboutaddons.recommendations.enabled", false],
     ],
   });
 });
--- a/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
@@ -30,19 +30,16 @@ function isEmpty(el) {
 
 function waitForThemeChange(list) {
   // Wait for two move events. One theme will be enabled and another disabled.
   let moveCount = 0;
   return BrowserTestUtils.waitForEvent(list, "move", () => ++moveCount == 2);
 }
 
 add_task(async function enableHtmlViews() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
   promptService = mockPromptService();
   Services.telemetry.clearEvents();
 });
 
 let extensionsCreated = 0;
 
 function createExtensions(manifestExtras) {
   return manifestExtras.map(extra =>
--- a/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
@@ -36,17 +36,16 @@ function mockResults() {
 }
 
 add_task(async function setup() {
   let results = btoa(JSON.stringify(mockResults()));
   await SpecialPowers.pushPrefEnv({
     set: [
       // Disable personalized recommendations, they will break the data URI.
       ["browser.discovery.enabled", false],
-      ["extensions.htmlaboutaddons.enabled", true],
       ["extensions.getAddons.discovery.api_url", `data:;base64,${results}`],
       [
         "extensions.recommendations.themeRecommendationUrl",
         "https://example.com/theme",
       ],
     ],
   });
 });
--- a/toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_message_bar.js
@@ -28,24 +28,18 @@ function createMessageBar(messageBarStac
     }
   }
   messageBar.addEventListener("message-bar:close", onclose, { once: true });
   messageBarStack.append(messageBar);
   return messageBar;
 }
 
 add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-
   htmlAboutAddonsWindow = await loadInitialView("extension");
-  registerCleanupFunction(async () => {
-    await closeView(htmlAboutAddonsWindow);
-  });
+  registerCleanupFunction(() => closeView(htmlAboutAddonsWindow));
 });
 
 add_task(async function test_message_bar_stack() {
   const win = htmlAboutAddonsWindow;
 
   let messageBarStack = win.document.querySelector("message-bar-stack");
 
   ok(messageBarStack, "Got a message-bar-stack in HTML about:addons page");
--- a/toolkit/mozapps/extensions/test/browser/browser_html_named_deck.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_named_deck.js
@@ -1,20 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint max-len: ["error", 80] */
 
 "use strict";
 
-add_task(async function enableHtmlViews() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-});
-
 const DEFAULT_SECTION_NAMES = ["one", "two", "three"];
 
 function makeButton({ doc, name, deckId }) {
   let button = doc.createElement("named-deck-button");
   button.setAttribute("name", name);
   button.deckId = deckId;
   button.textContent = name.toUpperCase();
   return button;
--- a/toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js
@@ -22,20 +22,17 @@ function waitOptionsBrowserInserted() {
       }
     }
     ExtensionParent.apiManager.on("extension-browser-inserted", listener);
   });
 }
 
 add_task(async function enableHtmlViews() {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["extensions.htmlaboutaddons.enabled", true],
-      ["extensions.htmlaboutaddons.inline-options.enabled", true],
-    ],
+    set: [["extensions.htmlaboutaddons.inline-options.enabled", true]],
   });
 });
 
 add_task(async function testInlineOptions() {
   const HEIGHT_SHORT = 300;
   const HEIGHT_TALL = 600;
 
   let id = "inline@mochi.test";
--- a/toolkit/mozapps/extensions/test/browser/browser_html_options_ui_in_tab.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_options_ui_in_tab.js
@@ -1,20 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint max-len: ["error", 80] */
 
 "use strict";
 
 add_task(async function enableHtmlViews() {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["extensions.htmlaboutaddons.enabled", true],
-      ["extensions.htmlaboutaddons.inline-options.enabled", true],
-    ],
+    set: [["extensions.htmlaboutaddons.inline-options.enabled", true]],
   });
 });
 
 async function testOptionsInTab({ id, options_ui_options }) {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       name: "Prefs extension",
       applications: { gecko: { id } },
--- a/toolkit/mozapps/extensions/test/browser/browser_html_plugins.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_plugins.js
@@ -2,20 +2,16 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint max-len: ["error", 80] */
 
 "use strict";
 
 const TEST_PLUGIN_DESCRIPTION = "Flash plug-in for testing purposes.";
 
 add_task(async function enableHtmlViews() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-
   let gProvider = new MockProvider();
   gProvider.createAddons([
     {
       id: "no-ask-to-activate@mochi.test",
       name: "No ask to activate",
       getFullDescription(doc) {
         let a = doc.createElement("a");
         a.textContent = "A link";
--- a/toolkit/mozapps/extensions/test/browser/browser_html_recent_updates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_recent_updates.js
@@ -3,20 +3,16 @@ let gProvider;
 
 function dateHoursAgo(hours) {
   let date = new Date();
   date.setTime(date.getTime() - hours * 3600000);
   return date;
 }
 
 add_task(async function enableHtmlViews() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-
   gProvider = new MockProvider();
   gProvider.createAddons([
     {
       id: "addon-today-2@mochi.test",
       name: "Updated today two",
       creator: { name: "The creator" },
       version: "3.3",
       type: "extension",
--- a/toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js
@@ -1,20 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint max-len: ["error", 80] */
 
 "use strict";
 
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-});
-
 async function checkRecommendedBadge(id, hidden) {
   function checkBadge() {
     let card = win.document.querySelector(`addon-card[addon-id="${id}"]`);
     let badge = card.querySelector(".addon-badge-recommended");
     is(badge.hidden, hidden, `badge is ${hidden ? "hidden" : "shown"}`);
     return card;
   }
 
--- a/toolkit/mozapps/extensions/test/browser/browser_html_updates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_updates.js
@@ -1,20 +1,17 @@
 /* eslint max-len: ["error", 80] */
 
 const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
 AddonTestUtils.initMochitest(this);
 
-add_task(async function enableHtmlViews() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
+add_task(async function setup() {
   Services.telemetry.clearEvents();
 });
 
 function loadDetailView(win, id) {
   let doc = win.document;
   let card = doc.querySelector(`addon-card[addon-id="${id}"]`);
   let loaded = waitForViewLoad(win);
   EventUtils.synthesizeMouseAtCenter(card, { clickCount: 1 }, win);
--- a/toolkit/mozapps/extensions/test/browser/browser_html_warning_messages.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_warning_messages.js
@@ -18,19 +18,16 @@ const brandBundle = Services.strings.cre
 );
 const appName = brandBundle.GetStringFromName("brandShortName");
 const appVersion = Services.appinfo.version;
 const SUPPORT_URL = Services.urlFormatter.formatURL(
   Services.prefs.getStringPref("app.support.baseURL")
 );
 
 add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
   gProvider = new MockProvider();
 });
 
 async function checkMessageState(id, addonType, expected) {
   async function checkAddonCard() {
     let card = doc.querySelector(`addon-card[addon-id="${id}"]`);
     let messageBar = card.querySelector(".addon-card-message");
 
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_browser.js
+++ /dev/null
@@ -1,274 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-
-/* globals TestUtils */
-
-let { ExtensionTestCommon } = ChromeUtils.import(
-  "resource://testing-common/ExtensionTestCommon.jsm"
-);
-
-ChromeUtils.import("resource://testing-common/ContentTask.jsm", {});
-
-// This test is testing resizing of the inline options in XUL about:addons. The
-// behavior in HTML about:addons is checked in the testInlineOptions task of
-// browser_html_options_ui.js.
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-var gAddon;
-var gOtherAddon;
-var gManagerWindow;
-var gCategoryUtilities;
-
-function installAddon(details) {
-  let id = Cc["@mozilla.org/uuid-generator;1"]
-    .getService(Ci.nsIUUIDGenerator)
-    .generateUUID().number;
-  if (!details.manifest) {
-    details.manifest = {};
-  }
-  details.manifest.applications = { gecko: { id } };
-  let xpi = ExtensionTestCommon.generateXPI(details);
-
-  return AddonManager.installTemporaryAddon(xpi).then(addon => {
-    SimpleTest.registerCleanupFunction(function() {
-      addon.uninstall();
-
-      Services.obs.notifyObservers(xpi, "flush-cache-entry");
-      xpi.remove(false);
-    });
-
-    return addon;
-  });
-}
-
-add_task(async function() {
-  gAddon = await installAddon({
-    manifest: {
-      options_ui: {
-        page: "options.html",
-      },
-    },
-
-    files: {
-      "options.html": `<!DOCTYPE html>
-        <html>
-          <head>
-            <meta charset="UTF-8">
-            <style type="text/css">
-              body > p {
-                height: 300px;
-                margin: 0;
-              }
-              body.bigger > p {
-                height: 600px;
-              }
-            </style>
-          </head>
-          <body>
-            <p>The quick mauve fox jumps over the opalescent dog.</p>
-          </body>
-        </html>`,
-    },
-  });
-
-  // Create another add-on with no inline options, to verify that detail
-  // view switches work correctly.
-  gOtherAddon = await installAddon({});
-
-  gManagerWindow = await open_manager("addons://list/extension");
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-});
-
-async function openDetailsBrowser(addonId) {
-  var addon = get_addon_element(gManagerWindow, addonId);
-
-  is(
-    addon.mAddon.optionsType,
-    AddonManager.OPTIONS_TYPE_INLINE_BROWSER,
-    "Options should be inline browser type"
-  );
-
-  addon.parentNode.ensureElementIsVisible(addon);
-
-  var button = gManagerWindow.document.getAnonymousElementByAttribute(
-    addon,
-    "anonid",
-    "preferences-btn"
-  );
-
-  is_element_visible(button, "Preferences button should be visible");
-
-  EventUtils.synthesizeMouseAtCenter(button, { clickCount: 1 }, gManagerWindow);
-
-  await TestUtils.topicObserved(
-    AddonManager.OPTIONS_NOTIFICATION_DISPLAYED,
-    (subject, data) => data == addonId
-  );
-
-  is(
-    gManagerWindow.gViewController.currentViewId,
-    `addons://detail/${encodeURIComponent(addonId)}/preferences`,
-    "Current view should scroll to preferences"
-  );
-
-  var browser = gManagerWindow.document.querySelector(
-    "#detail-grid > rows > stack > .inline-options-browser"
-  );
-  var rows = browser.parentNode.parentNode;
-
-  let url = await ContentTask.spawn(browser, {}, () => content.location.href);
-
-  ok(browser, "Grid should have a browser descendant");
-  is(browser.localName, "browser", "Grid should have a browser descendant");
-  is(
-    url,
-    addon.mAddon.optionsURL,
-    "Browser has the expected options URL loaded"
-  );
-
-  is(
-    browser.clientWidth,
-    browser.parentNode.clientWidth,
-    "Browser should be the same width as its direct parent"
-  );
-  is(
-    browser.clientWidth,
-    rows.clientWidth,
-    "Browser should be the same width as its rows ancestor"
-  );
-
-  button = gManagerWindow.document.getElementById("detail-prefs-btn");
-  is_element_hidden(button, "Preferences button should not be visible");
-
-  return browser;
-}
-
-add_task(async function test_inline_browser_addon() {
-  let browser = await openDetailsBrowser(gAddon.id);
-
-  function checkHeights(expected) {
-    let { clientHeight } = browser;
-    return ContentTask.spawn(
-      browser,
-      { expected, clientHeight },
-      ({ expected, clientHeight }) => {
-        let { body } = content.document;
-
-        is(
-          body.clientHeight,
-          expected,
-          `Document body should be ${expected}px tall`
-        );
-        is(
-          body.clientHeight,
-          body.scrollHeight,
-          "Document body should be tall enough to fit its contents"
-        );
-
-        let heightDiff = clientHeight - expected;
-        ok(
-          heightDiff >= 0 && heightDiff < 50,
-          `Browser should be slightly taller than the document body (${clientHeight} vs. ${expected})`
-        );
-      }
-    );
-  }
-
-  // Delay long enough to avoid hitting our resize rate limit.
-  let delay = () => new Promise(resolve => setTimeout(resolve, 300));
-
-  await delay();
-
-  await checkHeights(300);
-
-  info(
-    "Increase the document height, and expect the browser to grow correspondingly"
-  );
-  await ContentTask.spawn(browser, null, () => {
-    content.document.body.classList.toggle("bigger");
-  });
-
-  await delay();
-
-  await checkHeights(600);
-
-  info(
-    "Decrease the document height, and expect the browser to shrink correspondingly"
-  );
-  await ContentTask.spawn(browser, null, () => {
-    content.document.body.classList.toggle("bigger");
-  });
-
-  await delay();
-
-  await checkHeights(300);
-
-  await new Promise(resolve =>
-    gCategoryUtilities.openType("extension", resolve)
-  );
-
-  browser = gManagerWindow.document.querySelector(".inline-options-browser");
-
-  is(browser, null, "Options browser should be removed from the document");
-});
-
-// Test that loading an add-on with no inline browser works as expected
-// after having viewed our main test add-on.
-add_task(async function test_plain_addon() {
-  var addon = get_addon_element(gManagerWindow, gOtherAddon.id);
-
-  is(addon.mAddon.optionsType, null, "Add-on should have no options");
-
-  addon.parentNode.ensureElementIsVisible(addon);
-
-  await EventUtils.synthesizeMouseAtCenter(
-    addon,
-    { clickCount: 1 },
-    gManagerWindow
-  );
-
-  EventUtils.synthesizeMouseAtCenter(addon, { clickCount: 2 }, gManagerWindow);
-
-  await BrowserTestUtils.waitForEvent(gManagerWindow, "ViewChanged");
-
-  is(
-    gManagerWindow.gViewController.currentViewId,
-    `addons://detail/${encodeURIComponent(gOtherAddon.id)}`,
-    "Detail view should be open"
-  );
-
-  var browser = gManagerWindow.document.querySelector(
-    "#detail-grid > rows > .inline-options-browser"
-  );
-
-  is(browser, null, "Detail view should have no inline browser");
-
-  await new Promise(resolve =>
-    gCategoryUtilities.openType("extension", resolve)
-  );
-});
-
-// Test that loading the original add-on details successfully creates a
-// browser.
-add_task(async function test_inline_browser_addon_again() {
-  let browser = await openDetailsBrowser(gAddon.id);
-
-  await new Promise(resolve =>
-    gCategoryUtilities.openType("extension", resolve)
-  );
-
-  browser = gManagerWindow.document.querySelector(".inline-options-browser");
-
-  is(browser, null, "Options browser should be removed from the document");
-});
-
-add_task(async function() {
-  await close_manager(gManagerWindow);
-
-  gManagerWindow = null;
-  gCategoryUtilities = null;
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_interaction_telemetry.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_interaction_telemetry.js
@@ -208,49 +208,43 @@ function clickLinks(doc) {
     label.click();
     assertTelemetryMatches([]);
     link.click();
     doc.getElementById("detail-homepage").click();
     doc.getElementById("detail-reviews").click();
   }
 }
 
-async function init(startPage, isHtmlViews) {
+async function init(startPage) {
   gManagerWindow = await open_manager(null);
   gCategoryUtilities = new CategoryUtilities(gManagerWindow);
 
   // When about:addons initially loads it will load the last view that
   // was open. If that's different than startPage, then clear the events
   // so that we can reliably test them.
   if (gCategoryUtilities.selectedCategory != startPage) {
     Services.telemetry.clearEvents();
   }
 
   await gCategoryUtilities.openType(startPage);
 
-  if (isHtmlViews) {
-    return gManagerWindow.document.getElementById("html-view-browser")
-      .contentDocument;
-  }
-  return gManagerWindow.document;
+  return gManagerWindow.document.getElementById("html-view-browser")
+    .contentDocument;
 }
 
 /* Test functions start here. */
 
-async function setup(isHtmlViews) {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", isHtmlViews]],
-  });
+add_task(async function setup() {
   // Clear out any telemetry data that existed before this file is run.
   Services.telemetry.clearEvents();
-}
+});
 
-async function testBasicViewTelemetry(isHtmlViews) {
+add_task(async function testBasicViewTelemetry() {
   let addons = await Promise.all([installTheme(), installExtension()]);
-  let doc = await init("discover", isHtmlViews);
+  let doc = await init("discover");
 
   await gCategoryUtilities.openType("theme");
   openDetailView(doc, "theme@mochi.test");
   await wait_for_view_load(gManagerWindow);
 
   await gCategoryUtilities.openType("extension");
   openDetailView(doc, "extension@mochi.test");
   await wait_for_view_load(gManagerWindow);
@@ -273,22 +267,22 @@ async function testBasicViewTelemetry(is
         { type: "extension", addonId: "extension@mochi.test" },
       ],
     ],
     { filterMethods: ["view"] }
   );
 
   await close_manager(gManagerWindow);
   await Promise.all(addons.map(addon => addon.unload()));
-}
+});
 
-async function testExtensionEvents(isHtmlViews) {
+add_task(async function testExtensionEvents() {
   let addon = await installExtension();
   let type = "extension";
-  let doc = await init("extension", isHtmlViews);
+  let doc = await init("extension");
 
   // Check/clear the current telemetry.
   assertTelemetryMatches(
     [["view", "aboutAddons", "list", { type: "extension" }]],
     { filterMethods: ["view"] }
   );
 
   let row = getAddonCard(doc, addonId);
@@ -310,17 +304,17 @@ async function testExtensionEvents(isHtm
         { action: "enable", addonId, type, view: "list" },
       ],
     ],
     { filterMethods: ["action"] }
   );
 
   // Check remove/undo.
   await removeAddonAndUndo(doc, row);
-  let uninstallValue = isHtmlViews ? "accepted" : null;
+  let uninstallValue = "accepted";
   assertTelemetryMatches(
     [
       [
         "action",
         "aboutAddons",
         uninstallValue,
         { action: "uninstall", addonId, type, view: "list" },
       ],
@@ -450,20 +444,20 @@ async function testExtensionEvents(isHtm
       ],
     ],
     { filterMethods: ["action", "view"] }
   );
 
   await close_manager(gManagerWindow);
   await addon.unload();
   await upgraded.unload();
-}
+});
 
-async function testGeneralActions(isHtmlViews) {
-  await init("extension", isHtmlViews);
+add_task(async function testGeneralActions() {
+  await init("extension");
 
   let doc = gManagerWindow.document;
   let menu = doc.getElementById("utils-menu");
   let checkForUpdates = doc.getElementById("utils-updateNow");
   let recentUpdates = doc.getElementById("utils-viewUpdates");
   let debugAddons = doc.getElementById("utils-debugAddons");
   let updatePolicy = doc.getElementById("utils-autoUpdateDefault");
   let resetUpdatePolicy = doc.getElementById(
@@ -545,22 +539,22 @@ async function testGeneralActions(isHtml
       ],
     ],
     { filterMethods: TELEMETRY_METHODS }
   );
 
   await close_manager(gManagerWindow);
 
   assertTelemetryMatches([]);
-}
+});
 
-async function testPreferencesLink(isHtmlViews) {
+add_task(async function testPreferencesLink() {
   assertTelemetryMatches([]);
 
-  await init("theme", isHtmlViews);
+  await init("theme");
 
   let doc = gManagerWindow.document;
 
   // Open the about:preferences page from about:addons.
   let waitForNewTab = BrowserTestUtils.waitForNewTab(
     gBrowser,
     "about:preferences"
   );
@@ -583,36 +577,9 @@ async function testPreferencesLink(isHtm
       ["view", "aboutAddons", "list", { type: "theme" }],
       ["link", "aboutAddons", "about:preferences", { view: "list" }],
       ["link", "aboutPreferences", "about:addons"],
     ],
     { filterMethods: ["link", "view"] }
   );
 
   await close_manager(gManagerWindow);
-}
-
-const testFns = [
-  testBasicViewTelemetry,
-  testExtensionEvents,
-  testGeneralActions,
-  testPreferencesLink,
-];
-
-/**
- * Setup the tasks. This will add tasks for each of testFns to run with the
- * XUL and HTML version of about:addons.
- *
- * To add a test, add it to the testFns array.
- */
-function addTestTasks(isHtmlViews) {
-  add_task(() => setup(isHtmlViews));
-
-  for (let fn of testFns) {
-    let localTestFnName = fn.name + (isHtmlViews ? "HTML" : "XUL");
-    // Get an informative name for the function in stack traces.
-    let obj = { [localTestFnName]: () => fn(isHtmlViews) };
-    add_task(obj[localTestFnName]);
-  }
-}
-
-addTestTasks(false);
-addTestTasks(true);
+});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_langpack_signing.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// The HTML tests are in browser_html_warning_messages.js.
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-// Tests that signed and unsigned language packs show up correctly in
-// the Languages tab based on the langpack signing preference.
-add_task(async function() {
-  const PREF = "extensions.langpacks.signatures.required";
-
-  await SpecialPowers.pushPrefEnv({
-    set: [[PREF, false]],
-  });
-
-  let provider = new MockProvider();
-
-  provider.createAddons([
-    {
-      id: "signed@tests.mozilla.org",
-      name: "Signed langpack",
-      type: "locale",
-      signedState: AddonManager.SIGNEDSTATE_SIGNED,
-      isCorrectlySigned: true,
-    },
-    {
-      id: "unsigned@tests.mozilla.org",
-      name: "Unsigned langpack",
-      type: "locale",
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-      isCorrectlySigned: false,
-    },
-  ]);
-
-  let mgrWin = await open_manager(null);
-
-  function checklist(signingRequired) {
-    let list = mgrWin.document.getElementById("addon-list");
-    is(list.itemChildren.length, 2, "Found 2 items in langpack list");
-    for (let item of list.itemChildren) {
-      let what, warningVisible, errorVisible;
-
-      if (item.mAddon.id.startsWith("signed")) {
-        // Signed langpack should not have any warning/error
-        what = "signed langpack";
-        warningVisible = false;
-        errorVisible = false;
-      } else if (signingRequired) {
-        // Unsigned should have an error if signing is required
-        what = "unsigned langpack";
-        warningVisible = false;
-        errorVisible = true;
-      } else {
-        // Usnigned should have a warning is signing is not required
-        what = "unsigned langpack";
-        warningVisible = true;
-        errorVisible = false;
-      }
-
-      let warning = mgrWin.document.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "warning"
-      );
-      let warningLink = mgrWin.document.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "warning-link"
-      );
-      if (warningVisible) {
-        is_element_visible(warning, `Warning should be visible for ${what}`);
-        is_element_visible(
-          warningLink,
-          `Warning link should be visible for ${what}`
-        );
-      } else {
-        is_element_hidden(warning, `Warning should be hidden for ${what}`);
-        is_element_hidden(
-          warningLink,
-          `Warning link should be hidden for ${what}`
-        );
-      }
-
-      let error = mgrWin.document.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "error"
-      );
-      let errorLink = mgrWin.document.getAnonymousElementByAttribute(
-        item,
-        "anonid",
-        "error-link"
-      );
-      if (errorVisible) {
-        is_element_visible(error, `Error should be visible for ${what}`);
-        is_element_visible(
-          errorLink,
-          `Error link should be visible for ${what}`
-        );
-      } else {
-        is_element_hidden(error, `Error should be hidden for ${what}`);
-        is_element_hidden(errorLink, `Error link should be hidden for ${what}`);
-      }
-    }
-  }
-
-  let catUtils = new CategoryUtilities(mgrWin);
-
-  await catUtils.openType("locale");
-  checklist(false);
-
-  await SpecialPowers.pushPrefEnv({
-    set: [[PREF, true]],
-  });
-
-  await catUtils.openType("extension");
-  await catUtils.openType("locale");
-  checklist(true);
-
-  await close_manager(mgrWin);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_legacy.js
+++ /dev/null
@@ -1,260 +0,0 @@
-// This test is testing the view with legacy add-ons in the XUL about:addons UI.
-// This is not implemented in HTML about:addons, but might be in bug 1525184.
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-add_task(async function() {
-  const INFO_URL =
-    Services.urlFormatter.formatURLPref("app.support.baseURL") +
-    "webextensions";
-
-  // The mochitest framework installs a bunch of legacy extensions.
-  // Fortunately, the extensions.legacy.exceptions preference exists to
-  // avoid treating some extensions as legacy for the purposes of the UI.
-  const IGNORE = [
-    "special-powers@mozilla.org",
-    "mochikit@mozilla.org",
-    "mozscreenshots@mozilla.org",
-  ];
-
-  let exceptions = Services.prefs.getCharPref("extensions.legacy.exceptions");
-  exceptions = [exceptions, ...IGNORE].join(",");
-
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["extensions.legacy.enabled", false],
-      ["extensions.legacy.exceptions", exceptions],
-
-      ["xpinstall.signatures.required", false],
-    ],
-  });
-
-  let goodAddons = [
-    {
-      id: "webextension@tests.mozilla.org",
-      name: "WebExtension",
-      type: "extension",
-      isWebExtension: true,
-    },
-    {
-      id: "mozilla@tests.mozilla.org",
-      name: "Mozilla signed extension",
-      type: "extension",
-      isWebExtension: false,
-      signedState: AddonManager.SIGNEDSTATE_PRIVILEGED,
-    },
-  ];
-
-  let disabledAddon = [
-    {
-      id: "legacy@tests.mozilla.org",
-      name: "Legacy extension",
-      type: "extension",
-      isWebExtension: false,
-      appDisabled: true,
-    },
-  ];
-
-  let unsignedAddons = [
-    {
-      id: "unsigned_webext@tests.mozilla.org",
-      name: "Unsigned WebExtension",
-      type: "extension",
-      isWebExtension: true,
-      appDisabled: true,
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-    },
-    {
-      id: "unsigned_legacy@tests.mozilla.org",
-      name: "Unsigned legacy extension",
-      type: "extension",
-      isWebExtension: false,
-      appDisabled: true,
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-    },
-  ];
-
-  let provider = new MockProvider();
-  provider.createAddons(goodAddons);
-
-  let mgrWin = await open_manager(null);
-  let catUtils = new CategoryUtilities(mgrWin);
-
-  // Check that the test addons in the given list are exactly those
-  // in the expected list.
-  async function checkList(listId, expectIds) {
-    let ids = new Set(expectIds);
-    for (let item of mgrWin.document.getElementById(listId).itemChildren) {
-      if (!item.mAddon.id.endsWith("@tests.mozilla.org")) {
-        continue;
-      }
-
-      ok(ids.has(item.mAddon.id), `Found ${item.mAddon.id} in addons list`);
-      ids.delete(item.mAddon.id);
-    }
-
-    for (let id of ids) {
-      ok(false, `Did not find ${id} in addons list`);
-    }
-  }
-
-  // Initially, we have two good extensions (a webextension and a
-  // "Mozilla Extensions"-signed extension).
-  await catUtils.openType("extension");
-  checkList("addon-list", [
-    "webextension@tests.mozilla.org",
-    "mozilla@tests.mozilla.org",
-  ]);
-
-  let banner = mgrWin.document.getElementById("legacy-extensions-notice");
-  is_element_hidden(banner, "Warning about legacy extensions should be hidden");
-  is(
-    mgrWin.gLegacyView._categoryItem.disabled,
-    true,
-    "Legacy category is hidden"
-  );
-
-  // Now add a legacy extension
-  provider.createAddons(disabledAddon);
-
-  // The legacy category does not watch for new installs since new
-  // legacy extensions cannot be installed while legacy extensions
-  // are disabled, so manually refresh it here.
-  await mgrWin.gLegacyView.refreshVisibility();
-
-  // Make sure we re-render the extensions list, after that we should
-  // still just have the original two entries.
-  await catUtils.openType("plugin");
-  await catUtils.openType("extension");
-
-  checkList("addon-list", [
-    "webextension@tests.mozilla.org",
-    "mozilla@tests.mozilla.org",
-  ]);
-
-  // But now the legacy banner and category should be visible
-  banner = mgrWin.document.getElementById("legacy-extensions-notice");
-  is_element_visible(
-    banner,
-    "Warning about legacy extensions should be visible"
-  );
-
-  let catItem = mgrWin.gLegacyView._categoryItem;
-  is(catItem.disabled, false, "Legacy category is visible");
-  is(
-    catItem.getAttribute("name"),
-    get_string("type.legacy.name"),
-    "Category label with no unsigned extensions is correct"
-  );
-
-  // Follow the link to the legacy extensions page
-  let legacyLink = mgrWin.document.getElementById(
-    "legacy-extensions-learnmore-link"
-  );
-  is_element_visible(legacyLink, "Link to legacy extension is visible");
-
-  let loadPromise = new Promise(resolve =>
-    wait_for_view_load(mgrWin, resolve, true)
-  );
-  legacyLink.click();
-  await loadPromise;
-
-  is(
-    mgrWin.gViewController.currentViewId,
-    "addons://legacy/",
-    "Legacy extensions link leads to the correct view"
-  );
-
-  let link = mgrWin.document.getElementById("legacy-learnmore");
-  is(link.href, INFO_URL, "Learn more link points to the right place");
-
-  // The only extension in the list should be the one we just added.
-  checkList("legacy-list", ["legacy@tests.mozilla.org"]);
-
-  // Now add some unsigned addons and flip the signing preference
-  provider.createAddons(unsignedAddons);
-  SpecialPowers.pushPrefEnv({
-    set: [["xpinstall.signatures.required", true]],
-  });
-
-  // The entry on the left side should now read "Unsupported"
-  await mgrWin.gLegacyView.refreshVisibility();
-  is(catItem.disabled, false, "Legacy category is visible");
-  is(
-    catItem.getAttribute("name"),
-    get_string("type.unsupported.name"),
-    "Category label with unsigned extensions is correct"
-  );
-
-  // The main extensions list should still have the original two
-  // good extensions and the legacy banner.
-  await catUtils.openType("extension");
-  checkList("addon-list", [
-    "webextension@tests.mozilla.org",
-    "mozilla@tests.mozilla.org",
-  ]);
-
-  banner = mgrWin.document.getElementById("legacy-extensions-notice");
-  is_element_visible(
-    banner,
-    "Warning about legacy extensions should be visible"
-  );
-
-  // And the legacy pane should show both legacy and unsigned extensions
-  await catUtils.openType("legacy");
-  checkList("legacy-list", [
-    "legacy@tests.mozilla.org",
-    "unsigned_webext@tests.mozilla.org",
-    "unsigned_legacy@tests.mozilla.org",
-  ]);
-
-  // Disable unsigned extensions
-  SpecialPowers.pushPrefEnv({
-    set: [["xpinstall.signatures.required", false]],
-  });
-
-  await new Promise(executeSoon);
-
-  // The name of the pane should go back to "Legacy Extensions"
-  await mgrWin.gLegacyView.refreshVisibility();
-  is(catItem.disabled, false, "Legacy category is visible");
-  is(
-    catItem.getAttribute("name"),
-    get_string("type.legacy.name"),
-    "Category label with no unsigned extensions is correct"
-  );
-
-  // The unsigned extension should be present in the main extensions pane
-  await catUtils.openType("extension");
-  checkList("addon-list", [
-    "webextension@tests.mozilla.org",
-    "mozilla@tests.mozilla.org",
-    "unsigned_webext@tests.mozilla.org",
-  ]);
-
-  // And it should not be present in the legacy pane
-  await catUtils.openType("legacy");
-  checkList("legacy-list", [
-    "legacy@tests.mozilla.org",
-    "unsigned_legacy@tests.mozilla.org",
-  ]);
-
-  await close_manager(mgrWin);
-
-  // Now enable legacy extensions and open a new addons manager tab.
-  // The remembered last view will be the list of legacy extensions but
-  // now that legacy extensions are enabled, we should jump to the
-  // regular Extensions list.
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.legacy.enabled", true]],
-  });
-
-  mgrWin = await open_manager(null);
-  is(
-    mgrWin.gViewController.currentViewId,
-    "addons://list/extension",
-    "addons manager switched to extensions list"
-  );
-  await close_manager(mgrWin);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_legacy_pre57.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This test is testing XUL about:addons UI not implemented in the HTML about:addons,
-// it may be adapted or tested in a separate test file in Bug 1525184.
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-add_task(async function() {
-  const INFO_URL =
-    Services.urlFormatter.formatURLPref("app.support.baseURL") +
-    "webextensions";
-
-  const NAMES = {
-    newTheme: "New LWT",
-    legacy: "Legacy Extension",
-    webextension: "WebExtension",
-    dictionary: "Dictionary",
-    langpack: "Language Pack",
-  };
-  let addons = [
-    {
-      id: "new-theme@tests.mozilla.org",
-      name: NAMES.newTheme,
-      type: "theme",
-      isWebExtension: true,
-    },
-    {
-      id: "legacy@tests.mozilla.org",
-      name: NAMES.legacy,
-      type: "extension",
-      isWebExtension: false,
-    },
-    {
-      id: "webextension@tests.mozilla.org",
-      name: NAMES.webextension,
-      type: "extension",
-      isWebExtension: true,
-    },
-    {
-      id: "dictionary@tests.mozilla.org",
-      name: NAMES.dictionary,
-      type: "dictionary",
-    },
-  ];
-
-  let provider = new MockProvider();
-  provider.createAddons(addons);
-
-  let mgrWin = await open_manager(null);
-  let catUtils = new CategoryUtilities(mgrWin);
-
-  async function check(category, name, isLegacy) {
-    await catUtils.openType(category);
-
-    let document = mgrWin.document;
-    // First find the  entry in the list.
-    let item = Array.from(
-      document.getElementById("addon-list").childNodes
-    ).find(i => i.getAttribute("name") == name);
-
-    ok(item, `Found ${name} in list`);
-    item.parentNode.ensureElementIsVisible(item);
-
-    // Check the badge
-    let badge = document.getAnonymousElementByAttribute(
-      item,
-      "anonid",
-      "legacy"
-    );
-
-    if (isLegacy) {
-      is_element_visible(badge, `Legacy badge is visible for ${name}`);
-      is(badge.href, INFO_URL, "Legacy badge link is correct");
-    } else {
-      is_element_hidden(badge, `Legacy badge is hidden for ${name}`);
-    }
-
-    // Click down to the details page.
-    EventUtils.synthesizeMouseAtCenter(item, {}, mgrWin);
-    await new Promise(resolve => wait_for_view_load(mgrWin, resolve));
-
-    // And check the badge
-    let elements = document.getElementsByClassName("legacy-warning");
-    is(elements.length, 1, "Found the legacy-warning element");
-    badge = elements[0];
-
-    if (isLegacy) {
-      is_element_visible(badge, `Legacy badge is visible for ${name}`);
-      is(badge.href, INFO_URL, "Legacy badge link is correct");
-    } else {
-      is_element_hidden(badge, `Legacy badge is hidden for ${name}`);
-    }
-  }
-
-  await check("theme", NAMES.newTheme, false);
-  await check("extension", NAMES.legacy, true);
-  await check("extension", NAMES.webextension, false);
-  await check("dictionary", NAMES.dictionary, false);
-
-  await close_manager(mgrWin);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ /dev/null
@@ -1,1314 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests the list view
-
-const { AppConstants } = ChromeUtils.import(
-  "resource://gre/modules/AppConstants.jsm"
-);
-
-const { PromiseTestUtils } = ChromeUtils.import(
-  "resource://testing-common/PromiseTestUtils.jsm"
-);
-
-PromiseTestUtils.whitelistRejectionsGlobally(/this\._errorLink/);
-
-var gProvider;
-var gManagerWindow;
-var gCategoryUtilities;
-
-var gApp = document.getElementById("bundle_brand").getString("brandShortName");
-var gVersion = Services.appinfo.version;
-var gDate = new Date(2010, 7, 16);
-var infoURL =
-  Services.urlFormatter.formatURLPref("app.support.baseURL") +
-  "unsigned-addons";
-
-const EXPECTED_ADDONS = 11;
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files for these test cases).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-add_task(async function() {
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "Test add-on",
-      version: "1.0",
-      description: "A test add-on",
-      longDescription: " A longer description",
-      updateDate: gDate,
-    },
-    {
-      id: "addon2@tests.mozilla.org",
-      name: "Test add-on 2",
-      version: "2.0",
-      longDescription: " A longer description",
-      _userDisabled: true,
-      isActive: false,
-    },
-    {
-      id: "addon3@tests.mozilla.org",
-      name: "Test add-on 3",
-      longDescription: " A longer description",
-      isActive: false,
-      isCompatible: false,
-      appDisabled: true,
-      permissions:
-        AddonManager.PERM_CAN_ENABLE |
-        AddonManager.PERM_CAN_DISABLE |
-        AddonManager.PERM_CAN_UPGRADE,
-    },
-    {
-      id: "addon5@tests.mozilla.org",
-      blocklistURL: "http://example.com/addon5@tests.mozilla.org",
-      name: "Test add-on 5",
-      isActive: false,
-      blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
-      appDisabled: true,
-    },
-    {
-      id: "addon6@tests.mozilla.org",
-      blocklistURL: "http://example.com/addon6@tests.mozilla.org",
-      name: "Test add-on 6",
-      operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE,
-    },
-    {
-      id: "addon8@tests.mozilla.org",
-      blocklistURL: "http://example.com/addon8@tests.mozilla.org",
-      name: "Test add-on 8",
-      blocklistState: Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE,
-    },
-    {
-      id: "addon9@tests.mozilla.org",
-      blocklistURL: "http://example.com/addon9@tests.mozilla.org",
-      name: "Test add-on 9",
-      blocklistState: Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE,
-    },
-    {
-      id: "addon10@tests.mozilla.org",
-      name: "Test add-on 10",
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-    },
-    {
-      id: "addon11@tests.mozilla.org",
-      name: "Test add-on 11",
-      signedState: AddonManager.SIGNEDSTATE_MISSING,
-      isActive: false,
-      isCompatible: false,
-      appDisabled: true,
-    },
-    {
-      id: "addon12@tests.mozilla.org",
-      name: "Test add-on 12",
-      signedState: AddonManager.SIGNEDSTATE_PRELIMINARY,
-      foreignInstall: true,
-    },
-    {
-      id: "addon13@tests.mozilla.org",
-      name: "Test add-on 13",
-      signedState: AddonManager.SIGNEDSTATE_SIGNED,
-      foreignInstall: true,
-    },
-    {
-      id: "addon15@tests.mozilla.org",
-      name: "Test add-on 15",
-      hidden: true,
-    },
-  ]);
-
-  gManagerWindow = await open_manager(null);
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-});
-
-function get_test_items() {
-  var tests = "@tests.mozilla.org";
-
-  var items = {};
-  var item = gManagerWindow.document.getElementById("addon-list").firstChild;
-
-  while (item) {
-    if (
-      item.mAddon.id.substring(item.mAddon.id.length - tests.length) == tests &&
-      !BrowserTestUtils.is_hidden(item)
-    ) {
-      items[item.mAddon.name] = item;
-    }
-    item = item.nextSibling;
-  }
-
-  return items;
-}
-
-function get_node(parent, anonid) {
-  return parent.ownerDocument.getAnonymousElementByAttribute(
-    parent,
-    "anonid",
-    anonid
-  );
-}
-
-function get_class_node(parent, cls) {
-  return parent.ownerDocument.getAnonymousElementByAttribute(
-    parent,
-    "class",
-    cls
-  );
-}
-
-// Check that the list appears to have displayed correctly and trigger some
-// changes
-add_task(async function() {
-  await gCategoryUtilities.openType("extension");
-  let items = get_test_items();
-  is(
-    Object.keys(items).length,
-    EXPECTED_ADDONS,
-    "Should be the right number of add-ons installed"
-  );
-
-  info("Addon 3");
-  let addon = items["Test add-on 3"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  let { name, version } = await get_tooltip_info(addon);
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 3",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 3", "Tooltip name should be correct");
-  is(version, undefined, "Tooltip version should be hidden");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "disable-btn"),
-    "Disable button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "remove-btn"),
-    "Remove button should be hidden"
-  );
-
-  is_element_visible(
-    get_node(addon, "warning"),
-    "Warning message should be visible"
-  );
-  is(
-    get_node(addon, "warning").textContent,
-    "Test add-on 3 is incompatible with " + gApp + " " + gVersion + ".",
-    "Warning message should be correct"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  info("Addon 5");
-  addon = items["Test add-on 5"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  await TestUtils.waitForCondition(
-    () => !BrowserTestUtils.is_hidden(get_node(addon, "error-link"))
-  );
-  ({ name, version } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 5",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 5", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "disable-btn"),
-    "Disable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is(
-    get_node(addon, "error").textContent,
-    "Test add-on 5 has been disabled due to security or stability issues.",
-    "Error message should be correct"
-  );
-  is_element_visible(
-    get_node(addon, "error-link"),
-    "Error link should be visible"
-  );
-  is(
-    get_node(addon, "error-link").value,
-    "More Information",
-    "Error link text should be correct"
-  );
-  is(
-    get_node(addon, "error-link").href,
-    "http://example.com/addon5@tests.mozilla.org",
-    "Error link should be correct"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  info("Addon 6");
-  addon = items["Test add-on 6"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  ({ name, version } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 6",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 6", "Tooltip name should be correct");
-  is_element_hidden(
-    get_class_node(addon, "disabled-postfix"),
-    "Disabled postfix should be hidden"
-  );
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  info("Disabling");
-  EventUtils.synthesizeMouseAtCenter(
-    get_node(addon, "disable-btn"),
-    {},
-    gManagerWindow
-  );
-  await new Promise(executeSoon);
-  is_element_visible(
-    get_class_node(addon, "disabled-postfix"),
-    "Disabled postfix should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "enable-btn"),
-    "Enable button should be visible"
-  );
-  is_element_hidden(
-    get_node(addon, "disable-btn"),
-    "Disable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  info("Addon 8");
-  addon = items["Test add-on 8"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  await TestUtils.waitForCondition(
-    () => !BrowserTestUtils.is_hidden(get_node(addon, "error-link"))
-  );
-  ({ name, version } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 8",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 8", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is(
-    get_node(addon, "error").textContent,
-    "Test add-on 8 is known to be vulnerable and should be updated.",
-    "Error message should be correct"
-  );
-  is_element_visible(
-    get_node(addon, "error-link"),
-    "Error link should be visible"
-  );
-  is(
-    get_node(addon, "error-link").value,
-    "Update Now",
-    "Error link text should be correct"
-  );
-  is(
-    get_node(addon, "error-link").href,
-    "http://example.com/addon8@tests.mozilla.org",
-    "Error link should be correct"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  info("Addon 9");
-  addon = items["Test add-on 9"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  await TestUtils.waitForCondition(
-    () => !BrowserTestUtils.is_hidden(get_node(addon, "error-link"))
-  );
-  ({ name, version } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 9",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 9", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is(
-    get_node(addon, "error").textContent,
-    "Test add-on 9 is known to be vulnerable. Use with caution.",
-    "Error message should be correct"
-  );
-  is_element_visible(
-    get_node(addon, "error-link"),
-    "Error link should be visible"
-  );
-  is(
-    get_node(addon, "error-link").value,
-    "More Information",
-    "Error link text should be correct"
-  );
-  is(
-    get_node(addon, "error-link").href,
-    "http://example.com/addon9@tests.mozilla.org",
-    "Error link should be correct"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  // These tests are only appropriate when signing can be turned off
-  if (!AppConstants.MOZ_REQUIRE_SIGNING) {
-    info("Addon 10");
-    addon = items["Test add-on 10"];
-    addon.parentNode.ensureElementIsVisible(addon);
-    ({ name, version } = await get_tooltip_info(addon));
-    is(
-      get_node(addon, "name").textContent,
-      "Test add-on 10",
-      "Name should be correct"
-    );
-    is(name, "Test add-on 10", "Tooltip name should be correct");
-
-    is_element_hidden(
-      get_node(addon, "preferences-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_visible(
-      get_node(addon, "disable-btn"),
-      "Disable button should be visible"
-    );
-    is_element_visible(
-      get_node(addon, "remove-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_visible(
-      get_node(addon, "warning"),
-      "Warning message should be visible"
-    );
-    is(
-      get_node(addon, "warning").textContent,
-      "Test add-on 10 could not be verified for use in " +
-        gApp +
-        ". Proceed with caution.",
-      "Warning message should be correct"
-    );
-    is_element_visible(
-      get_node(addon, "warning-link"),
-      "Warning link should be visible"
-    );
-    is(
-      get_node(addon, "warning-link").value,
-      "More Information",
-      "Warning link text should be correct"
-    );
-    is(
-      get_node(addon, "warning-link").href,
-      infoURL,
-      "Warning link should be correct"
-    );
-    is_element_hidden(
-      get_node(addon, "error"),
-      "Error message should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "error-link"),
-      "Error link should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "pending"),
-      "Pending message should be hidden"
-    );
-
-    info("Addon 11");
-    addon = items["Test add-on 11"];
-    addon.parentNode.ensureElementIsVisible(addon);
-    ({ name, version } = await get_tooltip_info(addon));
-    is(
-      get_node(addon, "name").textContent,
-      "Test add-on 11",
-      "Name should be correct"
-    );
-    is(name, "Test add-on 11", "Tooltip name should be correct");
-
-    is_element_hidden(
-      get_node(addon, "preferences-btn"),
-      "Preferences button should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "enable-btn"),
-      "Enable button should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "disable-btn"),
-      "Disable button should be hidden"
-    );
-    is_element_visible(
-      get_node(addon, "remove-btn"),
-      "Remove button should be visible"
-    );
-
-    is_element_visible(
-      get_node(addon, "warning"),
-      "Warning message should be visible"
-    );
-    is(
-      get_node(addon, "warning").textContent,
-      "Test add-on 11 is incompatible with " + gApp + " " + gVersion + ".",
-      "Warning message should be correct"
-    );
-    is_element_hidden(
-      get_node(addon, "warning-link"),
-      "Warning link should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "error"),
-      "Error message should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "error-link"),
-      "Error link should be hidden"
-    );
-    is_element_hidden(
-      get_node(addon, "pending"),
-      "Pending message should be hidden"
-    );
-
-    info(
-      "Filter for disabled unsigned extensions shouldn't appear because signing checks are off"
-    );
-    let filterButton = gManagerWindow.document.getElementById(
-      "show-disabled-unsigned-extensions"
-    );
-    let showAllButton = gManagerWindow.document.getElementById(
-      "show-all-extensions"
-    );
-    let signingInfoUI = gManagerWindow.document.getElementById(
-      "disabled-unsigned-addons-info"
-    );
-    is_element_hidden(
-      filterButton,
-      "Button for showing disabled unsigned extensions should be hidden"
-    );
-    is_element_hidden(
-      showAllButton,
-      "Button for showing all extensions should be hidden"
-    );
-    is_element_hidden(signingInfoUI, "Signing info UI should be hidden");
-  }
-});
-
-// Reload the list to make sure the changes are still pending and that undoing
-// works
-add_task(async function() {
-  await gCategoryUtilities.openType("plugin");
-  await gCategoryUtilities.openType("extension");
-
-  let items = get_test_items();
-  is(
-    Object.keys(items).length,
-    EXPECTED_ADDONS,
-    "Should be the right number of add-ons installed"
-  );
-
-  info("Addon 6");
-  let addon = items["Test add-on 6"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  let { name } = await get_tooltip_info(addon);
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 6",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 6", "Tooltip name should be correct");
-  is_element_visible(
-    get_class_node(addon, "disabled-postfix"),
-    "Disabled postfix should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "enable-btn"),
-    "Enable button should be visible"
-  );
-  is_element_hidden(
-    get_node(addon, "disable-btn"),
-    "Disable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-
-  info("Enabling");
-  EventUtils.synthesizeMouseAtCenter(
-    get_node(addon, "enable-btn"),
-    {},
-    gManagerWindow
-  );
-  await new Promise(executeSoon);
-  is_element_hidden(
-    get_class_node(addon, "disabled-postfix"),
-    "Disabled postfix should be hidden"
-  );
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-});
-
-// Check that upgrades with onExternalInstall take effect immediately
-add_task(async function() {
-  gProvider.createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "Test add-on replacement",
-      version: "2.0",
-      description: "A test add-on with a new description",
-      updateDate: gDate,
-      operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE,
-    },
-    {
-      id: "addon14@tests.mozilla.org",
-      name: "Test add-on 14",
-      hidden: true,
-    },
-  ]);
-
-  let items = get_test_items();
-  is(
-    Object.keys(items).length,
-    EXPECTED_ADDONS,
-    "Should be the right number of add-ons installed"
-  );
-
-  let addon = items["Test add-on replacement"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  let { name, version } = await get_tooltip_info(addon);
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on replacement",
-    "Name should be correct"
-  );
-  is(name, "Test add-on replacement", "Tooltip name should be correct");
-  is(version, "2.0", "Tooltip version should be correct");
-  is_element_hidden(
-    get_class_node(addon, "disabled-postfix"),
-    "Disabled postfix should be hidden"
-  );
-  is_element_hidden(
-    get_class_node(addon, "update-postfix"),
-    "Update postfix should be hidden"
-  );
-  is(
-    get_node(addon, "date-updated").value,
-    formatDate(gDate),
-    "Update date should be correct"
-  );
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "pending"),
-    "Pending message should be hidden"
-  );
-});
-
-// Check that focus changes correctly move around the selected list item
-add_task(async function() {
-  function is_node_in_list(aNode) {
-    var list = gManagerWindow.document.getElementById("addon-list");
-
-    while (aNode && aNode != list) {
-      aNode = aNode.parentNode;
-    }
-
-    if (aNode) {
-      return true;
-    }
-    return false;
-  }
-
-  // Ignore the OSX full keyboard access setting
-  Services.prefs.setBoolPref("accessibility.tabfocus_applies_to_xul", false);
-
-  let items = get_test_items();
-  is(
-    Object.keys(items).length,
-    EXPECTED_ADDONS,
-    "Should be the right number of add-ons installed"
-  );
-
-  let addon = items["Test add-on 6"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  addon.parentNode.focus();
-  is(
-    Services.focus.focusedElement,
-    addon.parentNode,
-    "Focus should have moved to the list"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", {}, gManagerWindow);
-  is(
-    Services.focus.focusedElement,
-    get_node(addon, "disable-btn"),
-    "Focus should have moved to the disable button"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", {}, gManagerWindow);
-  is(
-    Services.focus.focusedElement,
-    get_node(addon, "remove-btn"),
-    "Focus should have moved to the remove button"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", {}, gManagerWindow);
-  ok(
-    !is_node_in_list(Services.focus.focusedElement),
-    "Focus should be outside the list"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }, gManagerWindow);
-  is(
-    Services.focus.focusedElement,
-    get_node(addon, "remove-btn"),
-    "Focus should have moved to the remove button"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }, gManagerWindow);
-  is(
-    Services.focus.focusedElement,
-    get_node(addon, "disable-btn"),
-    "Focus should have moved to the disable button"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }, gManagerWindow);
-  is(
-    Services.focus.focusedElement,
-    addon.parentNode,
-    "Focus should have moved to the list"
-  );
-
-  EventUtils.synthesizeKey("VK_TAB", { shiftKey: true }, gManagerWindow);
-  ok(
-    !is_node_in_list(Services.focus.focusedElement),
-    "Focus should be outside the list"
-  );
-
-  try {
-    Services.prefs.clearUserPref("accessibility.tabfocus_applies_to_xul");
-  } catch (e) {}
-});
-
-// Check that onPropertyChanges for appDisabled updates the UI
-add_task(async function() {
-  info("Checking that onPropertyChanges for appDisabled updates the UI");
-
-  let [aAddon] = await promiseAddonsByIDs(["addon2@tests.mozilla.org"]);
-  await aAddon.disable();
-  aAddon.isCompatible = true;
-  aAddon.appDisabled = false;
-
-  gManagerWindow.loadView("addons://list/extension");
-  await new Promise(resolve => wait_for_view_load(gManagerWindow, resolve));
-  var el = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
-
-  is(
-    el.getAttribute("active"),
-    "false",
-    "Addon should not be marked as active"
-  );
-  is_element_hidden(
-    get_node(el, "warning"),
-    "Warning message should not be visible"
-  );
-
-  info("Making addon incompatible and appDisabled");
-  aAddon.isCompatible = false;
-  aAddon.appDisabled = true;
-
-  is(
-    el.getAttribute("active"),
-    "false",
-    "Addon should not be marked as active"
-  );
-  is_element_visible(
-    get_node(el, "warning"),
-    "Warning message should be visible"
-  );
-  is(
-    get_node(el, "warning").textContent,
-    "Test add-on 2 is incompatible with " + gApp + " " + gVersion + ".",
-    "Warning message should be correct"
-  );
-});
-
-// Check that the list displays correctly when signing is required
-add_task(async function() {
-  await close_manager(gManagerWindow);
-  Services.prefs.setBoolPref("xpinstall.signatures.required", true);
-  gManagerWindow = await open_manager(null);
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-
-  await gCategoryUtilities.openType("extension");
-  let items = get_test_items();
-  is(
-    Object.keys(items).length,
-    EXPECTED_ADDONS,
-    "Should be the right number of add-ons installed"
-  );
-
-  info("Addon 10");
-  let addon = items["Test add-on 10"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  await TestUtils.waitForCondition(
-    () => !BrowserTestUtils.is_hidden(get_node(addon, "error-link"))
-  );
-  let { name } = await get_tooltip_info(addon);
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 10",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 10", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is(
-    get_node(addon, "error").textContent,
-    "Test add-on 10 could not be verified for use in " +
-      gApp +
-      " and has been disabled.",
-    "Error message should be correct"
-  );
-  is_element_visible(
-    get_node(addon, "error-link"),
-    "Error link should be visible"
-  );
-  is(
-    get_node(addon, "error-link").value,
-    "More Information",
-    "Error link text should be correct"
-  );
-  is(
-    get_node(addon, "error-link").href,
-    infoURL,
-    "Error link should be correct"
-  );
-
-  info("Addon 11");
-  addon = items["Test add-on 11"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  await TestUtils.waitForCondition(
-    () => !BrowserTestUtils.is_hidden(get_node(addon, "error-link"))
-  );
-  ({ name } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 11",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 11", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "disable-btn"),
-    "Disable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "error"),
-    "Error message should be visible"
-  );
-  is(
-    get_node(addon, "error").textContent,
-    "Test add-on 11 could not be verified for use in " +
-      gApp +
-      " and has been disabled.",
-    "Error message should be correct"
-  );
-  is_element_visible(
-    get_node(addon, "error-link"),
-    "Error link should be visible"
-  );
-  is(
-    get_node(addon, "error-link").value,
-    "More Information",
-    "Error link text should be correct"
-  );
-  is(
-    get_node(addon, "error-link").href,
-    infoURL,
-    "Error link should be correct"
-  );
-
-  info("Addon 12");
-  addon = items["Test add-on 12"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  ({ name } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 12",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 12", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
-  is_element_hidden(
-    get_node(addon, "error-link"),
-    "Error link should be hidden"
-  );
-
-  info("Addon 13");
-  addon = items["Test add-on 13"];
-  addon.parentNode.ensureElementIsVisible(addon);
-  ({ name } = await get_tooltip_info(addon));
-  is(
-    get_node(addon, "name").textContent,
-    "Test add-on 13",
-    "Name should be correct"
-  );
-  is(name, "Test add-on 13", "Tooltip name should be correct");
-
-  is_element_hidden(
-    get_node(addon, "preferences-btn"),
-    "Preferences button should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "enable-btn"),
-    "Enable button should be hidden"
-  );
-  is_element_visible(
-    get_node(addon, "disable-btn"),
-    "Disable button should be visible"
-  );
-  is_element_visible(
-    get_node(addon, "remove-btn"),
-    "Remove button should be visible"
-  );
-
-  is_element_hidden(
-    get_node(addon, "warning"),
-    "Warning message should be hidden"
-  );
-  is_element_hidden(
-    get_node(addon, "warning-link"),
-    "Warning link should be hidden"
-  );
-  is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
-
-  info("Filter for disabled unsigned extensions");
-  let filterButton = gManagerWindow.document.getElementById(
-    "show-disabled-unsigned-extensions"
-  );
-  let showAllButton = gManagerWindow.document.getElementById(
-    "show-all-extensions"
-  );
-  let signingInfoUI = gManagerWindow.document.getElementById(
-    "disabled-unsigned-addons-info"
-  );
-  is_element_visible(
-    filterButton,
-    "Button for showing disabled unsigned extensions should be visible"
-  );
-  is_element_hidden(
-    showAllButton,
-    "Button for showing all extensions should be hidden"
-  );
-  is_element_hidden(signingInfoUI, "Signing info UI should be hidden");
-
-  filterButton.click();
-
-  await new Promise(resolve => wait_for_view_load(gManagerWindow, resolve));
-
-  is_element_hidden(
-    filterButton,
-    "Button for showing disabled unsigned extensions should be hidden"
-  );
-  is_element_visible(
-    showAllButton,
-    "Button for showing all extensions should be visible"
-  );
-  is_element_visible(signingInfoUI, "Signing info UI should be visible");
-
-  items = get_test_items();
-  is(Object.keys(items).length, 2, "Two add-ons should be shown");
-  is(
-    Object.keys(items)[0],
-    "Test add-on 10",
-    "The disabled unsigned extension should be shown"
-  );
-  is(
-    Object.keys(items)[1],
-    "Test add-on 11",
-    "The disabled unsigned extension should be shown"
-  );
-
-  showAllButton.click();
-
-  await new Promise(resolve => wait_for_view_load(gManagerWindow, resolve));
-
-  items = get_test_items();
-  is(
-    Object.keys(items).length,
-    EXPECTED_ADDONS,
-    "All add-ons should be shown again"
-  );
-  is_element_visible(
-    filterButton,
-    "Button for showing disabled unsigned extensions should be visible again"
-  );
-  is_element_hidden(
-    showAllButton,
-    "Button for showing all extensions should be hidden again"
-  );
-  is_element_hidden(signingInfoUI, "Signing info UI should be hidden again");
-
-  Services.prefs.setBoolPref("xpinstall.signatures.required", false);
-});
-
-add_task(async function() {
-  is(
-    gManagerWindow.document.getElementById("helpButton").href,
-    Services.urlFormatter.formatURLPref("app.support.baseURL") + "addons-help",
-    "The help link is setup correctly"
-  );
-});
-
-add_task(async function() {
-  return close_manager(gManagerWindow);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_manualupdates.js
+++ /dev/null
@@ -1,439 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests manual updates, including the Available Updates pane
-
-var gProvider;
-var gManagerWindow;
-var gCategoryUtilities;
-var gAvailableCategory;
-
-// This test is testing XUL about:addons UI (the HTML about:addons has its
-// own test files for these test cases).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-async function test() {
-  waitForExplicitFinish();
-
-  gProvider = new MockProvider();
-
-  gProvider.createAddons([
-    {
-      id: "addon1@tests.mozilla.org",
-      name: "auto updating addon",
-      version: "1.0",
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_ENABLE,
-    },
-  ]);
-
-  let aWindow = await open_manager("addons://list/extension");
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-  run_next_test();
-}
-
-async function end_test() {
-  await close_manager(gManagerWindow);
-  finish();
-}
-
-add_test(function clearOldTelemetry() {
-  Services.telemetry.clearEvents();
-  run_next_test();
-});
-
-add_test(function() {
-  gAvailableCategory = gManagerWindow.gCategories.get(
-    "addons://updates/available"
-  );
-  is(
-    gCategoryUtilities.isVisible(gAvailableCategory),
-    false,
-    "Available Updates category should initially be hidden"
-  );
-
-  gProvider.createAddons([
-    {
-      id: "addon2@tests.mozilla.org",
-      name: "manually updating addon",
-      version: "1.0",
-      isCompatible: false,
-      operationsRequiringRestart: 0,
-      blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
-      applyBackgroundUpdates: AddonManager.AUTOUPDATE_DISABLE,
-    },
-  ]);
-
-  is(
-    gCategoryUtilities.isVisible(gAvailableCategory),
-    false,
-    "Available Updates category should still be hidden"
-  );
-
-  run_next_test();
-});
-
-add_test(async function() {
-  let finished = 0;
-  function maybeRunNext() {
-    if (++finished == 2) {
-      run_next_test();
-    }
-  }
-
-  gAvailableCategory.addEventListener(
-    "CategoryBadgeUpdated",
-    function() {
-      is(
-        gCategoryUtilities.isVisible(gAvailableCategory),
-        true,
-        "Available Updates category should now be visible"
-      );
-      is(
-        gAvailableCategory.badgeCount,
-        1,
-        "Badge for Available Updates should now be 1"
-      );
-      maybeRunNext();
-    },
-    { once: true }
-  );
-
-  await gCategoryUtilities.openType("extension");
-  gProvider.createInstalls([
-    {
-      name: "manually updating addon (new and improved!)",
-      existingAddon: gProvider.addons[1],
-      version: "1.1",
-      releaseNotesURI: Services.io.newURI(TESTROOT + "thereIsNoFileHere.xhtml"),
-    },
-  ]);
-
-  var item = get_addon_element(gManagerWindow, "addon2@tests.mozilla.org");
-  get_tooltip_info(item).then(({ version }) => {
-    is(version, "1.0", "Should still show the old version in the tooltip");
-    maybeRunNext();
-  });
-});
-
-add_test(async function() {
-  Promise.resolve().then(() => {
-    EventUtils.synthesizeMouseAtCenter(gAvailableCategory, {}, gManagerWindow);
-  });
-  await wait_for_view_load(gManagerWindow, null, true);
-  is(
-    gManagerWindow.document.getElementById("categories").selectedItem.value,
-    "addons://updates/available",
-    "Available Updates category should now be selected"
-  );
-  is(
-    gManagerWindow.gViewController.currentViewId,
-    "addons://updates/available",
-    "Available Updates view should be the current view"
-  );
-  run_next_test();
-});
-
-add_test(async function() {
-  var list = gManagerWindow.document.getElementById("updates-list");
-  is(list.itemCount, 1, "Should be 1 available update listed");
-  var item = list.firstChild;
-  is(
-    item.mAddon.id,
-    "addon2@tests.mozilla.org",
-    "Update item should be for the manually updating addon"
-  );
-
-  // The item in the list will be checking for update information asynchronously
-  // so we have to wait for it to complete. Doing the same async request should
-  // make our callback be called later.
-  await AddonManager.getAllInstalls();
-  run_next_test();
-});
-
-add_test(function() {
-  function checkReleaseNotesTelemetry() {
-    let snapshot = Services.telemetry.snapshotEvents(
-      Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
-      true
-    );
-    ok(
-      snapshot.parent && snapshot.parent.length > 0,
-      "Got parent telemetry events in the snapshot"
-    );
-
-    let releaseNotesEvents = snapshot.parent
-      .filter(
-        ([ts, category, method]) =>
-          category == "addonsManager" && method == "action"
-      )
-      .map(([ts, category, ...rest]) => rest);
-
-    Assert.deepEqual(
-      releaseNotesEvents,
-      [
-        [
-          "action",
-          "aboutAddons",
-          null,
-          {
-            action: "releaseNotes",
-            type: "extension",
-            addonId: "addon2@tests.mozilla.org",
-            view: "updates",
-          },
-        ],
-        [
-          "action",
-          "aboutAddons",
-          null,
-          {
-            action: "releaseNotes",
-            type: "extension",
-            addonId: "addon2@tests.mozilla.org",
-            view: "updates",
-          },
-        ],
-      ],
-      "The releaseNotes events are tracked"
-    );
-  }
-
-  var list = gManagerWindow.document.getElementById("updates-list");
-  var item = list.firstChild;
-  get_tooltip_info(item).then(({ version }) => {
-    is(version, "1.1", "Update item should have version number of the update");
-    var postfix = gManagerWindow.document.getAnonymousElementByAttribute(
-      item,
-      "class",
-      "update-postfix"
-    );
-    is_element_visible(postfix, "'Update' postfix should be visible");
-    is_element_visible(item._updateAvailable, "");
-    is_element_visible(
-      item._relNotesToggle,
-      "Release notes toggle should be visible"
-    );
-    is_element_hidden(item._warning, "Incompatible warning should be hidden");
-    is_element_hidden(item._error, "Blocklist error should be hidden");
-
-    info("Opening release notes");
-    item.addEventListener(
-      "RelNotesToggle",
-      function() {
-        info("Release notes now open");
-
-        is_element_hidden(
-          item._relNotesLoading,
-          "Release notes loading message should be hidden"
-        );
-        is_element_visible(
-          item._relNotesError,
-          "Release notes error message should be visible"
-        );
-        is(
-          item._relNotes.childElementCount,
-          0,
-          "Release notes should be empty"
-        );
-
-        info("Closing release notes");
-        item.addEventListener(
-          "RelNotesToggle",
-          function() {
-            info("Release notes now closed");
-            info("Setting Release notes URI to something that should load");
-            gProvider.installs[0].releaseNotesURI = Services.io.newURI(
-              TESTROOT + "releaseNotes.xhtml"
-            );
-
-            info("Re-opening release notes");
-            item.addEventListener(
-              "RelNotesToggle",
-              function() {
-                info("Release notes now open");
-
-                is_element_hidden(
-                  item._relNotesLoading,
-                  "Release notes loading message should be hidden"
-                );
-                is_element_hidden(
-                  item._relNotesError,
-                  "Release notes error message should be hidden"
-                );
-                isnot(
-                  item._relNotes.childElementCount,
-                  0,
-                  "Release notes should have been inserted into container"
-                );
-
-                checkReleaseNotesTelemetry();
-
-                run_next_test();
-              },
-              { once: true }
-            );
-            EventUtils.synthesizeMouseAtCenter(
-              item._relNotesToggle,
-              {},
-              gManagerWindow
-            );
-            is_element_visible(
-              item._relNotesLoading,
-              "Release notes loading message should be visible"
-            );
-          },
-          { once: true }
-        );
-        EventUtils.synthesizeMouseAtCenter(
-          item._relNotesToggle,
-          {},
-          gManagerWindow
-        );
-      },
-      { once: true }
-    );
-    EventUtils.synthesizeMouseAtCenter(
-      item._relNotesToggle,
-      {},
-      gManagerWindow
-    );
-    is_element_visible(
-      item._relNotesLoading,
-      "Release notes loading message should be visible"
-    );
-  });
-});
-
-add_test(function() {
-  var badgeUpdated = false;
-  var installCompleted = false;
-
-  gAvailableCategory.addEventListener(
-    "CategoryBadgeUpdated",
-    function() {
-      if (installCompleted) {
-        run_next_test();
-      } else {
-        badgeUpdated = true;
-      }
-    },
-    { once: true }
-  );
-
-  var list = gManagerWindow.document.getElementById("updates-list");
-  var item = list.firstChild;
-  var updateBtn = item._updateBtn;
-  is_element_visible(updateBtn, "Update button should be visible");
-
-  var install = gProvider.installs[0];
-  var listener = {
-    onInstallStarted() {
-      info("Install started");
-      is_element_visible(
-        item._installStatus,
-        "Install progress widget should be visible"
-      );
-    },
-    onInstallEnded(...args) {
-      install.removeTestListener(this);
-      info("Install ended");
-      is_element_hidden(
-        item._installStatus,
-        "Install progress widget should be hidden"
-      );
-
-      if (badgeUpdated) {
-        run_next_test();
-      } else {
-        installCompleted = true;
-      }
-    },
-  };
-  install.addTestListener(listener);
-  EventUtils.synthesizeMouseAtCenter(updateBtn, {}, gManagerWindow);
-});
-
-add_test(async function() {
-  is(
-    gCategoryUtilities.isVisible(gAvailableCategory),
-    true,
-    "Available Updates category should still be visible"
-  );
-  is(
-    gAvailableCategory.badgeCount,
-    0,
-    "Badge for Available Updates should now be 0"
-  );
-
-  await gCategoryUtilities.openType("extension");
-  is(
-    gCategoryUtilities.isVisible(gAvailableCategory),
-    false,
-    "Available Updates category should be hidden"
-  );
-
-  await close_manager(gManagerWindow);
-  let aWindow = await open_manager(null);
-  gManagerWindow = aWindow;
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-  gAvailableCategory = gManagerWindow.gCategories.get(
-    "addons://updates/available"
-  );
-
-  is(
-    gCategoryUtilities.isVisible(gAvailableCategory),
-    false,
-    "Available Updates category should be hidden"
-  );
-
-  run_next_test();
-});
-
-add_test(function() {
-  gAvailableCategory.addEventListener(
-    "CategoryBadgeUpdated",
-    async function() {
-      is(
-        gCategoryUtilities.isVisible(gAvailableCategory),
-        true,
-        "Available Updates category should now be visible"
-      );
-      is(
-        gAvailableCategory.badgeCount,
-        1,
-        "Badge for Available Updates should now be 1"
-      );
-
-      gAvailableCategory.addEventListener(
-        "CategoryBadgeUpdated",
-        function() {
-          is(
-            gCategoryUtilities.isVisible(gAvailableCategory),
-            false,
-            "Available Updates category should now be hidden"
-          );
-
-          run_next_test();
-        },
-        { once: true }
-      );
-
-      let aAddon = await AddonManager.getAddonByID("addon2@tests.mozilla.org");
-      aAddon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_ENABLE;
-    },
-    { once: true }
-  );
-
-  gProvider.createInstalls([
-    {
-      name: "manually updating addon (new and even more improved!)",
-      existingAddon: gProvider.addons[1],
-      version: "1.2",
-      releaseNotesURI: Services.io.newURI(TESTROOT + "thereIsNoFileHere.xhtml"),
-    },
-  ]);
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_plugin_enabled_state_locked.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests that state menu is displayed correctly (enabled or disabled) in the add-on manager
-// when the preference is unlocked / locked
-const gIsWindows = "@mozilla.org/windows-registry-key;1" in Cc;
-const gIsLinux =
-  "@mozilla.org/gnome-gconf-service;1" in Cc ||
-  "@mozilla.org/gio-service;1" in Cc;
-
-var gManagerWindow;
-var gCategoryUtilities;
-var gPluginElement;
-
-function getTestPluginPref() {
-  let prefix = "plugin.state.";
-  if (gIsWindows) {
-    return `${prefix}nptest`;
-  }
-  if (gIsLinux) {
-    return `${prefix}libnptest`;
-  }
-  return `${prefix}test`;
-}
-
-// This test is testing XUL about:addons UI (the HTML about:addons tests should verify
-// this in their own test files).
-SpecialPowers.pushPrefEnv({
-  set: [["extensions.htmlaboutaddons.enabled", false]],
-});
-
-registerCleanupFunction(() => {
-  Services.prefs.unlockPref(getTestPluginPref());
-  Services.prefs.clearUserPref(getTestPluginPref());
-});
-
-function getPlugins() {
-  return AddonManager.getAddonsByTypes(["plugin"]);
-}
-
-function getTestPlugin(aPlugins) {
-  let testPluginId;
-
-  for (let plugin of aPlugins) {
-    if (plugin.name == "Test Plug-in") {
-      testPluginId = plugin.id;
-      break;
-    }
-  }
-
-  Assert.ok(testPluginId, "Test Plug-in should exist");
-
-  let pluginElement = get_addon_element(gManagerWindow, testPluginId);
-  pluginElement.parentNode.ensureElementIsVisible(pluginElement);
-
-  return pluginElement;
-}
-
-function checkStateMenu(locked) {
-  Assert.equal(
-    Services.prefs.prefIsLocked(getTestPluginPref()),
-    locked,
-    "Preference lock state should be correct."
-  );
-  let menuList = gManagerWindow.document.getAnonymousElementByAttribute(
-    gPluginElement,
-    "anonid",
-    "state-menulist"
-  );
-  //  State menu should always have a selected item which must be visible
-  let selectedMenuItem = menuList.querySelector(
-    '.addon-control[selected="true"]'
-  );
-
-  is_element_visible(menuList, "State menu should be visible.");
-  Assert.equal(
-    menuList.disabled,
-    locked,
-    "State menu should" + (locked === true ? "" : " not") + " be disabled."
-  );
-
-  is_element_visible(
-    selectedMenuItem,
-    "State menu's selected item should be visible."
-  );
-}
-
-function checkStateMenuDetail(locked) {
-  Assert.equal(
-    Services.prefs.prefIsLocked(getTestPluginPref()),
-    locked,
-    "Preference should be " + (locked === true ? "" : "un") + "locked."
-  );
-
-  // open details menu
-  EventUtils.synthesizeMouseAtCenter(gPluginElement, {}, gManagerWindow);
-
-  return new Promise(async resolve => {
-    await wait_for_view_load(gManagerWindow);
-    let menuList = gManagerWindow.document.getElementById(
-      "detail-state-menulist"
-    );
-    is_element_visible(menuList, "Details state menu should be visible.");
-    Assert.equal(
-      menuList.disabled,
-      locked,
-      "Details state menu enabled state should be correct."
-    );
-    resolve();
-  });
-}
-
-add_task(async function initializeState() {
-  Services.prefs.setIntPref(getTestPluginPref(), Ci.nsIPluginTag.STATE_ENABLED);
-  Services.prefs.unlockPref(getTestPluginPref());
-  gManagerWindow = await open_manager();
-  gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-  await gCategoryUtilities.openType("plugin");
-
-  let plugins = await getPlugins();
-  gPluginElement = getTestPlugin(plugins);
-});
-
-// Tests that plugin state menu is enabled if the preference is unlocked
-add_task(async function taskCheckStateMenuIsEnabled() {
-  checkStateMenu(false);
-  await checkStateMenuDetail(false);
-});
-
-// Lock the preference and then reload the plugin category
-add_task(async function reinitializeState() {
-  // lock the preference
-  Services.prefs.lockPref(getTestPluginPref());
-  await gCategoryUtilities.openType("plugin");
-  // Retrieve the test plugin element
-  let plugins = await getPlugins();
-  gPluginElement = getTestPlugin(plugins);
-});
-
-// Tests that plugin state menu is disabled if the preference is locked
-add_task(async function taskCheckStateMenuIsDisabled() {
-  checkStateMenu(true);
-  await checkStateMenuDetail(true);
-});
-
-add_task(async function testCleanup() {
-  await close_manager(gManagerWindow);
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
@@ -6,17 +6,17 @@
 
 var gManagerWindow;
 
 async function getTestPluginAddon() {
   const plugins = await AddonManager.getAddonsByTypes(["plugin"]);
   return plugins.find(plugin => plugin.name === "Test Plug-in");
 }
 
-async function test_inline_plugin_prefs() {
+add_task(async function test_inline_plugin_prefs() {
   gManagerWindow = await open_manager("addons://list/plugin");
   let testPlugin = await getTestPluginAddon();
   ok(testPlugin, "Test Plug-in should exist");
 
   let pluginEl = get_addon_element(gManagerWindow, testPlugin.id);
   is(
     testPlugin.optionsType,
     AddonManager.OPTIONS_TYPE_INLINE_BROWSER,
@@ -30,36 +30,17 @@ async function test_inline_plugin_prefs(
     event => {
       let { target } = event;
       return (
         target.currentURI && target.currentURI.spec === testPlugin.optionsURL
       );
     }
   ).then(event => event.target);
 
-  if (gManagerWindow.useHtmlViews) {
-    pluginEl.querySelector("panel-item[action='preferences']").click();
-  } else {
-    pluginEl.parentNode.ensureElementIsVisible(pluginEl);
-
-    let button = gManagerWindow.document.getAnonymousElementByAttribute(
-      pluginEl,
-      "anonid",
-      "preferences-btn"
-    );
-    is_element_visible(button, "Preferences button should be visible");
-
-    EventUtils.synthesizeMouseAtCenter(
-      pluginEl,
-      { clickCount: 1 },
-      gManagerWindow
-    );
-
-    await TestUtils.topicObserved(AddonManager.OPTIONS_NOTIFICATION_DISPLAYED);
-  }
+  pluginEl.querySelector("panel-item[action='preferences']").click();
 
   info("Waiting for inline options page to be ready");
   let doc = (await optionsBrowserPromise).contentDocument;
 
   await BrowserTestUtils.waitForCondition(() => {
     // Wait until pluginPrefs.js has initialized the plugin pref view.
     return doc.getElementById("pluginLibraries").textContent;
   }, "Waiting for pluginPrefs to finish rendering");
@@ -77,25 +58,9 @@ async function test_inline_plugin_prefs(
   ok(pluginMimeTypes, "Plugin mime type row should be displayed");
   is(
     pluginMimeTypes.textContent,
     "application/x-test (Test \u2122 mimetype: tst)",
     "Plugin mime type should be displayed"
   );
 
   await close_manager(gManagerWindow);
-}
-
-add_task(async function test_inline_plugin_prefs_on_XUL_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", false]],
-  });
-  await test_inline_plugin_prefs();
-  await SpecialPowers.popPrefEnv();
 });
-
-add_task(async function test_inline_plugin_prefs_on_HTML_aboutaddons() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", true]],
-  });
-  await test_inline_plugin_prefs();
-  await SpecialPowers.popPrefEnv();
-});
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_pluginprefs_is_not_disabled.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests plugin prefs being enabled
-
-function getTestPlugin(aPlugins) {
-  let [testPlugin] = aPlugins.filter(plugin => plugin.name === "Test Plug-in");
-  Assert.ok(testPlugin, "Test Plug-in should exist");
-  return testPlugin;
-}
-
-add_task(async function taskCheckPluginPrefsEnabled() {
-  const [gManagerWindow, plugins] = await Promise.all([
-    open_manager(),
-    AddonManager.getAddonsByTypes(["plugin"]),
-  ]);
-  const testPlugin = getTestPlugin(plugins);
-  const testPluginTag = getTestPluginTag();
-  Assert.ok(testPluginTag, "Test Plug-in tag should exist");
-  const initialTestPluginState = testPluginTag.enabledState;
-
-  Assert.ok(
-    gManagerWindow.gViewController.commands.cmd_showItemPreferences.isEnabled(
-      testPlugin
-    ),
-    "Test Plug-in preferences should be enabled"
-  );
-  testPluginTag.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-  Assert.ok(
-    gManagerWindow.gViewController.commands.cmd_showItemPreferences.isEnabled(
-      testPlugin
-    ),
-    "Test Plug-in preferences should be enabled"
-  );
-
-  testPluginTag.enabledState = initialTestPluginState;
-  await close_manager(gManagerWindow);
-});
--- a/toolkit/mozapps/extensions/test/browser/browser_reinstall.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_reinstall.js
@@ -9,88 +9,36 @@ const { AddonTestUtils } = ChromeUtils.i
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
 const ID = "reinstall@tests.mozilla.org";
 const testIdSuffix = "@tests.mozilla.org";
 
 let gManagerWindow, xpi1, xpi2;
 
-function get_test_items_in_list(aManager) {
-  let item = aManager.document.getElementById("addon-list").firstChild;
-  let items = [];
-
-  while (item) {
-    if (item.localName != "richlistitem") {
-      item = item.nextSibling;
-      continue;
-    }
-
-    if (
-      !item.mAddon ||
-      item.mAddon.id.substring(item.mAddon.id.length - testIdSuffix.length) ==
-        testIdSuffix
-    ) {
-      items.push(item);
-    }
-    item = item.nextSibling;
-  }
-
-  return items;
-}
-
 function htmlDoc() {
   return gManagerWindow.document.getElementById("html-view-browser")
     .contentDocument;
 }
 
 function get_list_item_count() {
-  if (gManagerWindow.useHtmlViews) {
-    return htmlDoc().querySelectorAll(`addon-card[addon-id$="${testIdSuffix}"]`)
-      .length;
-  }
-  return get_test_items_in_list(gManagerWindow).length;
-}
-
-function get_node(parent, anonid) {
-  return parent.ownerDocument.getAnonymousElementByAttribute(
-    parent,
-    "anonid",
-    anonid
-  );
+  return htmlDoc().querySelectorAll(`addon-card[addon-id$="${testIdSuffix}"]`)
+    .length;
 }
 
 function removeItem(item) {
-  let button;
-  if (gManagerWindow.useHtmlViews) {
-    button = item.querySelector('[action="remove"]');
-    button.click();
-  } else {
-    button = get_node(item, "remove-btn");
-    EventUtils.synthesizeMouseAtCenter(button, {}, button.ownerGlobal);
-  }
-}
-
-function get_class_node(parent, cls) {
-  return parent.ownerDocument.getAnonymousElementByAttribute(
-    parent,
-    "class",
-    cls
-  );
+  let button = item.querySelector('[action="remove"]');
+  button.click();
 }
 
 function hasPendingMessage(item, msg) {
-  if (gManagerWindow.useHtmlViews) {
-    let messageBar = htmlDoc().querySelector(
-      `message-bar[addon-id="${item.addon.id}"`
-    );
-    is_element_visible(messageBar, msg);
-  } else {
-    is_element_visible(get_class_node(item, "pending"), msg);
-  }
+  let messageBar = htmlDoc().querySelector(
+    `message-bar[addon-id="${item.addon.id}"`
+  );
+  is_element_visible(messageBar, msg);
 }
 
 async function install_addon(xpi) {
   let install = await AddonManager.getInstallForFile(
     xpi,
     "application/x-xpinstall"
   );
   return install.install();
@@ -104,79 +52,57 @@ async function check_addon(aAddon, aVers
   ok(!!item, "Should see the add-on in the list");
 
   // Force XBL to apply
   item.clientTop;
 
   let { version } = await get_tooltip_info(item, gManagerWindow);
   is(version, aVersion, "Version should be correct");
 
-  if (gManagerWindow.useHtmlViews) {
-    const l10nAttrs = item.ownerDocument.l10n.getAttributes(
-      item.querySelector(".addon-name")
-    );
-    if (aAddon.userDisabled) {
-      Assert.deepEqual(
-        l10nAttrs,
-        { id: "addon-name-disabled", args: { name: aAddon.name } },
-        "localized addon name is marked as disabled"
-      );
-    } else {
-      Assert.deepEqual(
-        l10nAttrs,
-        { id: null, args: null },
-        "localized addon name is not marked as disabled"
-      );
-    }
-
-    return;
-  }
-
+  const l10nAttrs = item.ownerDocument.l10n.getAttributes(
+    item.querySelector(".addon-name")
+  );
   if (aAddon.userDisabled) {
-    is_element_visible(
-      get_class_node(item, "disabled-postfix"),
-      "Disabled postfix should be hidden"
+    Assert.deepEqual(
+      l10nAttrs,
+      { id: "addon-name-disabled", args: { name: aAddon.name } },
+      "localized addon name is marked as disabled"
     );
   } else {
-    is_element_hidden(
-      get_class_node(item, "disabled-postfix"),
-      "Disabled postfix should be hidden"
+    Assert.deepEqual(
+      l10nAttrs,
+      { id: null, args: null },
+      "localized addon name is not marked as disabled"
     );
   }
 }
 
 async function wait_for_addon_item_added(addonId) {
-  if (gManagerWindow.useHtmlViews) {
-    await BrowserTestUtils.waitForEvent(
-      htmlDoc().querySelector("addon-list"),
-      "add"
-    );
-    const item = get_addon_element(gManagerWindow, addonId);
-    ok(item, `Found addon card for ${addonId}`);
-  }
+  await BrowserTestUtils.waitForEvent(
+    htmlDoc().querySelector("addon-list"),
+    "add"
+  );
+  const item = get_addon_element(gManagerWindow, addonId);
+  ok(item, `Found addon card for ${addonId}`);
 }
 
 async function wait_for_addon_item_removed(addonId) {
-  if (gManagerWindow.useHtmlViews) {
-    await BrowserTestUtils.waitForEvent(
-      htmlDoc().querySelector("addon-list"),
-      "remove"
-    );
-    const item = get_addon_element(gManagerWindow, addonId);
-    ok(!item, `There shouldn't be an addon card for ${addonId}`);
-  }
+  await BrowserTestUtils.waitForEvent(
+    htmlDoc().querySelector("addon-list"),
+    "remove"
+  );
+  const item = get_addon_element(gManagerWindow, addonId);
+  ok(!item, `There shouldn't be an addon card for ${addonId}`);
 }
 
-async function wait_for_addon_item_updated(addonId) {
-  if (gManagerWindow.useHtmlViews) {
-    await BrowserTestUtils.waitForEvent(
-      get_addon_element(gManagerWindow, addonId),
-      "update"
-    );
-  }
+function wait_for_addon_item_updated(addonId) {
+  return BrowserTestUtils.waitForEvent(
+    get_addon_element(gManagerWindow, addonId),
+    "update"
+  );
 }
 
 // Install version 1 then upgrade to version 2 with the manager open
 async function test_upgrade_v1_to_v2() {
   let promiseItemAdded = wait_for_addon_item_added(ID);
   await install_addon(xpi1);
   await promiseItemAdded;
 
@@ -311,45 +237,16 @@ async function test_upgrade_pending_unin
 
   promiseItemRemoved = wait_for_addon_item_removed(ID);
   await addon.uninstall();
   await promiseItemRemoved;
 
   is(get_list_item_count(), 0, "Should be no items in the list");
 }
 
-async function test_upgrades(useHtmlViews) {
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.htmlaboutaddons.enabled", useHtmlViews]],
-  });
-
-  // Close existing about:addons tab if a test failure has
-  // prevented it from being closed.
-  if (gManagerWindow) {
-    await close_manager(gManagerWindow);
-  }
-
-  gManagerWindow = await open_manager("addons://list/extension");
-  is(
-    gManagerWindow.useHtmlViews,
-    useHtmlViews,
-    "Got about:addons window in the expected mode"
-  );
-
-  await test_upgrade_v1_to_v2();
-  await test_upgrade_disabled_v1_to_v2();
-  await test_upgrade_pending_uninstall_v1_to_v2();
-  await test_upgrade_pending_uninstall_disabled_v1_to_v2();
-