Backed out changeset 53ce60b1b515 (bug 1797050) for causing bc failures in browser/components/preferences/tests/browser_extension_controlled.js CLOSED TREE

2022-10-26 15:01:23 +03:00 · 2022-10-26 15:01:23 +03:00 · cb84cda02c
--- a/browser/base/content/test/contextMenu/browser_contextmenu_save_blocked.js
+++ b/browser/base/content/test/contextMenu/browser_contextmenu_save_blocked.js
@ -22,7 +22,7 @@ function mockPromptService() {
 add_task(async function test_save_link_blocked_by_extension() {
  let ext = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_specific_settings: { gecko: { id: "cancel@test" } },
+      applications: { gecko: { id: "cancel@test" } },
      name: "Cancel Test",
      permissions: ["webRequest", "webRequestBlocking", "<all_urls>"],
    },
--- a/browser/base/content/test/webextensions/browser_extension_sideloading.js
+++ b/browser/base/content/test/webextensions/browser_extension_sideloading.js
@ -17,7 +17,7 @@ const kSideloaded = true;
 async function createWebExtension(details) {
  let options = {
    manifest: {
-      browser_specific_settings: { gecko: { id: details.id } },
+      applications: { gecko: { id: details.id } },

      name: details.name,

--- a/browser/components/colorways/tests/browser/head.js
+++ b/browser/components/colorways/tests/browser/head.js
@ -73,7 +73,7 @@ function installTestTheme(id) {
    manifest: {
      name,
      description,
-      browser_specific_settings: { gecko: { id } },
+      applications: { gecko: { id } },
      theme:
        id === MOCK_DARK_THEME_ID
          ? { properties: { color_scheme: "dark" } }
--- a/browser/components/firefoxview/tests/browser/browser_colorways_card.js
+++ b/browser/components/firefoxview/tests/browser/browser_colorways_card.js
@ -63,7 +63,7 @@ async function createTempTheme(id) {
  const xpi = AddonTestUtils.createTempWebExtensionFile({
    manifest: {
      name: "Monochromatic Theme",
-      browser_specific_settings: { gecko: { id } },
+      applications: { gecko: { id } },
      theme: {},
    },
  });
--- a/browser/components/newtab/test/browser/browser_asrouter_targeting.js
+++ b/browser/components/newtab/test/browser/browser_asrouter_targeting.js
@ -407,7 +407,7 @@ add_task(async function checkAddonsInfo() {

  const xpi = AddonTestUtils.createTempWebExtensionFile({
    manifest: {
-      browser_specific_settings: { gecko: { id: FAKE_ID } },
+      applications: { gecko: { id: FAKE_ID } },
      name: FAKE_NAME,
      version: FAKE_VERSION,
    },
--- a/browser/components/preferences/tests/browser_browser_languages_subdialog.js
+++ b/browser/components/preferences/tests/browser_browser_languages_subdialog.js
@ -29,10 +29,10 @@ function getManifestData(locale, version = "2.0") {
        version: "1",
      },
    },
-    browser_specific_settings: {
+    applications: {
      gecko: {
-        id: langpackId(locale),
        strict_min_version: AppConstants.MOZ_APP_VERSION,
+        id: langpackId(locale),
        strict_max_version: AppConstants.MOZ_APP_VERSION,
      },
    },
--- a/browser/components/preferences/tests/browser_extension_controlled.js
+++ b/browser/components/preferences/tests/browser_extension_controlled.js
@ -153,7 +153,7 @@ add_task(async function testExtensionControlledHomepage() {
    manifest: {
      version: "1.0",
      name: "set_homepage",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: ADDON_ID,
        },
@ -237,7 +237,7 @@ add_task(async function testExtensionControlledHomepage() {
    manifest: {
      version: "1.0",
      name: "second_set_homepage",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: SECOND_ADDON_ID,
        },
@ -411,7 +411,7 @@ add_task(async function testPrefLockedHomepage() {
    manifest: {
      version: "1.0",
      name: "set_homepage",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: ADDON_ID,
        },
@ -625,7 +625,7 @@ add_task(async function testExtensionControlledNewTab() {
    manifest: {
      version: "1.0",
      name: "set_newtab",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: ADDON_ID,
        },
@ -699,7 +699,7 @@ add_task(async function testExtensionControlledNewTab() {
    manifest: {
      version: "1.0",
      name: "second_set_newtab",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: SECOND_ADDON_ID,
        },
@ -787,7 +787,7 @@ add_task(async function testExtensionControlledWebNotificationsPermission() {
    name: "TestExtension",
    version: "1.0",
    description: "Testing WebNotificationsDisable",
-    browser_specific_settings: { gecko: { id: "@web_notifications_disable" } },
+    applications: { gecko: { id: "@web_notifications_disable" } },
    permissions: ["browserSettings"],
    browser_action: {
      default_title: "Testing",
@ -1021,7 +1021,7 @@ add_task(async function testExtensionControlledTrackingProtection() {
    useAddonManager: "permanent",
    manifest: {
      name: "set_tp",
-      browser_specific_settings: { gecko: { id: EXTENSION_ID } },
+      applications: { gecko: { id: EXTENSION_ID } },
      permissions: ["privacy"],
    },
    background,
@ -1063,7 +1063,7 @@ add_task(async function testExtensionControlledPasswordManager() {
    name: "testPasswordManagerExtension",
    version: "1.0",
    description: "Testing rememberSignons",
-    browser_specific_settings: { gecko: { id: EXTENSION_ID } },
+    applications: { gecko: { id: EXTENSION_ID } },
    permissions: ["privacy"],
    browser_action: {
      default_title: "Testing rememberSignons",
@ -1342,7 +1342,7 @@ add_task(async function testExtensionControlledProxyConfig() {
    useAddonManager: "permanent",
    manifest: {
      name: "set_proxy",
-      browser_specific_settings: { gecko: { id: EXTENSION_ID } },
+      applications: { gecko: { id: EXTENSION_ID } },
      permissions: ["proxy"],
    },
    background,
--- a/browser/components/protections/test/browser/browser_protections_proxy.js
+++ b/browser/components/protections/test/browser/browser_protections_proxy.js
@ -72,7 +72,7 @@ add_task(async function() {
  const id = "secure-proxy@mozilla.com";
  const extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_specific_settings: { gecko: { id } },
+      applications: { gecko: { id } },
      name: "Firefox Proxy",
    },
    useAddonManager: "temporary",
--- a/browser/modules/test/browser/browser_UsageTelemetry_interaction.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_interaction.js
@ -320,7 +320,7 @@ add_task(async function webextension() {
    const extension = ExtensionTestUtils.loadExtension({
      manifest: {
        version: "1",
-        browser_specific_settings: {
+        applications: {
          gecko: { id: "random_addon@example.com" },
        },
        browser_action: {
@ -410,7 +410,7 @@ add_task(async function webextension() {
    const extension2 = ExtensionTestUtils.loadExtension({
      manifest: {
        version: "1",
-        browser_specific_settings: {
+        applications: {
          gecko: { id: "random_addon2@example.com" },
        },
        browser_action: {
--- a/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js
@ -409,7 +409,7 @@ add_task(async function extensions() {
      useAddonManager: "temporary",
      manifest: {
        version: "1",
-        browser_specific_settings: {
+        applications: {
          gecko: { id: "random_addon@example.com" },
        },
        browser_action: {
--- a/services/sync/tests/unit/test_addons_engine.js
+++ b/services/sync/tests/unit/test_addons_engine.js
@ -36,7 +36,7 @@ const XPI = AddonTestUtils.createTempWebExtensionFile({
  manifest: {
    name: "Test 1",
    description: "Test Description",
-    browser_specific_settings: { gecko: { id: ADDON_ID } },
+    applications: { gecko: { id: ADDON_ID } },
  },
 });

--- a/services/sync/tests/unit/test_addons_reconciler.js
+++ b/services/sync/tests/unit/test_addons_reconciler.js
@ -27,7 +27,7 @@ const XPI = AddonTestUtils.createTempWebExtensionFile({
  manifest: {
    name: "Test 1",
    description: "Test Description",
-    browser_specific_settings: { gecko: { id: ADDON_ID } },
+    applications: { gecko: { id: ADDON_ID } },
  },
 });

--- a/services/sync/tests/unit/test_addons_store.js
+++ b/services/sync/tests/unit/test_addons_store.js
@ -51,7 +51,7 @@ add_task(async function setupSystemAddon() {

  let xpi = await AddonTestUtils.createTempWebExtensionFile({
    manifest: {
-      browser_specific_settings: { gecko: { id: SYSTEM_ADDON_ID } },
+      applications: { gecko: { id: SYSTEM_ADDON_ID } },
    },
  });

@ -68,7 +68,7 @@ const ID3 = "addon3@tests.mozilla.org";
 const ADDONS = {
  test_addon1: {
    manifest: {
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: ID1,
          update_url: "http://example.com/data/test_install.json",
@ -79,13 +79,13 @@ const ADDONS = {

  test_addon2: {
    manifest: {
-      browser_specific_settings: { gecko: { id: ID2 } },
+      applications: { gecko: { id: ID2 } },
    },
  },

  test_addon3: {
    manifest: {
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: ID3,
          strict_max_version: "0",
--- a/services/sync/tests/unit/test_addons_tracker.js
+++ b/services/sync/tests/unit/test_addons_tracker.js
@ -31,7 +31,7 @@ const addon1ID = "addon1@tests.mozilla.org";
 const ADDONS = {
  test_addon1: {
    manifest: {
-      browser_specific_settings: { gecko: { id: addon1ID } },
+      applications: { gecko: { id: addon1ID } },
    },
  },
 };
--- a/toolkit/components/aboutprocesses/tests/browser/head.js
+++ b/toolkit/components/aboutprocesses/tests/browser/head.js
@ -421,9 +421,7 @@ async function testAboutProcessesWithConfig({ showAllFrames, showThreads }) {
  // extension process.
  const extension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_specific_settings: {
-        gecko: { id: "test-aboutprocesses@mochi.test" },
-      },
+      applications: { gecko: { id: "test-aboutprocesses@mochi.test" } },
    },
    background() {
      // Creates an about:blank iframe in the extension process to make sure that
--- a/toolkit/components/normandy/test/browser/head.js
+++ b/toolkit/components/normandy/test/browser/head.js
@ -75,7 +75,7 @@ this.withWebExtension = function(
          name: "normandy_fixture",
          version: "1.0",
          description: "Dummy test fixture that's a webextension",
-          browser_specific_settings: {
+          applications: {
            gecko: { id: addonId },
          },
        },
--- a/toolkit/components/normandy/test/unit/test_addon_unenroll.js
+++ b/toolkit/components/normandy/test/unit/test_addon_unenroll.js
@ -58,7 +58,7 @@ decorate_task(
      manifest: {
        version: "1.0",

-        browser_specific_settings: {
+        applications: {
          gecko: { id: ID },
        },

@ -227,7 +227,7 @@ decorate_task(
      manifest: {
        version: "1.0",

-        browser_specific_settings: {
+        applications: {
          gecko: { id: ID },
        },
      },
--- a/toolkit/components/search/tests/SearchTestUtils.sys.mjs
+++ b/toolkit/components/search/tests/SearchTestUtils.sys.mjs
@ -305,7 +305,7 @@ export var SearchTestUtils = {
    options.version = options.version ?? "1.0";
    let manifest = {
      version: options.version,
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: options.id,
        },
--- a/toolkit/components/search/tests/xpcshell/test_override_allowlist.js
+++ b/toolkit/components/search/tests/xpcshell/test_override_allowlist.js
@ -272,7 +272,7 @@ add_task(async function setup() {

  baseExtension = ExtensionTestUtils.loadExtension({
    manifest: {
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: "test@thirdparty.example.com",
        },
--- a/toolkit/components/search/tests/xpcshell/test_webextensions_builtin_upgrade.js
+++ b/toolkit/components/search/tests/xpcshell/test_webextensions_builtin_upgrade.js
@ -44,7 +44,7 @@ function makePlainExtension(version, name = "Plain") {
    manifest: {
      name,
      version,
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: "plainengine@search.mozilla.org",
        },
@ -102,7 +102,7 @@ function makeMultiLocaleExtension(version) {
    manifest: {
      name: "__MSG_searchName__",
      version,
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: "multilocale@search.mozilla.org",
        },
--- a/toolkit/components/search/tests/xpcshell/test_webextensions_startup_remove.js
+++ b/toolkit/components/search/tests/xpcshell/test_webextensions_startup_remove.js
@ -12,7 +12,7 @@ add_task(async function setup() {
  xpi = AddonTestUtils.createTempWebExtensionFile({
    manifest: {
      version: "1.0",
-      browser_specific_settings: {
+      applications: {
        gecko: { id: ENGINE_ID },
      },
      chrome_settings_overrides: {
--- a/toolkit/components/search/tests/xpcshell/test_webextensions_valid.js
+++ b/toolkit/components/search/tests/xpcshell/test_webextensions_valid.js
@ -99,7 +99,7 @@ add_task(async function test_extension_no_longer_specifies_engine() {
    useAddonManager: "permanent",
    manifest: {
      version: "2.0",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: "example@tests.mozilla.org",
        },
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@ -518,7 +518,7 @@ add_task(async function test_addonsWatch_NotInterestingChange() {
  let themeXpi = AddonTestUtils.createTempWebExtensionFile({
    manifest: {
      theme: {},
-      browser_specific_settings: { gecko: { id: THEME_ID } },
+      applications: { gecko: { id: THEME_ID } },
    },
  });
  let themeAddon = (await AddonTestUtils.promiseInstallFile(themeXpi)).addon;
@ -526,7 +526,7 @@ add_task(async function test_addonsWatch_NotInterestingChange() {
  let dictXpi = AddonTestUtils.createTempWebExtensionFile({
    manifest: {
      dictionaries: {},
-      browser_specific_settings: { gecko: { id: DICT_ID } },
+      applications: { gecko: { id: DICT_ID } },
    },
  });
  let dictAddon = (await AddonTestUtils.promiseInstallFile(dictXpi)).addon;
@ -637,7 +637,7 @@ add_task(async function test_addons() {
      name: "XPI Telemetry WebExtension Add-on Test",
      description: "A webextension addon.",
      version: "1.0",
-      browser_specific_settings: {
+      applications: {
        gecko: {
          id: WEBEXTENSION_ADDON_ID,
        },
--- a/toolkit/mozapps/update/tests/unit_background_update/test_backgroundupdate_reason_schedule.js
+++ b/toolkit/mozapps/update/tests/unit_background_update/test_backgroundupdate_reason_schedule.js
@ -55,7 +55,7 @@ add_task(
        name: "test Language Pack",
        version: "1.0",
        manifest_version: 2,
-        browser_specific_settings: {
+        applications: {
          gecko: {
            id: "@test-langpack",
            strict_min_version: "42.0",