Backed out 2 changesets (bug 1799947) for causing browserAction bc, mochitest, devtools related failures. CLOSED TREE

Backed out changeset ff58300200c4 (bug 1799947) Backed out changeset 517df40ddcd4 (bug 1799947)
2022-11-15 22:38:24 +02:00
parent ad65680209
commit bfb43d0dc3
50 changed files with 47 additions and 193 deletions
--- a/browser/components/extensions/parent/ext-browserAction.js
+++ b/browser/components/extensions/parent/ext-browserAction.js
@@ -53,12 +53,9 @@ const POPUP_PRELOAD_TIMEOUT_MS = 200;
 const browserActionMap = new WeakMap();

 XPCOMUtils.defineLazyGetter(this, "browserAreas", () => {
-  let panelArea = gUnifiedExtensionsEnabled
-    ? CustomizableUI.AREA_ADDONS
-    : CustomizableUI.AREA_FIXED_OVERFLOW_PANEL;
  return {
    navbar: CustomizableUI.AREA_NAVBAR,
-    menupanel: panelArea,
+    menupanel: CustomizableUI.AREA_FIXED_OVERFLOW_PANEL,
    tabstrip: CustomizableUI.AREA_TABSTRIP,
    personaltoolbar: CustomizableUI.AREA_BOOKMARKS,
  };
--- a/browser/components/extensions/test/AppUiTestDelegate.jsm
+++ b/browser/components/extensions/test/AppUiTestDelegate.jsm
@@ -92,14 +92,7 @@ async function showBrowserAction(window, extensionId) {
      "Expect widget overflow state to match toolbar"
    );
  } else if (group.areaType == lazy.CustomizableUI.TYPE_PANEL) {
-    if (window.gUnifiedExtensions.isEnabled) {
-      let panel = window.gUnifiedExtensions.panel;
-      let shown = BrowserTestUtils.waitForPopupEvent(panel, "shown");
-      window.gUnifiedExtensions.togglePanel();
-      await shown;
-    } else {
-      await navbar.overflowable.show();
-    }
+    await navbar.overflowable.show();
  }
 }

