From 5d59c7aecd02534c573df5bd6b7e2ed9bd4bcb29 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Fri, 2 Jun 2023 20:00:35 +0000
Subject: [PATCH] Bug 1824613 - Convert consumers of
toolkit/mozapps/extensions/ to import ES modules directly.
r=extension-reviewers,settings-reviewers,application-update-reviewers,credential-management-reviewers,devtools-reviewers,sync-reviewers,sgalich,bytesized,robwu,skhamis
Depends on D179819
Differential Revision: https://phabricator.services.mozilla.com/D179820
---
.../browser_extension_sideloading.js | 4 ++--
.../browser_extension_update_background.js | 4 ++--
...ser_extension_update_background_noprompt.js | 4 ++--
.../base/content/test/webextensions/head.js | 8 +++-----
browser/components/BrowserGlue.sys.mjs | 2 +-
.../tests/xpcshell/test_addon_update.js | 4 ++--
.../tests/xpcshell/test_extensions.js | 4 ++--
.../tests/xpcshell/test_extensionsettings.js | 4 ++--
.../xpcshell/test_policy_search_engine.js | 4 ++--
.../browser_ext_browserAction_contextMenu.js | 8 +++-----
...xt_browserAction_popup_preload_smoketest.js | 4 ++--
.../test/browser/browser_ext_management.js | 4 ++--
.../test/browser/browser_ext_search.js | 4 ++--
.../test/browser/browser_ext_search_favicon.js | 4 ++--
...er_ext_settings_overrides_default_search.js | 2 +-
.../browser/browser_ext_tabs_hide_update.js | 4 ++--
.../test/browser/browser_ext_tabs_insertCSS.js | 4 ++--
.../browser_ext_windows_create_params.js | 4 ++--
.../browser_unified_extensions_context_menu.js | 8 +++-----
.../test/xpcshell/test_ext_bookmarks.js | 4 ++--
.../test_ext_chrome_settings_overrides_home.js | 4 ++--
...est_ext_chrome_settings_overrides_update.js | 4 ++--
.../test/xpcshell/test_ext_history.js | 4 ++--
.../test_ext_homepage_overrides_private.js | 4 ++--
.../test/xpcshell/test_ext_menu_startup.js | 4 ++--
.../xpcshell/test_ext_normandyAddonStudy.js | 4 ++--
.../xpcshell/test_ext_pageAction_shutdown.js | 4 ++--
.../test_ext_settings_overrides_defaults.js | 4 ++--
.../test_ext_settings_overrides_search.js | 4 ++--
...t_ext_settings_overrides_search_mozParam.js | 4 ++--
.../test_ext_settings_overrides_shutdown.js | 4 ++--
.../xpcshell/test_ext_settings_validate.js | 4 ++--
.../xpcshell/test_ext_url_overrides_newtab.js | 4 ++--
.../test_ext_url_overrides_newtab_update.js | 4 ++--
.../test/xpcshell/test_ext_urlbar.js | 4 ++--
.../aboutwelcome/lib/AboutWelcomeDefaults.jsm | 4 ++--
.../browser_aboutwelcome_attribution.js | 4 ++--
.../test/browser/browser_aboutwelcome_rtamo.js | 4 ++--
.../test/browser/browser_asrouter_targeting.js | 2 +-
.../test_AboutHomeStartupCacheWorker.js | 4 ++--
.../xpcshell/test_AboutWelcomeAttribution.js | 4 ++--
.../preferences/dialogs/browserLanguages.js | 6 +-----
.../browser_browser_languages_subdialog.js | 4 ++--
.../tests/browser_extension_controlled.js | 4 ++--
.../tests/browser_searchChangedEngine.js | 4 ++--
.../preferences/tests/browser_searchScroll.js | 4 ++--
.../search/test/browser/browser_contextmenu.js | 4 ++--
browser/components/search/test/browser/head.js | 5 +----
.../urlbar/tests/UrlbarTestUtils.sys.mjs | 2 +-
browser/components/urlbar/tests/unit/head.js | 2 +-
.../extensions/formautofill/test/unit/head.js | 4 ++--
.../browser/browser_client_side_redirection.js | 4 ++--
.../browser/browser_server_side_redirection.js | 4 ++--
.../test/browser/browser_expireThemes.js | 4 ++--
devtools/server/tests/xpcshell/head_dbg.js | 4 ++--
docshell/test/unit/head_docshell.js | 2 +-
.../tests/browser_midi_permission_gated.js | 8 +++-----
.../unit/test_promise_unhandled_rejection.js | 4 ++--
dom/streams/test/xpcshell/fetch.js | 4 ++--
.../xpcshell/test_ext_redirects_sw_scripts.js | 4 ++--
.../test_remoteworker_launch_new_process.js | 4 ++--
intl/locale/LangPackMatcher.sys.mjs | 5 ++++-
js/xpconnect/tests/unit/test_compileScript.js | 4 ++--
.../tests/unit/test_getCallerLocation.js | 2 +-
mobile/android/chrome/geckoview/geckoview.js | 2 +-
.../extensions/test/xpcshell/head.js | 9 +--------
modules/libpref/test/unit/test_parsePrefs.js | 4 ++--
netwerk/cookie/CookieXPCShellUtils.sys.mjs | 4 +---
services/sync/modules/addonutils.sys.mjs | 8 +++-----
services/sync/modules/engines/addons.sys.mjs | 8 +++-----
services/sync/tests/unit/head_helpers.js | 4 ++--
.../components/extensions/Extension.sys.mjs | 5 +++--
.../extensions/ExtensionXPCShellUtils.sys.mjs | 6 +-----
.../components/extensions/parent/ext-theme.js | 9 ++++-----
...browser_ext_extension_page_tab_navigated.js | 4 ++--
.../browser_ext_process_crash_handling.js | 4 ++--
.../browser/browser_ext_themes_experiment.js | 4 ++--
.../browser/browser_ext_themes_warnings.js | 4 ++--
.../extensions/test/xpcshell/head.js | 4 ++--
.../test/xpcshell/test_ext_experiments.js | 4 ++--
.../components/normandy/test/browser/head.js | 4 ++--
.../normandy/test/unit/test_addon_unenroll.js | 4 ++--
.../places/tests/unit/head_bookmarks.js | 4 ++--
.../search/tests/SearchTestUtils.sys.mjs | 2 +-
.../search/tests/xpcshell/head_search.js | 4 ++--
.../searchconfigs/head_searchconfig.js | 2 +-
.../components/telemetry/tests/unit/head.js | 2 +-
toolkit/modules/GMPInstallManager.sys.mjs | 4 +---
.../modules/LightweightThemeConsumer.sys.mjs | 4 ++--
.../test_BrowserUtils_urlFormatting.js | 4 ++--
.../tests/xpcshell/test_GMPInstallManager.js | 4 ++--
toolkit/mozapps/extensions/AddonManager.jsm | 7 ++-----
.../mozapps/extensions/content/aboutaddons.js | 2 +-
.../extensions/content/aboutaddonsCommon.js | 4 ++--
.../extensions/content/abuse-report-panel.js | 8 +++-----
.../extensions/content/abuse-reports.js | 4 ++--
.../extensions/internal/AddonTestUtils.sys.mjs | 4 ++--
.../internal/AddonUpdateChecker.sys.mjs | 12 ++----------
.../extensions/internal/XPIDatabase.jsm | 6 +++---
.../mozapps/extensions/internal/XPIInstall.jsm | 11 ++++++-----
.../extensions/internal/XPIProvider.jsm | 2 +-
.../browser/browser_addon_list_reordering.js | 4 ++--
.../test/browser/browser_history_navigation.js | 4 ++--
.../browser/browser_html_detail_permissions.js | 4 ++--
.../test/browser/browser_html_detail_view.js | 4 ++--
.../browser_html_discover_view_clientid.js | 4 ++--
.../browser_html_discover_view_prefs.js | 4 ++--
.../test/browser/browser_html_list_view.js | 4 ++--
.../browser_html_list_view_recommendations.js | 4 ++--
.../test/browser/browser_html_options_ui.js | 4 ++--
.../browser/browser_html_pending_updates.js | 4 ++--
.../browser/browser_html_recommendations.js | 4 ++--
.../browser/browser_html_scroll_restoration.js | 4 ++--
.../browser_html_sitepermission_addons.js | 4 ++--
.../test/browser/browser_html_updates.js | 4 ++--
.../browser/browser_installtrigger_install.js | 4 ++--
.../browser/browser_page_options_updates.js | 4 ++--
.../test/browser/browser_permission_prompt.js | 4 ++--
.../test/browser/browser_reinstall.js | 4 ++--
.../test/browser/browser_subframe_install.js | 4 ++--
.../test/browser/browser_updatessl.js | 4 ++--
.../test/browser/browser_webapi_install.js | 4 ++--
.../test/browser/browser_webext_incognito.js | 4 ++--
.../test/browser/head_abuse_report.js | 8 ++++----
.../extensions/test/browser/head_disco.js | 4 ++--
.../extensions/test/xpcshell/head_addons.js | 18 +++++++-----------
.../test/xpcshell/rs-blocklist/head.js | 6 +++---
.../rs-blocklist/test_blocklist_clients.js | 4 ++--
.../test_blocklist_regexp_split.js | 8 ++++----
.../test_blocklist_targetapp_filter.js | 4 ++--
.../rs-blocklist/test_blocklist_telemetry.js | 2 +-
.../test/xpcshell/test_AbuseReporter.js | 4 ++--
.../test/xpcshell/test_ProductAddonChecker.js | 4 ++--
.../test_ProductAddonChecker_signatures.js | 4 ++--
.../extensions/test/xpcshell/test_db_path.js | 4 ++--
.../test/xpcshell/test_updatecheck.js | 4 ++--
.../test/xpcshell/test_updatecheck_json.js | 4 ++--
.../xpinstall/browser_amosigned_trigger.js | 4 ++--
.../test/xpinstall/browser_amosigned_url.js | 4 ++--
.../test/xpinstall/browser_containers.js | 4 ++--
.../test/xpinstall/browser_datauri.js | 4 ++--
.../xpinstall/browser_doorhanger_installs.js | 4 ++--
.../test/xpinstall/browser_privatebrowsing.js | 4 ++--
.../browser_required_useractivation.js | 4 ++--
.../unit_aus_update/languagePackUpdates.js | 4 ++--
.../test_backgroundupdate_reason_schedule.js | 4 ++--
146 files changed, 299 insertions(+), 346 deletions(-)
diff --git a/browser/base/content/test/webextensions/browser_extension_sideloading.js b/browser/base/content/test/webextensions/browser_extension_sideloading.js
index affb818bf0e8b..ef99bb6f2132a 100644
--- a/browser/base/content/test/webextensions/browser_extension_sideloading.js
+++ b/browser/base/content/test/webextensions/browser_extension_sideloading.js
@@ -3,8 +3,8 @@ const { AddonManagerPrivate } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/base/content/test/webextensions/browser_extension_update_background.js b/browser/base/content/test/webextensions/browser_extension_update_background.js
index b829fd874587d..d7b0244dea147 100644
--- a/browser/base/content/test/webextensions/browser_extension_update_background.js
+++ b/browser/base/content/test/webextensions/browser_extension_update_background.js
@@ -2,8 +2,8 @@ const { AddonManagerPrivate } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js b/browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
index 5f4ae7bb3c30d..de1d566711cff 100644
--- a/browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
+++ b/browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
@@ -2,8 +2,8 @@ const { AddonManagerPrivate } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/base/content/test/webextensions/head.js b/browser/base/content/test/webextensions/head.js
index c41e5af70a3ae..71d1e6d009a39 100644
--- a/browser/base/content/test/webextensions/head.js
+++ b/browser/base/content/test/webextensions/head.js
@@ -1,8 +1,6 @@
-ChromeUtils.defineModuleGetter(
- this,
- "AddonTestUtils",
- "resource://testing-common/AddonTestUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
+});
const BASE = getRootDirectory(gTestPath).replace(
"chrome://mochitests/content/",
diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
index fe4216c46108e..be4a45f159810 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@@ -15,6 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
ActorManagerParent: "resource://gre/modules/ActorManagerParent.sys.mjs",
AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
+ Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.sys.mjs",
BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.sys.mjs",
BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
@@ -83,7 +84,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
ASRouterDefaultConfig:
"resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
- Blocklist: "resource://gre/modules/Blocklist.jsm",
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_addon_update.js b/browser/components/enterprisepolicies/tests/xpcshell/test_addon_update.js
index 8018f03ed99fe..529c312b47607 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_addon_update.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_addon_update.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_extensions.js b/browser/components/enterprisepolicies/tests/xpcshell/test_extensions.js
index cc59d2fb25ddc..0728aea702e15 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_extensions.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_extensions.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js b/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js
index 79081d48f1fe6..c35927a644ec4 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_policy_search_engine.js b/browser/components/enterprisepolicies/tests/xpcshell/test_policy_search_engine.js
index 2d2d267caef2f..be16829867b28 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_policy_search_engine.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_policy_search_engine.js
@@ -8,8 +8,8 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
-var { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
Services.prefs.setBoolPref("browser.search.log", true);
diff --git a/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js b/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
index c1f22bd518c31..0df01ddea5455 100644
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
@@ -2,11 +2,9 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.defineModuleGetter(
- this,
- "AbuseReporter",
- "resource://gre/modules/AbuseReporter.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AbuseReporter: "resource://gre/modules/AbuseReporter.sys.mjs",
+});
XPCOMUtils.defineLazyPreferenceGetter(
this,
diff --git 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
index b4bfd23bb1ca0..4069dbe89255f 100644
--- 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
@@ -8,8 +8,8 @@
// the default timeouts allows.
requestLongerTimeout(4);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
async function installTestAddon(addonId, unpacked = false) {
diff --git a/browser/components/extensions/test/browser/browser_ext_management.js b/browser/components/extensions/test/browser/browser_ext_management.js
index 53ec17071370f..94d518b70cad5 100644
--- a/browser/components/extensions/test/browser/browser_ext_management.js
+++ b/browser/components/extensions/test/browser/browser_ext_management.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/extensions/test/browser/browser_ext_search.js b/browser/components/extensions/test/browser/browser_ext_search.js
index 129f91bd39e75..c7dab1c9dcdb5 100644
--- a/browser/components/extensions/test/browser/browser_ext_search.js
+++ b/browser/components/extensions/test/browser/browser_ext_search.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const SEARCH_TERM = "test";
diff --git a/browser/components/extensions/test/browser/browser_ext_search_favicon.js b/browser/components/extensions/test/browser/browser_ext_search_favicon.js
index ec8a1681c12ab..b46796a427612 100644
--- a/browser/components/extensions/test/browser/browser_ext_search_favicon.js
+++ b/browser/components/extensions/test/browser/browser_ext_search_favicon.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { XPCShellContentUtils } = ChromeUtils.importESModule(
"resource://testing-common/XPCShellContentUtils.sys.mjs"
diff --git a/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js b/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
index 2c39066a631b2..c07eeaf05eb6b 100644
--- a/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
+++ b/browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
@@ -4,13 +4,13 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
});
const EXTENSION1_ID = "extension1@mozilla.com";
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js b/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js
index d2302c4343a2a..7fbf185704a8e 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js b/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
index 0e0fa45f55d16..1a4bbd0c74048 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/extensions/test/browser/browser_ext_windows_create_params.js b/browser/components/extensions/test/browser/browser_ext_windows_create_params.js
index 5587d00f04906..6d80085433a8e 100644
--- a/browser/components/extensions/test/browser/browser_ext_windows_create_params.js
+++ b/browser/components/extensions/test/browser/browser_ext_windows_create_params.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js b/browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js
index b08779e9dea9a..cf43401c0cea8 100644
--- a/browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js
+++ b/browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js
@@ -5,11 +5,9 @@
requestLongerTimeout(2);
-ChromeUtils.defineModuleGetter(
- this,
- "AbuseReporter",
- "resource://gre/modules/AbuseReporter.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AbuseReporter: "resource://gre/modules/AbuseReporter.sys.mjs",
+});
const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
"resource://testing-common/EnterprisePolicyTesting.sys.mjs"
diff --git a/browser/components/extensions/test/xpcshell/test_ext_bookmarks.js b/browser/components/extensions/test/xpcshell/test_ext_bookmarks.js
index a1837dbaa6c08..15d09d1163a89 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_bookmarks.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_bookmarks.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js b/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js
index f3efea99162f4..24ee403cb6db9 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js b/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
index de0e4de7d94a6..3fbb041b35221 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/browser/components/extensions/test/xpcshell/test_ext_history.js b/browser/components/extensions/test/xpcshell/test_ext_history.js
index f39e27317b343..c0f6c39be79c5 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_history.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_history.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/browser/components/extensions/test/xpcshell/test_ext_homepage_overrides_private.js b/browser/components/extensions/test/xpcshell/test_ext_homepage_overrides_private.js
index e591dd0ae6b75..edf039271282e 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_homepage_overrides_private.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_homepage_overrides_private.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm");
const { ExtensionPermissions } = ChromeUtils.importESModule(
diff --git a/browser/components/extensions/test/xpcshell/test_ext_menu_startup.js b/browser/components/extensions/test/xpcshell/test_ext_menu_startup.js
index c1d8bfaec214b..aa019c6584a2a 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_menu_startup.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_menu_startup.js
@@ -5,8 +5,8 @@ ChromeUtils.defineESModuleGetters(this, {
Management: "resource://gre/modules/Extension.sys.mjs",
});
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.init(this);
diff --git a/browser/components/extensions/test/xpcshell/test_ext_normandyAddonStudy.js b/browser/components/extensions/test/xpcshell/test_ext_normandyAddonStudy.js
index a0f626f3b7b98..1d108bfd1a062 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_normandyAddonStudy.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_normandyAddonStudy.js
@@ -15,8 +15,8 @@ const { NormandyTestUtils } = ChromeUtils.importESModule(
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
-var { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { addonStudyFactory } = NormandyTestUtils.factories;
diff --git a/browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js b/browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
index 0b891eeb0f140..bdc849b7e9030 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
@@ -9,8 +9,8 @@ ChromeUtils.defineModuleGetter(
"resource:///modules/PageActions.jsm"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { createAppInfo, promiseShutdownManager, promiseStartupManager } =
diff --git a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js
index 75edc222f8556..dd24be3affc85 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { SearchTestUtils } = ChromeUtils.importESModule(
diff --git a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
index 6903f9d84d88c..2c94569dbd48a 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
diff --git a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
index c05a24f2f8c5b..3248c5cefac65 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { SearchTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SearchTestUtils.sys.mjs"
diff --git a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_shutdown.js b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_shutdown.js
index 8fe733b632e8f..fdb9baf25ae9d 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_shutdown.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_settings_overrides_shutdown.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
// Lazily import ExtensionParent to allow AddonTestUtils.createAppInfo to
// override Services.appinfo.
diff --git a/browser/components/extensions/test/xpcshell/test_ext_settings_validate.js b/browser/components/extensions/test/xpcshell/test_ext_settings_validate.js
index 627613817159b..e0ba08bfcf433 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_settings_validate.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_settings_validate.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { AddonManager } = ChromeUtils.import(
diff --git a/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js b/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
index 800f41124e55b..fb729c1108421 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
@@ -16,8 +16,8 @@ const { AboutNewTab } = ChromeUtils.import(
"resource:///modules/AboutNewTab.jsm"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const {
diff --git a/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js b/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
index 142eb6dd21339..61d09655697eb 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
@@ -6,8 +6,8 @@ const { AboutNewTab } = ChromeUtils.import(
"resource:///modules/AboutNewTab.jsm"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const {
diff --git a/browser/components/extensions/test/xpcshell/test_ext_urlbar.js b/browser/components/extensions/test/xpcshell/test_ext_urlbar.js
index a0f962feb561c..94c370630da69 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_urlbar.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_urlbar.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
index d204b5e332960..0e17a0b3aefe0 100644
--- a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
+++ b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
@@ -15,12 +15,12 @@ const { AppConstants } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
- BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
AttributionCode: "resource:///modules/AttributionCode.sys.mjs",
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
AWScreenUtils: "resource://activity-stream/lib/AWScreenUtils.jsm",
});
diff --git a/browser/components/newtab/test/browser/browser_aboutwelcome_attribution.js b/browser/components/newtab/test/browser/browser_aboutwelcome_attribution.js
index 1bc71b45341ed..ae33a383ba0f9 100644
--- a/browser/components/newtab/test/browser/browser_aboutwelcome_attribution.js
+++ b/browser/components/newtab/test/browser/browser_aboutwelcome_attribution.js
@@ -6,8 +6,8 @@ const { ASRouter } = ChromeUtils.import(
const { AttributionCode } = ChromeUtils.importESModule(
"resource:///modules/AttributionCode.sys.mjs"
);
-const { AddonRepository } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonRepository.jsm"
+const { AddonRepository } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonRepository.sys.mjs"
);
const TEST_ATTRIBUTION_DATA = {
diff --git a/browser/components/newtab/test/browser/browser_aboutwelcome_rtamo.js b/browser/components/newtab/test/browser/browser_aboutwelcome_rtamo.js
index 0bad44cba77cc..4e8fe223fe57c 100644
--- a/browser/components/newtab/test/browser/browser_aboutwelcome_rtamo.js
+++ b/browser/components/newtab/test/browser/browser_aboutwelcome_rtamo.js
@@ -3,8 +3,8 @@
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
-const { AddonRepository } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonRepository.jsm"
+const { AddonRepository } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonRepository.sys.mjs"
);
const { ExperimentFakes } = ChromeUtils.importESModule(
"resource://testing-common/NimbusTestUtils.sys.mjs"
diff --git a/browser/components/newtab/test/browser/browser_asrouter_targeting.js b/browser/components/newtab/test/browser/browser_asrouter_targeting.js
index 9ad427aa52922..7769328e86a0b 100644
--- a/browser/components/newtab/test/browser/browser_asrouter_targeting.js
+++ b/browser/components/newtab/test/browser/browser_asrouter_targeting.js
@@ -1,13 +1,13 @@
XPCOMUtils.defineLazyModuleGetters(this, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
AddonManager: "resource://gre/modules/AddonManager.jsm",
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
HomePage: "resource:///modules/HomePage.jsm",
QueryCache: "resource://activity-stream/lib/ASRouterTargeting.jsm",
});
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
AttributionCode: "resource:///modules/AttributionCode.sys.mjs",
BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
diff --git a/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js b/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
index e1cb25c8bbdf8..0cbb81351bbdf 100644
--- a/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
+++ b/browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
@@ -9,8 +9,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
* Stream Redux store into an HTML document and script.
*/
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { SearchTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SearchTestUtils.sys.mjs"
diff --git a/browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js b/browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js
index 0320d9cbdfd16..2b2c55b47b715 100644
--- a/browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js
+++ b/browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js
@@ -13,8 +13,8 @@ const { sinon } = ChromeUtils.importESModule(
const { AttributionCode } = ChromeUtils.importESModule(
"resource:///modules/AttributionCode.sys.mjs"
);
-const { AddonRepository } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonRepository.jsm"
+const { AddonRepository } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonRepository.sys.mjs"
);
const TEST_ATTRIBUTION_DATA = {
diff --git a/browser/components/preferences/dialogs/browserLanguages.js b/browser/components/preferences/dialogs/browserLanguages.js
index 78d6d353e2112..26a4c6a45a675 100644
--- a/browser/components/preferences/dialogs/browserLanguages.js
+++ b/browser/components/preferences/dialogs/browserLanguages.js
@@ -12,12 +12,8 @@ ChromeUtils.defineModuleGetter(
"AddonManager",
"resource://gre/modules/AddonManager.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "AddonRepository",
- "resource://gre/modules/addons/AddonRepository.jsm"
-);
ChromeUtils.defineESModuleGetters(this, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/preferences/tests/browser_browser_languages_subdialog.js b/browser/components/preferences/tests/browser_browser_languages_subdialog.js
index 1572a8b57387b..8b57bf08a83be 100644
--- a/browser/components/preferences/tests/browser_browser_languages_subdialog.js
+++ b/browser/components/preferences/tests/browser_browser_languages_subdialog.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/preferences/tests/browser_extension_controlled.js b/browser/components/preferences/tests/browser_extension_controlled.js
index 0cdc84a0a48c4..6cec9ba93a2cb 100644
--- a/browser/components/preferences/tests/browser_extension_controlled.js
+++ b/browser/components/preferences/tests/browser_extension_controlled.js
@@ -20,8 +20,8 @@ ChromeUtils.defineModuleGetter(
XPCOMUtils.defineLazyPreferenceGetter(this, "proxyType", PROXY_PREF);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/preferences/tests/browser_searchChangedEngine.js b/browser/components/preferences/tests/browser_searchChangedEngine.js
index 321cab4686300..0882c9775e209 100644
--- a/browser/components/preferences/tests/browser_searchChangedEngine.js
+++ b/browser/components/preferences/tests/browser_searchChangedEngine.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { SearchTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SearchTestUtils.sys.mjs"
diff --git a/browser/components/preferences/tests/browser_searchScroll.js b/browser/components/preferences/tests/browser_searchScroll.js
index 02751da74d03e..ef3af646e9c90 100644
--- a/browser/components/preferences/tests/browser_searchScroll.js
+++ b/browser/components/preferences/tests/browser_searchScroll.js
@@ -6,8 +6,8 @@ Services.scriptloader.loadSubScript(
this
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { SearchTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SearchTestUtils.sys.mjs"
diff --git a/browser/components/search/test/browser/browser_contextmenu.js b/browser/components/search/test/browser/browser_contextmenu.js
index d97f3c183fed6..67ba48da727ee 100644
--- a/browser/components/search/test/browser/browser_contextmenu.js
+++ b/browser/components/search/test/browser/browser_contextmenu.js
@@ -4,8 +4,8 @@
* Test searching for the selected text using the context menu
*/
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/browser/components/search/test/browser/head.js b/browser/components/search/test/browser/head.js
index db44dd475550c..cdb430475bec4 100644
--- a/browser/components/search/test/browser/head.js
+++ b/browser/components/search/test/browser/head.js
@@ -4,6 +4,7 @@
ChromeUtils.defineESModuleGetters(this, {
ADLINK_CHECK_TIMEOUT_MS:
"resource:///actors/SearchSERPTelemetryChild.sys.mjs",
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
CustomizableUITestUtils:
"resource://testing-common/CustomizableUITestUtils.sys.mjs",
FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
@@ -16,10 +17,6 @@ ChromeUtils.defineESModuleGetters(this, {
UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(this, {
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
-});
-
ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => {
const { UrlbarTestUtils: module } = ChromeUtils.importESModule(
"resource://testing-common/UrlbarTestUtils.sys.mjs"
diff --git a/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs b/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs
index e571f5295e54c..399fb7cc11259 100644
--- a/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs
+++ b/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs
@@ -13,6 +13,7 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
BrowserTestUtils: "resource://testing-common/BrowserTestUtils.sys.mjs",
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
ExperimentFakes: "resource://testing-common/NimbusTestUtils.sys.mjs",
@@ -31,7 +32,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
});
diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js
index a49a31c66ecdf..8f15b0280efd8 100644
--- a/browser/components/urlbar/tests/unit/head.js
+++ b/browser/components/urlbar/tests/unit/head.js
@@ -12,6 +12,7 @@ var { UrlbarMuxer, UrlbarProvider, UrlbarQueryContext, UrlbarUtils } =
ChromeUtils.importESModule("resource:///modules/UrlbarUtils.sys.mjs");
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
@@ -28,7 +29,6 @@ ChromeUtils.defineESModuleGetters(this, {
});
XPCOMUtils.defineLazyModuleGetters(this, {
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
});
diff --git a/browser/extensions/formautofill/test/unit/head.js b/browser/extensions/formautofill/test/unit/head.js
index 45c305c56f683..23759d3f47f2a 100644
--- a/browser/extensions/formautofill/test/unit/head.js
+++ b/browser/extensions/formautofill/test/unit/head.js
@@ -16,8 +16,8 @@ var { FormLikeFactory } = ChromeUtils.importESModule(
var { FormAutofillHandler } = ChromeUtils.importESModule(
"resource://gre/modules/shared/FormAutofillHandler.sys.mjs"
);
-var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
var { ExtensionTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
diff --git a/browser/extensions/search-detection/tests/browser/browser_client_side_redirection.js b/browser/extensions/search-detection/tests/browser/browser_client_side_redirection.js
index 067e09e809dc3..5dad39dba4dd0 100644
--- a/browser/extensions/search-detection/tests/browser/browser_client_side_redirection.js
+++ b/browser/extensions/search-detection/tests/browser/browser_client_side_redirection.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
diff --git a/browser/extensions/search-detection/tests/browser/browser_server_side_redirection.js b/browser/extensions/search-detection/tests/browser/browser_server_side_redirection.js
index 7b6f47c53f063..ea235406a45bd 100644
--- a/browser/extensions/search-detection/tests/browser/browser_server_side_redirection.js
+++ b/browser/extensions/search-detection/tests/browser/browser_server_side_redirection.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
diff --git a/browser/themes/test/browser/browser_expireThemes.js b/browser/themes/test/browser/browser_expireThemes.js
index 99b77697e241f..7669c44cc95e3 100644
--- a/browser/themes/test/browser/browser_expireThemes.js
+++ b/browser/themes/test/browser/browser_expireThemes.js
@@ -5,8 +5,8 @@ const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/devtools/server/tests/xpcshell/head_dbg.js b/devtools/server/tests/xpcshell/head_dbg.js
index 84497b011bf1d..987852da0d8fb 100644
--- a/devtools/server/tests/xpcshell/head_dbg.js
+++ b/devtools/server/tests/xpcshell/head_dbg.js
@@ -63,8 +63,8 @@ const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { getAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
diff --git a/docshell/test/unit/head_docshell.js b/docshell/test/unit/head_docshell.js
index 9e2af04b6b94d..5b0369089e05a 100644
--- a/docshell/test/unit/head_docshell.js
+++ b/docshell/test/unit/head_docshell.js
@@ -7,13 +7,13 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
});
diff --git a/dom/midi/tests/browser_midi_permission_gated.js b/dom/midi/tests/browser_midi_permission_gated.js
index 1c31f8c2f1758..2367e8ec90733 100644
--- a/dom/midi/tests/browser_midi_permission_gated.js
+++ b/dom/midi/tests/browser_midi_permission_gated.js
@@ -23,11 +23,9 @@ const l10n = new Localization(
);
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
-ChromeUtils.defineModuleGetter(
- this,
- "AddonTestUtils",
- "resource://testing-common/AddonTestUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
+});
add_setup(async function () {
await SpecialPowers.pushPrefEnv({
diff --git a/dom/promise/tests/unit/test_promise_unhandled_rejection.js b/dom/promise/tests/unit/test_promise_unhandled_rejection.js
index d0612d142b87a..68471569ec438 100644
--- a/dom/promise/tests/unit/test_promise_unhandled_rejection.js
+++ b/dom/promise/tests/unit/test_promise_unhandled_rejection.js
@@ -3,8 +3,8 @@
// Tests that unhandled promise rejections generate the appropriate
// console messages.
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { PromiseTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PromiseTestUtils.sys.mjs"
diff --git a/dom/streams/test/xpcshell/fetch.js b/dom/streams/test/xpcshell/fetch.js
index 3cbf26ff7c059..03c8471f80350 100644
--- a/dom/streams/test/xpcshell/fetch.js
+++ b/dom/streams/test/xpcshell/fetch.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.init(this);
diff --git a/dom/workers/test/xpcshell/test_ext_redirects_sw_scripts.js b/dom/workers/test/xpcshell/test_ext_redirects_sw_scripts.js
index 6e374ab23dcfa..8dbfc5857fd7f 100644
--- a/dom/workers/test/xpcshell/test_ext_redirects_sw_scripts.js
+++ b/dom/workers/test/xpcshell/test_ext_redirects_sw_scripts.js
@@ -8,8 +8,8 @@ const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionTestUtils } = ChromeUtils.importESModule(
diff --git a/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js b/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js
index 953940e39f89e..e13b0fc96c89b 100644
--- a/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js
+++ b/dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js
@@ -6,8 +6,8 @@ const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { createHttpServer } = AddonTestUtils;
diff --git a/intl/locale/LangPackMatcher.sys.mjs b/intl/locale/LangPackMatcher.sys.mjs
index bdc6a689659aa..3307effbe30b1 100644
--- a/intl/locale/LangPackMatcher.sys.mjs
+++ b/intl/locale/LangPackMatcher.sys.mjs
@@ -6,8 +6,11 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
AddonManager: "resource://gre/modules/AddonManager.jsm",
});
diff --git a/js/xpconnect/tests/unit/test_compileScript.js b/js/xpconnect/tests/unit/test_compileScript.js
index 1b1df9e91f8b4..1baf7ab56e5e9 100644
--- a/js/xpconnect/tests/unit/test_compileScript.js
+++ b/js/xpconnect/tests/unit/test_compileScript.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.init(this);
diff --git a/js/xpconnect/tests/unit/test_getCallerLocation.js b/js/xpconnect/tests/unit/test_getCallerLocation.js
index 1a6ce37357b7c..569d76f8eb1cc 100644
--- a/js/xpconnect/tests/unit/test_getCallerLocation.js
+++ b/js/xpconnect/tests/unit/test_getCallerLocation.js
@@ -5,7 +5,7 @@
Cu.importGlobalProperties(["ChromeUtils"]);
-const {AddonTestUtils} = ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm");
+const {AddonTestUtils} = ChromeUtils.importESModule("resource://testing-common/AddonTestUtils.sys.mjs");
add_task(async function() {
const sandbox = Cu.Sandbox("http://example.com/");
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index ec1bf4451f1ed..69ca5e413faec 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -12,6 +12,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
+ Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
EventDispatcher: "resource://gre/modules/Messaging.sys.mjs",
GeckoViewActorManager: "resource://gre/modules/GeckoViewActorManager.sys.mjs",
@@ -23,7 +24,6 @@ ChromeUtils.defineESModuleGetters(this, {
});
XPCOMUtils.defineLazyModuleGetters(this, {
- Blocklist: "resource://gre/modules/Blocklist.jsm",
HistogramStopwatch: "resource://gre/modules/GeckoViewTelemetry.jsm",
InitializationTracker: "resource://gre/modules/GeckoViewTelemetry.jsm",
});
diff --git a/mobile/android/components/extensions/test/xpcshell/head.js b/mobile/android/components/extensions/test/xpcshell/head.js
index e4106c2e135d1..e79781fba62fb 100644
--- a/mobile/android/components/extensions/test/xpcshell/head.js
+++ b/mobile/android/components/extensions/test/xpcshell/head.js
@@ -1,18 +1,11 @@
"use strict";
-var { XPCOMUtils } = ChromeUtils.importESModule(
- "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
-
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
ExtensionTestUtils:
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(this, {
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
-});
-
// Remove this pref once bug 1535365 is fixed.
Services.prefs.setBoolPref("extensions.webextensions.remote", false);
diff --git a/modules/libpref/test/unit/test_parsePrefs.js b/modules/libpref/test/unit/test_parsePrefs.js
index 14e335bcec398..53bb55dc7e9f7 100644
--- a/modules/libpref/test/unit/test_parsePrefs.js
+++ b/modules/libpref/test/unit/test_parsePrefs.js
@@ -89,8 +89,8 @@ add_task(async function test_success() {
});
add_task(async function test_exceptions() {
- const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+ const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
let s = `user_pref("testPref.bool1", true);
diff --git a/netwerk/cookie/CookieXPCShellUtils.sys.mjs b/netwerk/cookie/CookieXPCShellUtils.sys.mjs
index d968d86efd8f1..b6d0d3f26b420 100644
--- a/netwerk/cookie/CookieXPCShellUtils.sys.mjs
+++ b/netwerk/cookie/CookieXPCShellUtils.sys.mjs
@@ -6,9 +6,7 @@
import { ExtensionTestUtils } from "resource://testing-common/ExtensionXPCShellUtils.sys.mjs";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
-);
+import { AddonTestUtils } from "resource://testing-common/AddonTestUtils.sys.mjs";
export const CookieXPCShellUtils = {
init(scope) {
diff --git a/services/sync/modules/addonutils.sys.mjs b/services/sync/modules/addonutils.sys.mjs
index 2442117e8d169..8a856d43ba659 100644
--- a/services/sync/modules/addonutils.sys.mjs
+++ b/services/sync/modules/addonutils.sys.mjs
@@ -13,11 +13,9 @@ ChromeUtils.defineModuleGetter(
"AddonManager",
"resource://gre/modules/AddonManager.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "AddonRepository",
- "resource://gre/modules/addons/AddonRepository.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
+});
function AddonUtilsInternal() {
this._log = Log.repository.getLogger("Sync.AddonUtils");
diff --git a/services/sync/modules/engines/addons.sys.mjs b/services/sync/modules/engines/addons.sys.mjs
index 72350947d1d7b..c1b152f002151 100644
--- a/services/sync/modules/engines/addons.sys.mjs
+++ b/services/sync/modules/engines/addons.sys.mjs
@@ -57,11 +57,9 @@ ChromeUtils.defineModuleGetter(
"AddonManager",
"resource://gre/modules/AddonManager.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "AddonRepository",
- "resource://gre/modules/addons/AddonRepository.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
+});
// 7 days in milliseconds.
const PRUNE_ADDON_CHANGES_THRESHOLD = 60 * 60 * 24 * 7 * 1000;
diff --git a/services/sync/tests/unit/head_helpers.js b/services/sync/tests/unit/head_helpers.js
index dbfa6f3269fb1..d55bb450e65ac 100644
--- a/services/sync/tests/unit/head_helpers.js
+++ b/services/sync/tests/unit/head_helpers.js
@@ -10,8 +10,8 @@
// is used (from service.js).
/* global Service */
-var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
var { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
diff --git a/toolkit/components/extensions/Extension.sys.mjs b/toolkit/components/extensions/Extension.sys.mjs
index ab57672a19bea..1a117f3dc80f5 100644
--- a/toolkit/components/extensions/Extension.sys.mjs
+++ b/toolkit/components/extensions/Extension.sys.mjs
@@ -35,6 +35,7 @@ import { ExtensionUtils } from "resource://gre/modules/ExtensionUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonSettings: "resource://gre/modules/addons/AddonSettings.sys.mjs",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
ExtensionDNR: "resource://gre/modules/ExtensionDNR.sys.mjs",
@@ -49,6 +50,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
ExtensionStorage: "resource://gre/modules/ExtensionStorage.sys.mjs",
ExtensionStorageIDB: "resource://gre/modules/ExtensionStorageIDB.sys.mjs",
ExtensionTelemetry: "resource://gre/modules/ExtensionTelemetry.sys.mjs",
+ LightweightThemeManager:
+ "resource://gre/modules/LightweightThemeManager.sys.mjs",
Log: "resource://gre/modules/Log.sys.mjs",
SITEPERMS_ADDON_TYPE:
"resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
@@ -62,8 +65,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
- AddonSettings: "resource://gre/modules/addons/AddonSettings.jsm",
- LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
});
diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.sys.mjs b/toolkit/components/extensions/ExtensionXPCShellUtils.sys.mjs
index f4287b3ffa2d9..ab5c08498d537 100644
--- a/toolkit/components/extensions/ExtensionXPCShellUtils.sys.mjs
+++ b/toolkit/components/extensions/ExtensionXPCShellUtils.sys.mjs
@@ -14,12 +14,8 @@ ChromeUtils.defineModuleGetter(
"AddonManager",
"resource://gre/modules/AddonManager.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "AddonTestUtils",
- "resource://testing-common/AddonTestUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
Management: "resource://gre/modules/Extension.sys.mjs",
diff --git a/toolkit/components/extensions/parent/ext-theme.js b/toolkit/components/extensions/parent/ext-theme.js
index 5724f7892667a..1280563dd0b02 100644
--- a/toolkit/components/extensions/parent/ext-theme.js
+++ b/toolkit/components/extensions/parent/ext-theme.js
@@ -8,11 +8,10 @@
/* eslint-disable complexity */
-ChromeUtils.defineModuleGetter(
- this,
- "LightweightThemeManager",
- "resource://gre/modules/LightweightThemeManager.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ LightweightThemeManager:
+ "resource://gre/modules/LightweightThemeManager.sys.mjs",
+});
const onUpdatedEmitter = new EventEmitter();
diff --git a/toolkit/components/extensions/test/browser/browser_ext_extension_page_tab_navigated.js b/toolkit/components/extensions/test/browser/browser_ext_extension_page_tab_navigated.js
index decc122f6179a..b2fb9484c2b0c 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_extension_page_tab_navigated.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_extension_page_tab_navigated.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
// The test tasks in this test file tends to trigger an intermittent
diff --git a/toolkit/components/extensions/test/browser/browser_ext_process_crash_handling.js b/toolkit/components/extensions/test/browser/browser_ext_process_crash_handling.js
index 663d03957457a..09ded0bcc1bc3 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_process_crash_handling.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_process_crash_handling.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionProcessCrashObserver, Management } =
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_experiment.js b/toolkit/components/extensions/test/browser/browser_ext_themes_experiment.js
index e07f4a50d23bb..02156b6cd82c2 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_experiment.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_experiment.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonSettings } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonSettings.jsm"
+const { AddonSettings } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonSettings.sys.mjs"
);
// This test checks whether the theme experiments work
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_warnings.js b/toolkit/components/extensions/test/browser/browser_ext_themes_warnings.js
index e2f646ac9770e..025a4073ddb9c 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_warnings.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_warnings.js
@@ -1,7 +1,7 @@
"use strict";
-const { AddonSettings } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonSettings.jsm"
+const { AddonSettings } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonSettings.sys.mjs"
);
// This test checks that theme warnings are properly emitted.
diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/extensions/test/xpcshell/head.js
index 6d299a1d63784..10be62a7e211f 100644
--- a/toolkit/components/extensions/test/xpcshell/head.js
+++ b/toolkit/components/extensions/test/xpcshell/head.js
@@ -20,8 +20,8 @@ var {
setTimeout,
setTimeoutWithTarget,
} = ChromeUtils.importESModule("resource://gre/modules/Timer.sys.mjs");
-var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_experiments.js b/toolkit/components/extensions/test/xpcshell/test_ext_experiments.js
index cc3cd33534c4c..802ec6924090f 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_experiments.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_experiments.js
@@ -1,8 +1,8 @@
"use strict";
/* globals browser */
-const { AddonSettings } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonSettings.jsm"
+const { AddonSettings } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonSettings.sys.mjs"
);
AddonTestUtils.init(this);
diff --git a/toolkit/components/normandy/test/browser/head.js b/toolkit/components/normandy/test/browser/head.js
index cc9fe22d8b0e0..354c38647e376 100644
--- a/toolkit/components/normandy/test/browser/head.js
+++ b/toolkit/components/normandy/test/browser/head.js
@@ -1,8 +1,8 @@
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { AboutPages } = ChromeUtils.importESModule(
"resource://normandy-content/AboutPages.sys.mjs"
diff --git a/toolkit/components/normandy/test/unit/test_addon_unenroll.js b/toolkit/components/normandy/test/unit/test_addon_unenroll.js
index 9eec161b63786..8887d8f490576 100644
--- a/toolkit/components/normandy/test/unit/test_addon_unenroll.js
+++ b/toolkit/components/normandy/test/unit/test_addon_unenroll.js
@@ -1,5 +1,5 @@
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
diff --git a/toolkit/components/places/tests/unit/head_bookmarks.js b/toolkit/components/places/tests/unit/head_bookmarks.js
index f67c160c99940..5f6250aa5da34 100644
--- a/toolkit/components/places/tests/unit/head_bookmarks.js
+++ b/toolkit/components/places/tests/unit/head_bookmarks.js
@@ -12,8 +12,8 @@
}
// Put any other stuff relative to this test folder below.
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.init(this, false);
diff --git a/toolkit/components/search/tests/SearchTestUtils.sys.mjs b/toolkit/components/search/tests/SearchTestUtils.sys.mjs
index f3b6aeedf267f..e9e64c8761539 100644
--- a/toolkit/components/search/tests/SearchTestUtils.sys.mjs
+++ b/toolkit/components/search/tests/SearchTestUtils.sys.mjs
@@ -5,6 +5,7 @@ import { MockRegistrar } from "resource://testing-common/MockRegistrar.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
ExtensionTestUtils:
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
@@ -14,7 +15,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
});
var gTestScope;
diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js
index 0cc64fb40a743..749fd2f4adec0 100644
--- a/toolkit/components/search/tests/xpcshell/head_search.js
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -24,8 +24,8 @@ ChromeUtils.defineESModuleGetters(this, {
});
var { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
-var { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
index 967e5767a2c67..ae32a26b40355 100644
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
@@ -11,6 +11,7 @@ const { AppConstants } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchEngine: "resource://gre/modules/SearchEngine.sys.mjs",
@@ -22,7 +23,6 @@ ChromeUtils.defineESModuleGetters(this, {
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
});
diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js
index 67d8a8b492e6a..7088dd2227de6 100644
--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@@ -9,6 +9,7 @@ const { AppConstants } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
+ AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
Log: "resource://gre/modules/Log.sys.mjs",
Preferences: "resource://gre/modules/Preferences.sys.mjs",
@@ -21,7 +22,6 @@ ChromeUtils.defineESModuleGetters(this, {
});
XPCOMUtils.defineLazyModuleGetters(this, {
- AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
});
diff --git a/toolkit/modules/GMPInstallManager.sys.mjs b/toolkit/modules/GMPInstallManager.sys.mjs
index d8a6cfdc8bf22..9cb4802e58e54 100644
--- a/toolkit/modules/GMPInstallManager.sys.mjs
+++ b/toolkit/modules/GMPInstallManager.sys.mjs
@@ -15,9 +15,7 @@ import {
WIDEVINE_ID,
} from "resource://gre/modules/GMPUtils.sys.mjs";
-const { ProductAddonChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/ProductAddonChecker.jsm"
-);
+import { ProductAddonChecker } from "resource://gre/modules/addons/ProductAddonChecker.sys.mjs";
const lazy = {};
diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs
index bcac198613fe0..4e825b14e592a 100644
--- a/toolkit/modules/LightweightThemeConsumer.sys.mjs
+++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs
@@ -163,8 +163,8 @@ export function LightweightThemeConsumer(aDocument) {
this.darkThemeMediaQuery = this._win.matchMedia("(-moz-system-dark-theme)");
this.darkThemeMediaQuery.addListener(this);
- const { LightweightThemeManager } = ChromeUtils.import(
- "resource://gre/modules/LightweightThemeManager.jsm"
+ const { LightweightThemeManager } = ChromeUtils.importESModule(
+ "resource://gre/modules/LightweightThemeManager.sys.mjs"
);
this._update(LightweightThemeManager.themeData);
diff --git a/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js b/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
index 2f86d2c6c593a..c7945cdb9c1fb 100644
--- a/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
+++ b/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
@@ -23,8 +23,8 @@ const EXTENSION_URL_EXPECTED_STRING = gL10n.formatValueSync(
{ extension: EXTENSION_NAME }
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionTestUtils } = ChromeUtils.importESModule(
diff --git a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
index 1131dd85749d6..87de57efaff55 100644
--- a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
+++ b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
@@ -27,8 +27,8 @@ const { UpdateUtils } = ChromeUtils.importESModule(
const { GMPPrefs, OPEN_H264_ID } = ChromeUtils.importESModule(
"resource://gre/modules/GMPUtils.sys.mjs"
);
-const { ProductAddonCheckerTestUtils } = ChromeUtils.import(
- "resource://gre/modules/addons/ProductAddonChecker.jsm"
+const { ProductAddonCheckerTestUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/ProductAddonChecker.sys.mjs"
);
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 935b7e7350c20..fc4a3968cab53 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -88,6 +88,8 @@ const { PromiseUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AbuseReporter: "resource://gre/modules/AbuseReporter.sys.mjs",
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
Extension: "resource://gre/modules/Extension.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TelemetryTimestamps: "resource://gre/modules/TelemetryTimestamps.sys.mjs",
@@ -99,11 +101,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
- AbuseReporter: "resource://gre/modules/AbuseReporter.jsm",
-});
-
XPCOMUtils.defineLazyPreferenceGetter(
lazy,
"WEBEXT_POSTDOWNLOAD_THIRD_PARTY",
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
index dab630fd391ef..3cd350df8f675 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.js
+++ b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -10,6 +10,7 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
ClientID: "resource://gre/modules/ClientID.sys.mjs",
DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
@@ -22,7 +23,6 @@ ChromeUtils.defineESModuleGetters(this, {
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
});
XPCOMUtils.defineLazyGetter(this, "extensionStylesheets", () => {
diff --git a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
index ce93580c24201..739e7629d7b31 100644
--- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
+++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
@@ -12,8 +12,8 @@
* shouldShowPermissionsPrompt, showPermissionsPrompt,
* PREF_UI_LASTCATEGORY */
-const { AddonSettings } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonSettings.jsm"
+const { AddonSettings } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonSettings.sys.mjs"
);
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/toolkit/mozapps/extensions/content/abuse-report-panel.js b/toolkit/mozapps/extensions/content/abuse-report-panel.js
index 5ce9217276202..d1647ae184f73 100644
--- a/toolkit/mozapps/extensions/content/abuse-report-panel.js
+++ b/toolkit/mozapps/extensions/content/abuse-report-panel.js
@@ -5,11 +5,9 @@
"use strict";
-ChromeUtils.defineModuleGetter(
- this,
- "AbuseReporter",
- "resource://gre/modules/AbuseReporter.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AbuseReporter: "resource://gre/modules/AbuseReporter.sys.mjs",
+});
const IS_DIALOG_WINDOW = window.arguments && window.arguments.length;
diff --git a/toolkit/mozapps/extensions/content/abuse-reports.js b/toolkit/mozapps/extensions/content/abuse-reports.js
index b5180734409e8..cf5fe27ee55d0 100644
--- a/toolkit/mozapps/extensions/content/abuse-reports.js
+++ b/toolkit/mozapps/extensions/content/abuse-reports.js
@@ -11,8 +11,8 @@
* helpers used for the Abuse Reporting submission (and related message bars).
*/
-const { AbuseReporter } = ChromeUtils.import(
- "resource://gre/modules/AbuseReporter.jsm"
+const { AbuseReporter } = ChromeUtils.importESModule(
+ "resource://gre/modules/AbuseReporter.sys.mjs"
);
// Message Bars definitions.
diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs b/toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs
index dadfb7f816ae4..c1de7964a7c04 100644
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs
@@ -666,8 +666,8 @@ export var AddonTestUtils = {
* The data to load.
*/
async loadBlocklistRawData(data) {
- const { BlocklistPrivate } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+ const { BlocklistPrivate } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
const blocklistMapping = {
extensions: BlocklistPrivate.ExtensionBlocklistRS,
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
index 7923c85e09a94..631d610af86ac 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
@@ -22,20 +22,12 @@ ChromeUtils.defineModuleGetter(
"AddonManagerPrivate",
"resource://gre/modules/AddonManager.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "Blocklist",
- "resource://gre/modules/Blocklist.jsm"
-);
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonSettings: "resource://gre/modules/addons/AddonSettings.sys.mjs",
+ Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
CertUtils: "resource://gre/modules/CertUtils.sys.mjs",
ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
});
-ChromeUtils.defineModuleGetter(
- lazy,
- "AddonSettings",
- "resource://gre/modules/addons/AddonSettings.jsm"
-);
import { Log } from "resource://gre/modules/Log.sys.mjs";
diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
index a255f61b31f54..81f7091d9353d 100644
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@@ -36,6 +36,9 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
});
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
+ AddonSettings: "resource://gre/modules/addons/AddonSettings.sys.mjs",
+ Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
ExtensionData: "resource://gre/modules/Extension.sys.mjs",
ExtensionUtils: "resource://gre/modules/ExtensionUtils.sys.mjs",
@@ -45,9 +48,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
- AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
- AddonSettings: "resource://gre/modules/addons/AddonSettings.jsm",
- Blocklist: "resource://gre/modules/Blocklist.jsm",
UpdateChecker: "resource://gre/modules/addons/XPIInstall.jsm",
XPIInstall: "resource://gre/modules/addons/XPIInstall.jsm",
XPIInternal: "resource://gre/modules/addons/XPIProvider.jsm",
diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
index 827476b35801b..8f122dea94cd9 100644
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -41,18 +41,19 @@ const { AddonManager, AddonManagerPrivate } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs",
+ AddonSettings: "resource://gre/modules/addons/AddonSettings.sys.mjs",
CertUtils: "resource://gre/modules/CertUtils.sys.mjs",
ExtensionData: "resource://gre/modules/Extension.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ ProductAddonChecker:
+ "resource://gre/modules/addons/ProductAddonChecker.sys.mjs",
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
- AddonSettings: "resource://gre/modules/addons/AddonSettings.jsm",
BuiltInThemesHelpers: "resource://gre/modules/addons/XPIDatabase.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
- ProductAddonChecker: "resource://gre/modules/addons/ProductAddonChecker.jsm",
AddonInternal: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIDatabase: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIInternal: "resource://gre/modules/addons/XPIProvider.jsm",
@@ -2879,8 +2880,8 @@ var UpdateChecker = function (
throw Components.Exception("", Cr.NS_ERROR_INVALID_ARG);
}
- ({ AddonUpdateChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonUpdateChecker.jsm"
+ ({ AddonUpdateChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonUpdateChecker.sys.mjs"
));
this.addon = aAddon;
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 05f15f7527c61..34333f90bc506 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -32,6 +32,7 @@ const { AppConstants } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AddonSettings: "resource://gre/modules/addons/AddonSettings.sys.mjs",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
Dictionary: "resource://gre/modules/Extension.sys.mjs",
Extension: "resource://gre/modules/Extension.sys.mjs",
@@ -44,7 +45,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- AddonSettings: "resource://gre/modules/addons/AddonSettings.jsm",
XPIDatabase: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIDatabaseReconcile: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIInstall: "resource://gre/modules/addons/XPIInstall.jsm",
diff --git a/toolkit/mozapps/extensions/test/browser/browser_addon_list_reordering.js b/toolkit/mozapps/extensions/test/browser/browser_addon_list_reordering.js
index 575e04b838488..3fd419032b8ef 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_addon_list_reordering.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_addon_list_reordering.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js b/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
index 48eb6af702bd1..a5a6de724ceb8 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
@@ -12,8 +12,8 @@
// (once on XUL views and once on the HTML views).
requestLongerTimeout(4);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_detail_permissions.js b/toolkit/mozapps/extensions/test/browser/browser_html_detail_permissions.js
index f7d50c49eaf5f..adf4e0a0d64e5 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_detail_permissions.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_detail_permissions.js
@@ -1,7 +1,7 @@
/* eslint max-len: ["error", 80] */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionPermissions } = ChromeUtils.importESModule(
"resource://gre/modules/ExtensionPermissions.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js b/toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js
index 3a68a1fea662e..a466b5c1a3496 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_detail_view.js
@@ -2,8 +2,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionPermissions } = ChromeUtils.importESModule(
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js b/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js
index dc27bede9450c..034a42be5ac36 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_clientid.js
@@ -5,8 +5,8 @@ const { ClientID } = ChromeUtils.importESModule(
"resource://gre/modules/ClientID.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_prefs.js b/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_prefs.js
index 427239e9db079..474cd424b9453 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_prefs.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_discover_view_prefs.js
@@ -1,8 +1,8 @@
/* eslint max-len: ["error", 80] */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js b/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
index 1661f923e28fe..527b8cfddce43 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
@@ -1,7 +1,7 @@
/* eslint max-len: ["error", 80] */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js b/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
index 083c72316c688..db4067ab3569e 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
@@ -3,8 +3,8 @@
/* eslint max-len: ["error", 80] */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js b/toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js
index 578b068118d32..29e4b1a4ec82c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_options_ui.js
@@ -1,7 +1,7 @@
/* eslint max-len: ["error", 80] */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionParent } = ChromeUtils.importESModule(
"resource://gre/modules/ExtensionParent.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_pending_updates.js b/toolkit/mozapps/extensions/test/browser/browser_html_pending_updates.js
index 5dc9f3850a931..f3616cd080741 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_pending_updates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_pending_updates.js
@@ -1,7 +1,7 @@
/* eslint max-len: ["error", 80] */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js b/toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js
index cc95f703dc7b8..045e58d706656 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_recommendations.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js b/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js
index 11015eb6d8c11..8376782762330 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js
@@ -1,8 +1,8 @@
/* eslint max-len: ["error", 80] */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_sitepermission_addons.js b/toolkit/mozapps/extensions/test/browser/browser_html_sitepermission_addons.js
index 7cded8ae34366..3c8ce5f447bb2 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_sitepermission_addons.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_sitepermission_addons.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { SITEPERMS_ADDON_PROVIDER_PREF, SITEPERMS_ADDON_TYPE } =
ChromeUtils.importESModule(
diff --git a/toolkit/mozapps/extensions/test/browser/browser_html_updates.js b/toolkit/mozapps/extensions/test/browser/browser_html_updates.js
index d394bd99f785c..33dba886cd8fd 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_html_updates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_html_updates.js
@@ -1,7 +1,7 @@
/* eslint max-len: ["error", 80] */
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_installtrigger_install.js b/toolkit/mozapps/extensions/test/browser/browser_installtrigger_install.js
index f66047f85f946..cd2c30be7e94c 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_installtrigger_install.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_installtrigger_install.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { PermissionTestUtils } = ChromeUtils.importESModule(
diff --git a/toolkit/mozapps/extensions/test/browser/browser_page_options_updates.js b/toolkit/mozapps/extensions/test/browser/browser_page_options_updates.js
index ac4b723e79b52..bd7572a0613c3 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_page_options_updates.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_page_options_updates.js
@@ -10,8 +10,8 @@ registerCleanupFunction(() => {
enableBackgroundUpdateTimer();
});
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const PREF_UPDATE_ENABLED = "extensions.update.enabled";
diff --git a/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js b/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js
index 2653dd323781e..d58eb8c02751b 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js
@@ -5,8 +5,8 @@
/*
* Test Permission Popup for Sideloaded Extensions.
*/
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const ADDON_ID = "addon1@test.mozilla.org";
const CUSTOM_THEME_ID = "theme1@test.mozilla.org";
diff --git a/toolkit/mozapps/extensions/test/browser/browser_reinstall.js b/toolkit/mozapps/extensions/test/browser/browser_reinstall.js
index ea31209314cdc..fa5d896745827 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_reinstall.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_reinstall.js
@@ -5,8 +5,8 @@
// Tests that upgrading bootstrapped add-ons behaves correctly while the
// manager is open
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const ID = "reinstall@tests.mozilla.org";
diff --git a/toolkit/mozapps/extensions/test/browser/browser_subframe_install.js b/toolkit/mozapps/extensions/test/browser/browser_subframe_install.js
index edfb5377bdec8..e9e8c7372860a 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_subframe_install.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_subframe_install.js
@@ -3,8 +3,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const XPI_URL = `${SECURE_TESTROOT}../xpinstall/amosigned.xpi`;
diff --git a/toolkit/mozapps/extensions/test/browser/browser_updatessl.js b/toolkit/mozapps/extensions/test/browser/browser_updatessl.js
index 7584c8656f1b5..9dbeec4a846e1 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_updatessl.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_updatessl.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-let { AddonUpdateChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonUpdateChecker.jsm"
+let { AddonUpdateChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonUpdateChecker.sys.mjs"
);
const updatejson = RELATIVE_DIR + "browser_updatessl.json";
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js b/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js
index 626987902b160..7a151347cc3cc 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
diff --git a/toolkit/mozapps/extensions/test/browser/browser_webext_incognito.js b/toolkit/mozapps/extensions/test/browser/browser_webext_incognito.js
index 46cf18a3ecca3..9180bbcf91f33 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_webext_incognito.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_webext_incognito.js
@@ -2,8 +2,8 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionPermissions } = ChromeUtils.importESModule(
"resource://gre/modules/ExtensionPermissions.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/browser/head_abuse_report.js b/toolkit/mozapps/extensions/test/browser/head_abuse_report.js
index c5870ce628a16..89daa2a219a73 100644
--- a/toolkit/mozapps/extensions/test/browser/head_abuse_report.js
+++ b/toolkit/mozapps/extensions/test/browser/head_abuse_report.js
@@ -12,11 +12,11 @@
/* global MockProvider, loadInitialView, closeView */
-const { AbuseReporter } = ChromeUtils.import(
- "resource://gre/modules/AbuseReporter.jsm"
+const { AbuseReporter } = ChromeUtils.importESModule(
+ "resource://gre/modules/AbuseReporter.sys.mjs"
);
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionCommon } = ChromeUtils.importESModule(
"resource://gre/modules/ExtensionCommon.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/browser/head_disco.js b/toolkit/mozapps/extensions/test/browser/head_disco.js
index b06f622fd0ec2..64c346f3ddf04 100644
--- a/toolkit/mozapps/extensions/test/browser/head_disco.js
+++ b/toolkit/mozapps/extensions/test/browser/head_disco.js
@@ -13,8 +13,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const {
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
index 6b6e5491bcc93..4cafb9474152e 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -39,25 +39,21 @@ var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-var { AddonRepository } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonRepository.jsm"
+var { AddonRepository } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonRepository.sys.mjs"
);
-var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
-ChromeUtils.defineModuleGetter(
- this,
- "Blocklist",
- "resource://gre/modules/Blocklist.jsm"
-);
ChromeUtils.defineModuleGetter(
this,
"HttpServer",
"resource://testing-common/httpd.js"
);
ChromeUtils.defineESModuleGetters(this, {
+ Blocklist: "resource://gre/modules/Blocklist.sys.mjs",
Extension: "resource://gre/modules/Extension.sys.mjs",
ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.sys.mjs",
ExtensionTestUtils:
@@ -1161,8 +1157,8 @@ async function mockGfxBlocklistItemsFromDisk(path) {
async function mockGfxBlocklistItems(items) {
const { generateUUID } = Services.uuid;
- const { BlocklistPrivate } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+ const { BlocklistPrivate } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
const client = RemoteSettings("gfx", {
bucketName: "blocklists",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/head.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/head.js
index f3c0c828a6f0f..4007ec6988ac1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/head.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/head.js
@@ -86,8 +86,8 @@ function enable_blocklist_v2_instead_of_useMLBF() {
Blocklist.allowDeprecatedBlocklistV2 = true;
Services.prefs.setBoolPref("extensions.blocklist.useMLBF", false);
// Sanity check: blocklist v2 has been enabled.
- const { BlocklistPrivate } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+ const { BlocklistPrivate } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
Assert.equal(
Blocklist.ExtensionBlocklist,
@@ -109,7 +109,7 @@ function getExtensionBlocklistMLBF() {
// pref is set to true.
const {
BlocklistPrivate: { ExtensionBlocklistMLBF },
- } = ChromeUtils.import("resource://gre/modules/Blocklist.jsm");
+ } = ChromeUtils.importESModule("resource://gre/modules/Blocklist.sys.mjs");
if (Blocklist.allowDeprecatedBlocklistV2) {
Assert.ok(
Services.prefs.getBoolPref("extensions.blocklist.useMLBF", false),
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_clients.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_clients.js
index 59a5007275f22..2ddb4fe514908 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_clients.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_clients.js
@@ -1,5 +1,5 @@
-const { BlocklistPrivate } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+const { BlocklistPrivate } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
const { Utils: RemoteSettingsUtils } = ChromeUtils.importESModule(
"resource://services-settings/Utils.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_regexp_split.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_regexp_split.js
index 0057a7fd7cc38..f48a6b9d8b6e6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_regexp_split.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_regexp_split.js
@@ -55,8 +55,8 @@ add_task(async function test_check_matching_works() {
extensions: BLOCKLIST_DATA,
});
- const { BlocklistPrivate } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+ const { BlocklistPrivate } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
let parsedEntries = BlocklistPrivate.ExtensionBlocklistRS._entries;
@@ -165,8 +165,8 @@ add_task(async function check_all_properties() {
],
});
- let { Blocklist } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+ let { Blocklist } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
// Check 'wrong' creator doesn't match.
Assert.ok(
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_targetapp_filter.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_targetapp_filter.js
index df1fc86174d15..b48700570e54a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_targetapp_filter.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_targetapp_filter.js
@@ -1,5 +1,5 @@
-const { BlocklistPrivate } = ChromeUtils.import(
- "resource://gre/modules/Blocklist.jsm"
+const { BlocklistPrivate } = ChromeUtils.importESModule(
+ "resource://gre/modules/Blocklist.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_telemetry.js b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_telemetry.js
index 72bc732f5cc71..cf1992b121cae 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_telemetry.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_telemetry.js
@@ -72,7 +72,7 @@ add_task(async function test_blocklist_lastModified_rs_scalars() {
ExtensionBlocklistMLBF,
ExtensionBlocklistRS,
},
- } = ChromeUtils.import("resource://gre/modules/Blocklist.jsm");
+ } = ChromeUtils.importESModule("resource://gre/modules/Blocklist.sys.mjs");
// Return a promise resolved when the recordRSBlocklistLastModified method
// has been called (by temporarily replacing the method with a function that
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_AbuseReporter.js b/toolkit/mozapps/extensions/test/xpcshell/test_AbuseReporter.js
index 4474a933e0cea..23420bd9111a4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_AbuseReporter.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_AbuseReporter.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-const { AbuseReporter, AbuseReportError } = ChromeUtils.import(
- "resource://gre/modules/AbuseReporter.jsm"
+const { AbuseReporter, AbuseReportError } = ChromeUtils.importESModule(
+ "resource://gre/modules/AbuseReporter.sys.mjs"
);
const { ClientID } = ChromeUtils.importESModule(
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js b/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js
index 8b04a747b823d..b3fca5bba6b50 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker.js
@@ -1,7 +1,7 @@
"use strict";
-const { ProductAddonChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/ProductAddonChecker.jsm"
+const { ProductAddonChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/ProductAddonChecker.sys.mjs"
);
const LocalFile = new Components.Constructor(
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker_signatures.js b/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker_signatures.js
index 4b4e136414f08..5ae61568ef3eb 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker_signatures.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_ProductAddonChecker_signatures.js
@@ -1,7 +1,7 @@
"use strict";
-const { ProductAddonChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/ProductAddonChecker.jsm"
+const { ProductAddonChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/ProductAddonChecker.sys.mjs"
);
Services.prefs.setBoolPref("media.gmp-manager.updateEnabled", true);
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js b/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js
index 050fcc5c74de0..a9a54291f067b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_db_path.js
@@ -1,5 +1,5 @@
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const DEFAULT_THEME_ID = "default-theme@mozilla.org";
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
index 6c065d903e9a0..9ddaf82bf3204 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck.js
@@ -4,8 +4,8 @@
// This verifies that AddonUpdateChecker works correctly
-const { AddonUpdateChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonUpdateChecker.jsm"
+const { AddonUpdateChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonUpdateChecker.sys.mjs"
);
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck_json.js b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck_json.js
index f48d41aabd7c8..3151c1c2961c1 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck_json.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updatecheck_json.js
@@ -12,8 +12,8 @@ const TOOLKIT_MINVERSION = "42.0a1";
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "42.0a2", "42.0a2");
-const { AddonUpdateChecker } = ChromeUtils.import(
- "resource://gre/modules/addons/AddonUpdateChecker.jsm"
+const { AddonUpdateChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/addons/AddonUpdateChecker.sys.mjs"
);
let testserver = createHttpServer();
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js b/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js
index f873ee64f2d96..28d93f41b86de 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_trigger.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js b/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js
index e7e80352eb351..d7c0b9539d04b 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_amosigned_url.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_containers.js b/toolkit/mozapps/extensions/test/xpinstall/browser_containers.js
index 421067299ced1..4aa6db40f025a 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_containers.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_containers.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js b/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js
index 364e4f09f7569..08ec7e41cb72c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_datauri.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js b/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js
index cc07490a565e0..cab0e91734256 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js
@@ -5,8 +5,8 @@
// TODO(Bug 1789718): adapt to synthetic addon type implemented by the SitePermAddonProvider
// or remove if redundant, after the deprecated XPIProvider-based implementation is also removed.
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionPermissions } = ChromeUtils.importESModule(
"resource://gre/modules/ExtensionPermissions.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_privatebrowsing.js b/toolkit/mozapps/extensions/test/xpinstall/browser_privatebrowsing.js
index e8d04759e06be..45873e2eff816 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_privatebrowsing.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_privatebrowsing.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
let gDidSeeChannel = false;
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_required_useractivation.js b/toolkit/mozapps/extensions/test/xpinstall/browser_required_useractivation.js
index 064249f0cb3b2..6c8894699dc66 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_required_useractivation.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_required_useractivation.js
@@ -4,8 +4,8 @@
"use strict";
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
AddonTestUtils.initMochitest(this);
diff --git a/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js b/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js
index 7587b3ef7ffc2..5c67c59fe0e78 100644
--- a/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js
@@ -1,5 +1,5 @@
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { getAppInfo } = ChromeUtils.importESModule(
"resource://testing-common/AppInfo.sys.mjs"
diff --git 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
index 0a489351b6bdf..277ea993ecb0a 100644
--- 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
@@ -12,8 +12,8 @@ const { BackgroundUpdate } = ChromeUtils.importESModule(
let reasons = () => BackgroundUpdate._reasonsToNotScheduleUpdates();
let REASON = BackgroundUpdate.REASON;
-const { AddonTestUtils } = ChromeUtils.import(
- "resource://testing-common/AddonTestUtils.jsm"
+const { AddonTestUtils } = ChromeUtils.importESModule(
+ "resource://testing-common/AddonTestUtils.sys.mjs"
);
const { ExtensionTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
--
GitLab