--- a/browser/components/extensions/test/browser/browser_ext_activeScript.js
+++ b/browser/components/extensions/test/browser/browser_ext_activeScript.js
@@ -45,13 +45,9 @@ async function makeExtension({
  };

  if (manifest_version === 3) {
-    manifest.action = {
-      default_area: "navbar",
-    };
+    manifest.action = {};
  } else {
-    manifest.browser_action = {
-      default_area: "navbar",
-    };
+    manifest.browser_action = {};
  }

  let ext = ExtensionTestUtils.loadExtension({
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_activeTab.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_activeTab.js
@@ -11,9 +11,7 @@ add_task(async function test_middle_click_with_activeTab() {

  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      permissions: ["activeTab"],
    },

@@ -70,7 +68,6 @@ add_task(async function test_middle_click_with_activeTab_and_popup() {
      browser_action: {
        default_popup: "popup.html",
        browser_style: true,
-        default_area: "navbar",
      },
      permissions: ["activeTab"],
    },
@@ -161,9 +158,7 @@ add_task(async function test_middle_click_without_activeTab() {

  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },

    background() {
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_area.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_area.js
@@ -24,15 +24,9 @@ async function testInArea(area) {
  await extension.startup();
  let widget = getBrowserActionWidget(extension);
  let placement = CustomizableUI.getPlacementOfWidget(widget.id);
-  let fallbackDefaultArea = Services.prefs.getBoolPref(
-    "extensions.unifiedExtensions.enabled",
-    false
-  )
-    ? CustomizableUI.AREA_ADDONS
-    : CustomizableUI.AREA_NAVBAR;
  is(
    placement && placement.area,
-    browserAreas[area] || fallbackDefaultArea,
+    browserAreas[area || "navbar"],
    `widget located in correct area`
  );
  await extension.unload();
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_click_types.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_click_types.js
@@ -127,9 +127,7 @@ async function test_clickData_reset({ manifest_version }) {
  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
      manifest_version,
-      [action]: {
-        default_area: "navbar",
-      },
+      [action]: {},
      page_action: {},
      commands: {
        [browser_action_command]: {
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_context.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_context.js
@@ -412,7 +412,6 @@ add_task(async function testTabSwitchContext() {
        default_icon: "default.png",
        default_popup: "__MSG_popup__",
        default_title: "Default __MSG_title__",
-        default_area: "navbar",
      },

      default_locale: "en",
@@ -435,7 +434,6 @@ add_task(async function testTabSwitchActionContext() {
        default_icon: "default.png",
        default_popup: "__MSG_popup__",
        default_title: "Default __MSG_title__",
-        default_area: "navbar",
      },
      default_locale: "en",
      permissions: ["tabs"],
@@ -451,7 +449,6 @@ add_task(async function testDefaultTitle() {

      browser_action: {
        default_icon: "icon.png",
-        default_area: "navbar",
      },

      permissions: ["tabs"],
@@ -531,9 +528,7 @@ add_task(async function testBadgeColorPersistence() {
      });
    },
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },
  });
  await extension.startup();
@@ -585,7 +580,6 @@ add_task(async function testPropertyRemoval() {
        default_icon: "default.png",
        default_popup: "default.html",
        default_title: "Default Title",
-        default_area: "navbar",
      },
    },

@@ -772,7 +766,6 @@ add_task(async function testMultipleWindows() {
        default_icon: "default.png",
        default_popup: "default.html",
        default_title: "Default Title",
-        default_area: "navbar",
      },
    },

@@ -943,7 +936,6 @@ add_task(async function testDefaultBadgeTextColor() {
        default_icon: "default.png",
        default_popup: "default.html",
        default_title: "Default Title",
-        default_area: "navbar",
      },
    },

--- a/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
@@ -24,7 +24,6 @@ let extData = {
    permissions: ["contextMenus"],
    browser_action: {
      default_popup: "popup.html",
-      default_area: "navbar",
    },
  },
  useAddonManager: "temporary",
@@ -204,9 +203,7 @@ async function browseraction_contextmenu_manage_extension_helper(win) {
      browser_specific_settings: {
        gecko: { id },
      },
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      options_ui: {
        page: "options.html",
      },
@@ -530,9 +527,7 @@ async function browseraction_contextmenu_remove_extension_helper(win) {
      browser_specific_settings: {
        gecko: { id },
      },
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },
    useAddonManager: "temporary",
  });
@@ -729,9 +724,7 @@ async function browseraction_contextmenu_report_extension_helper(win) {
      browser_specific_settings: {
        gecko: { id },
      },
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },
    useAddonManager: "temporary",
  });
@@ -909,9 +902,7 @@ add_task(async function test_unified_extensions_toolbar_pinning() {
      browser_specific_settings: {
        gecko: { id },
      },
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },
    useAddonManager: "temporary",
  });
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_disabled.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_disabled.js
@@ -5,9 +5,7 @@
 add_task(async function testDisabled() {
  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },

    background: function() {
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_experiment.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_experiment.js
@@ -134,9 +134,7 @@ add_task(async function test_browseraction_with_experiment() {
    isPrivileged: true,

    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},

      experiment_apis: fooExperimentAPIs,
    },
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_keyclick.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_keyclick.js
@@ -26,9 +26,7 @@ async function focusButtonAndPressKeyWithDelay(key, elem, modifiers) {
 add_task(async function testKeyBrowserAction() {
  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },

    async background() {
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js
@@ -518,9 +518,7 @@ add_task(async function testDetailsObjects() {

  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      page_action: {},
      background: {
        page: "data/background.html",
@@ -649,7 +647,6 @@ add_task(async function testPageActionIconLoadingOnBrowserActionThemedIcon() {
        default_icon: "common_cached_icon.png",
        default_popup: "default_popup.html",
        default_title: "BrowserAction title",
-        default_area: "navbar",
        theme_icons: [
          {
            dark: "1.png",
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon_permissions.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon_permissions.js
@@ -8,9 +8,7 @@ PromiseTestUtils.allowMatchingRejectionsGlobally(/packaging errors/);
 add_task(async function testInvalidIconSizes() {
  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      page_action: {},
    },

@@ -93,7 +91,7 @@ add_task(async function testDefaultDetails() {
  for (let icon of icons) {
    let extension = ExtensionTestUtils.loadExtension({
      manifest: {
-        browser_action: { default_icon: icon, default_area: "navbar" },
+        browser_action: { default_icon: icon },
        page_action: { default_icon: icon },
      },

@@ -153,7 +151,7 @@ add_task(async function testSecureURLsDenied() {

  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: { default_area: "navbar" },
+      browser_action: {},
      page_action: {},
    },

@@ -221,7 +219,6 @@ add_task(async function testSecureManifestURLsDenied() {
        manifest: {
          [api]: {
            default_icon: url,
-            default_area: "navbar",
          },
        },
      });
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_port.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_port.js
@@ -12,7 +12,6 @@ add_task(async function test_browserActionPort() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
    },
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
@@ -23,7 +23,6 @@ add_task(async function testBrowserActionClickCanceled() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
      permissions: ["activeTab"],
@@ -159,7 +158,6 @@ add_task(async function testBrowserActionDisabled() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
    },
@@ -267,7 +265,6 @@ add_task(async function testBrowserActionTabPopulation() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
      permissions: ["activeTab"],
@@ -327,7 +324,6 @@ add_task(async function testClosePopupDuringPreload() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
    },
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload_smoketest.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload_smoketest.js
@@ -18,7 +18,6 @@ async function installTestAddon(addonId, unpacked = false) {
      browser_specific_settings: { gecko: { id: addonId } },
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
    },
    files: {
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
@@ -9,7 +9,6 @@ add_task(async function testBrowserActionPopupResize() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
    },
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_simple.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_simple.js
@@ -9,7 +9,6 @@ async function testAction(manifest_version) {
      manifest_version,
      [action]: {
        default_popup: "popup.html",
-        default_area: "navbar",
        unrecognized_property: "with-a-random-value",
      },
      icons: { 32: "icon.png" },
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_telemetry.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_telemetry.js
@@ -48,7 +48,6 @@ add_task(async function testBrowserActionTelemetryTiming() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
    },
@@ -214,7 +213,6 @@ add_task(async function testBrowserActionTelemetryResults() {
      },
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: true,
      },
    },
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_theme_icons.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_theme_icons.js
@@ -65,22 +65,13 @@ async function testStaticTheme(options) {
  // Ensure we show the menupanel at least once. This makes sure that the
  // elements we're going to query the style of are in the flat tree.
  if (defaultArea == "menupanel") {
-    if (window.gUnifiedExtensions.isEnabled) {
-      let shown = BrowserTestUtils.waitForPopupEvent(
-        window.gUnifiedExtensions.panel,
-        "shown"
-      );
-      window.gUnifiedExtensions.togglePanel();
-      await shown;
-    } else {
-      let overflowButton = document.getElementById("nav-bar-overflow-button");
-      await waitForElementShown(overflowButton.icon);
-      info("Open overflow menu");
-      let menu = document.getElementById("widget-overflow");
-      let shown = BrowserTestUtils.waitForEvent(menu, "popupshown");
-      overflowButton.click();
-      await shown;
-    }
+    let overflowButton = document.getElementById("nav-bar-overflow-button");
+    await waitForElementShown(overflowButton.icon);
+    info("Open overflow menu");
+    let menu = document.getElementById("widget-overflow");
+    let shown = BrowserTestUtils.waitForEvent(menu, "popupshown");
+    overflowButton.click();
+    await shown;
  }

  // Confirm that the browser action has the correct default icon before a theme is loaded.
@@ -344,7 +335,6 @@ add_task(async function browseraction_theme_icons_dynamic_theme() {
    manifest: {
      browser_action: {
        default_icon: "default.png",
-        default_area: "navbar",
        theme_icons: [
          {
            light: "light.png",
--- a/browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js
+++ b/browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js
@@ -99,7 +99,6 @@ add_task(async function connect_from_browser_action_popup() {
      ],
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
    },
    files: {
--- a/browser/components/extensions/test/browser/browser_ext_currentWindow.js
+++ b/browser/components/extensions/test/browser/browser_ext_currentWindow.js
@@ -74,7 +74,6 @@ add_task(async function() {

      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
    },

--- a/browser/components/extensions/test/browser/browser_ext_getViews.js
+++ b/browser/components/extensions/test/browser/browser_ext_getViews.js
@@ -127,7 +127,6 @@ add_task(async function() {

      browser_action: {
        default_popup: "page.html?popup",
-        default_area: "navbar",
      },

      sidebar_action: {
@@ -303,7 +302,6 @@ add_task(async function test_getViews_excludes_blocked_parsing_documents() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
    },
    files: {
--- a/browser/components/extensions/test/browser/browser_ext_incognito_popup.js
+++ b/browser/components/extensions/test/browser/browser_ext_incognito_popup.js
@@ -9,7 +9,6 @@ add_task(async function testIncognitoPopup() {
      permissions: ["tabs"],
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
      page_action: {
        default_popup: "popup.html",
--- a/browser/components/extensions/test/browser/browser_ext_incognito_views.js
+++ b/browser/components/extensions/test/browser/browser_ext_incognito_views.js
@@ -16,7 +16,6 @@ add_task(async function testIncognitoViews() {
      permissions: ["tabs"],
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
    },

--- a/browser/components/extensions/test/browser/browser_ext_management.js
+++ b/browser/components/extensions/test/browser/browser_ext_management.js
@@ -21,7 +21,6 @@ add_task(async function test_management_install() {
    manifest: {
      browser_action: {
        browser_style: false,
-        default_area: "navbar",
      },
      permissions: ["management"],
    },
--- a/browser/components/extensions/test/browser/browser_ext_menus.js
+++ b/browser/components/extensions/test/browser/browser_ext_menus.js
@@ -65,9 +65,7 @@ add_task(async function test_permissions() {
 add_task(async function test_actionContextMenus() {
  const manifest = {
    page_action: {},
-    browser_action: {
-      default_area: "navbar",
-    },
+    browser_action: {},
    permissions: ["menus"],
  };

--- a/browser/components/extensions/test/browser/browser_ext_menus_eventpage.js
+++ b/browser/components/extensions/test/browser/browser_ext_menus_eventpage.js
@@ -10,9 +10,7 @@ function getExtension(background, useAddonManager) {
  return ExtensionTestUtils.loadExtension({
    useAddonManager,
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      permissions: ["menus"],
      background: { persistent: false },
    },
@@ -171,7 +169,6 @@ add_task(async function test_actions_context_menu() {
      browser_action: {
        default_title: "Test BrowserAction",
        default_popup: "test.html",
-        default_area: "navbar",
        browser_style: true,
      },
      background: { persistent: false },
--- a/browser/components/extensions/test/browser/browser_ext_menus_events.js
+++ b/browser/components/extensions/test/browser/browser_ext_menus_events.js
@@ -153,7 +153,6 @@ async function testShowHideEvent({
      page_action: {},
      [action]: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
      permissions: ["menus"],
      optional_permissions: [PAGE_HOST_PATTERN],
--- a/browser/components/extensions/test/browser/browser_ext_menus_refresh.js
+++ b/browser/components/extensions/test/browser/browser_ext_menus_refresh.js
@@ -40,9 +40,7 @@ function loadExtensionWithMenusApi() {
  let extension = ExtensionTestUtils.loadExtension({
    background,
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      permissions: ["menus"],
    },
  });
--- a/browser/components/extensions/test/browser/browser_ext_menus_targetElement_extension.js
+++ b/browser/components/extensions/test/browser/browser_ext_menus_targetElement_extension.js
@@ -130,7 +130,6 @@ add_task(async function getTargetElement_in_browserAction_popup() {
      permissions: ["menus"],
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
    },
    files: {
--- a/browser/components/extensions/test/browser/browser_ext_mousewheel_zoom.js
+++ b/browser/components/extensions/test/browser/browser_ext_mousewheel_zoom.js
@@ -75,7 +75,6 @@ async function test_mousewheel_zoom(test) {
    manifest = {
      browser_action: {
        default_popup: "panel.html",
-        default_area: "navbar",
      },
    };
  } else if (test == TESTS.PAGE_ACTION) {
--- a/browser/components/extensions/test/browser/browser_ext_nontab_process_switch.js
+++ b/browser/components/extensions/test/browser/browser_ext_nontab_process_switch.js
@@ -20,7 +20,6 @@ add_task(async function process_switch_in_sidebars_popups() {
      },
      browser_action: {
        default_popup: "page.html?popup",
-        default_area: "navbar",
      },
      web_accessible_resources: ["page.html"],
    },
@@ -91,7 +90,6 @@ add_task(
      manifest: {
        browser_action: {
          default_popup: "popup-1.html",
-          default_area: "navbar",
        },
      },
      files: {
--- a/browser/components/extensions/test/browser/browser_ext_pageAction_click_types.js
+++ b/browser/components/extensions/test/browser/browser_ext_pageAction_click_types.js
@@ -134,9 +134,7 @@ async function test_clickData(testAsNonPersistent = false) {
 async function test_clickData_reset(testAsNonPersistent = false) {
  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      page_action: {},
      background: {
        persistent: !testAsNonPersistent,
--- a/browser/components/extensions/test/browser/browser_ext_popup_api_injection.js
+++ b/browser/components/extensions/test/browser/browser_ext_popup_api_injection.js
@@ -10,7 +10,6 @@ add_task(async function testPageActionPopup() {
    manifest: {
      browser_action: {
        default_popup: `${BASE}/file_popup_api_injection_a.html`,
-        default_area: "navbar",
      },
      page_action: {
        default_popup: `${BASE}/file_popup_api_injection_b.html`,
--- a/browser/components/extensions/test/browser/browser_ext_popup_background.js
+++ b/browser/components/extensions/test/browser/browser_ext_popup_background.js
@@ -108,7 +108,6 @@ add_task(async function testPopupBackground() {
      manifest: {
        browser_action: {
          default_popup: "popup.html",
-          default_area: "navbar",
          browser_style,
        },

--- a/browser/components/extensions/test/browser/browser_ext_popup_corners.js
+++ b/browser/components/extensions/test/browser/browser_ext_popup_corners.js
@@ -27,7 +27,6 @@ add_task(async function testPopupBorderRadius() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: false,
      },

--- a/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
+++ b/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
@@ -142,10 +142,7 @@ add_task(async function test_new_tab_ignore_settings() {
  let extension = ExtensionTestUtils.loadExtension({
    manifest: {
      browser_specific_settings: { gecko: { id: extensionId } },
-      browser_action: {
-        default_popup: "ignore.html",
-        default_area: "navbar",
-      },
+      browser_action: { default_popup: "ignore.html" },
      chrome_url_overrides: { newtab: "ignore.html" },
    },
    files: { "ignore.html": '<h1 id="extension-new-tab">New Tab!</h1>' },
--- a/browser/components/extensions/test/browser/browser_ext_user_events.js
+++ b/browser/components/extensions/test/browser/browser_ext_user_events.js
@@ -122,10 +122,7 @@ add_task(async function testSources() {
    },

    manifest: {
-      browser_action: {
-        default_title: "test",
-        default_area: "navbar",
-      },
+      browser_action: { default_title: "test" },
      page_action: { default_title: "test" },
      permissions: ["contextMenus"],
      optional_permissions: [
--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_subframe_window_open.js
+++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_subframe_window_open.js
@@ -118,7 +118,6 @@ add_task(async function test_window_open_close_from_browserAction_popup() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
      permissions: ["webNavigation", "tabs", "<all_urls>"],
    },
--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js
+++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_onCreatedNavigationTarget_window_open.js
@@ -118,7 +118,6 @@ add_task(async function test_window_open_close_from_browserAction_popup() {
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
      },
      permissions: ["webNavigation", "tabs", "<all_urls>"],
    },
--- a/browser/components/extensions/test/browser/browser_ext_windows.js
+++ b/browser/components/extensions/test/browser/browser_ext_windows.js
@@ -307,9 +307,7 @@ add_task(async function testWindowTitlePermissions() {
    },
    manifest: {
      permissions: ["activeTab"],
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    },
  });

--- a/browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js
+++ b/browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js
@@ -590,9 +590,7 @@ add_task(async function test_context_menu_without_browserActionFor_global() {
 add_task(async function test_browser_action_context_menu() {
  const extWithMenuBrowserAction = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      permissions: ["contextMenus"],
    },
    background() {
@@ -609,9 +607,7 @@ add_task(async function test_browser_action_context_menu() {
  });
  const extWithSubMenuBrowserAction = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      permissions: ["contextMenus"],
    },
    background() {
@@ -657,9 +653,7 @@ add_task(async function test_browser_action_context_menu() {
  });
  const extWithoutMenu2 = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      name: "extension with a browser action but no menu",
    },
    useAddonManager: "temporary",
--- a/browser/components/extensions/test/browser/browser_unified_extensions_overflowable_toolbar.js
+++ b/browser/components/extensions/test/browser/browser_unified_extensions_overflowable_toolbar.js
@@ -111,9 +111,7 @@ async function withWindowOverflowed(win, taskFn) {
      browser_specific_settings: {
        gecko: { id: "unified-extensions-overflowable-toolbar@ext-0" },
      },
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      // We pass `activeTab` to have a different permission message when
      // hovering the primary/action button.
      permissions: ["activeTab", "contextMenus"],
@@ -137,9 +135,7 @@ async function withWindowOverflowed(win, taskFn) {
      browser_specific_settings: {
        gecko: { id: "unified-extensions-overflowable-toolbar@ext-1" },
      },
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      permissions: ["contextMenus"],
    },
    background() {
@@ -165,9 +161,7 @@ async function withWindowOverflowed(win, taskFn) {
  for (let i = 2; i < NUM_EXTENSIONS; ++i) {
    manifests.push({
      name: `Extension #${i}`,
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
    });
  }

--- a/browser/components/extensions/test/browser/head.js
+++ b/browser/components/extensions/test/browser/head.js
@@ -329,10 +329,8 @@ var awaitExtensionPanel = function(extension, win = window, awaitLoad = true) {
  return AppUiTestDelegate.awaitExtensionPanel(win, extension.id, awaitLoad);
 };

-function getCustomizableUIPanelID(win = window) {
-  return win.gUnifiedExtensions.isEnabled
-    ? CustomizableUI.AREA_ADDONS
-    : CustomizableUI.AREA_FIXED_OVERFLOW_PANEL;
+function getCustomizableUIPanelID() {
+  return CustomizableUI.AREA_FIXED_OVERFLOW_PANEL;
 }

 function getBrowserActionWidget(extension) {
@@ -345,9 +343,7 @@ function getBrowserActionPopup(extension, win = window) {
  if (group.areaType == CustomizableUI.TYPE_TOOLBAR) {
    return win.document.getElementById("customizationui-widget-panel");
  }
-  return win.gUnifiedExtensions.isEnabled
-    ? win.gUnifiedExtensions.panel
-    : win.PanelUI.overflowPanel;
+  return win.PanelUI.overflowPanel;
 }

 var showBrowserAction = function(extension, win = window) {
@@ -374,9 +370,7 @@ async function triggerBrowserActionWithKeyboard(
    await focusButtonAndPressKey(key, node, modifiers);
  } else if (group.areaType == CustomizableUI.TYPE_PANEL) {
    // Use key navigation so that the PanelMultiView doesn't ignore key events
-    let panel = win.gUnifiedExtensions.isEnabled
-      ? win.gUnifiedExtensions.panel
-      : win.document.getElementById("widget-overflow");
+    let panel = win.document.getElementById("widget-overflow");
    while (win.document.activeElement != node) {
      EventUtils.synthesizeKey("KEY_ArrowDown");
      ok(
--- a/browser/components/extensions/test/browser/head_browserAction.js
+++ b/browser/components/extensions/test/browser/head_browserAction.js
@@ -46,7 +46,6 @@ async function testPopupSize(
    manifest: {
      browser_action: {
        default_popup: "popup.html",
-        default_area: "navbar",
        browser_style: false,
      },
    },
@@ -140,9 +139,7 @@ async function testPopupSize(
  let widget = getBrowserActionWidget(extension);
  CustomizableUI.addWidgetToArea(widget.id, getCustomizableUIPanelID());

-  let panel = browserWin.gUnifiedExtensions.isEnabled
-    ? browserWin.gUnifiedExtensions.panel
-    : browserWin.PanelUI.overflowPanel;
+  let panel = browserWin.PanelUI.overflowPanel;
  panel.setAttribute("animate", "false");

  let panelMultiView = panel.firstElementChild;
--- a/browser/modules/test/browser/browser_UsageTelemetry_interaction.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_interaction.js
@@ -326,7 +326,6 @@ add_task(async function webextension() {
        browser_action: {
          default_icon: "default.png",
          default_title: "Hello",
-          default_area: "navbar",
        },
        page_action: {
          default_icon: "default.png",
@@ -417,7 +416,6 @@ add_task(async function webextension() {
        browser_action: {
          default_icon: "default.png",
          default_title: "Hello",
-          default_area: "navbar",
        },
        page_action: {
          default_icon: "default.png",
--- a/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js
@@ -415,7 +415,6 @@ add_task(async function extensions() {
        browser_action: {
          default_icon: "default.png",
          default_title: "Hello",
-          default_area: "navbar",
        },
        page_action: {
          default_icon: "default.png",
--- a/toolkit/components/extensions/ExtensionActions.jsm
+++ b/toolkit/components/extensions/ExtensionActions.jsm
@@ -29,13 +29,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
  false
 );

-XPCOMUtils.defineLazyPreferenceGetter(
-  lazy,
-  "gUnifiedExtensionsEnabled",
-  "extensions.unifiedExtensions.enabled",
-  false
-);
-
 function parseColor(color, kind) {
  if (typeof color == "string") {
    let rgba = InspectorUtils.colorToRGBA(color);
@@ -517,16 +510,13 @@ class BrowserActionBase extends PanelActionBase {
      extension.manifest.browser_action || extension.manifest.action;
    super(options, tabContext, extension);

-    let fallbackArea = lazy.gUnifiedExtensionsEnabled ? "menupanel" : "navbar";
-    let default_area = options.default_area || fallbackArea;
-
    this.defaults = {
      ...this.defaults,
      badgeText: "",
      badgeBackgroundColor: [0xd9, 0, 0, 255],
      badgeDefaultColor: [255, 255, 255, 255],
      badgeTextColor: null,
-      default_area,
+      default_area: options.default_area || "navbar",
    };
    this.globals = Object.create(this.defaults);
  }
--- a/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js
@@ -683,9 +683,7 @@ add_task(async function test_abusereport_from_browserAction_remove() {
  const xpiFile = AddonTestUtils.createTempWebExtensionFile({
    manifest: {
      ...BASE_TEST_MANIFEST,
-      browser_action: {
-        default_area: "navbar",
-      },
+      browser_action: {},
      browser_specific_settings: { gecko: { id: EXT_ID } },
    },
  });