corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Depends on D179819

Differential Revision: https://phabricator.services.mozilla.com/D179820
This commit is contained in:
Mark Banner
2023-06-02 20:00:35 +00:00
parent 5a90e5e600
commit 232facd440
146 changed files with 299 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/webextensions/browser_extension_sideloading.js
View File

@@ -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);

4
browser/base/content/test/webextensions/browser_extension_update_background.js
View File

@@ -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);

4
browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
View File

@@ -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);

8
browser/base/content/test/webextensions/head.js
View File

@@ -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/",

2
browser/components/BrowserGlue.sys.mjs
View File

@@ -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",

4
browser/components/enterprisepolicies/tests/xpcshell/test_addon_update.js
View File

@@ -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"

4
browser/components/enterprisepolicies/tests/xpcshell/test_extensions.js
View File

@@ -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"

4
browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js
View File

@@ -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"

4
browser/components/enterprisepolicies/tests/xpcshell/test_policy_search_engine.js
View File

@@ -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);

8
browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
View File

@@ -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,

4
browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload_smoketest.js
View File

@@ -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) {

4
browser/components/extensions/test/browser/browser_ext_management.js
View File

@@ -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);

4
browser/components/extensions/test/browser/browser_ext_search.js
View File

@@ -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";

4
browser/components/extensions/test/browser/browser_ext_search_favicon.js
View File

@@ -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"

2
browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js
View File

@@ -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";

4
browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js
View File

@@ -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);

4
browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
View File

@@ -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);

4
browser/components/extensions/test/browser/browser_ext_windows_create_params.js
View File

@@ -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);

8
browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js
View File

@@ -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"

4
browser/components/extensions/test/xpcshell/test_ext_bookmarks.js
View File

@@ -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, {

4
browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js
View File

@@ -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, {

4
browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
View File

@@ -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, {

4
browser/components/extensions/test/xpcshell/test_ext_history.js
View File

@@ -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, {

4
browser/components/extensions/test/xpcshell/test_ext_homepage_overrides_private.js
View File

@@ -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(

4
browser/components/extensions/test/xpcshell/test_ext_menu_startup.js
View File

@@ -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);

4
browser/components/extensions/test/xpcshell/test_ext_normandyAddonStudy.js
View File

@@ -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;

4
browser/components/extensions/test/xpcshell/test_ext_pageAction_shutdown.js
View File

@@ -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 } =

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js
View File

@@ -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(

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search.js
View File

@@ -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"

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js
View File

@@ -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"

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_shutdown.js
View File

@@ -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.

4
browser/components/extensions/test/xpcshell/test_ext_settings_validate.js
View File

@@ -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(

4
browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js
View File

@@ -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 {

4
browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab_update.js
View File

@@ -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 {

4
browser/components/extensions/test/xpcshell/test_ext_urlbar.js
View File

@@ -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, {

4
browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
View File

@@ -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",
});

4
browser/components/newtab/test/browser/browser_aboutwelcome_attribution.js
View File

@@ -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 = {

4
browser/components/newtab/test/browser/browser_aboutwelcome_rtamo.js
View File

@@ -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"

2
browser/components/newtab/test/browser/browser_asrouter_targeting.js
View File

@@ -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",

4
browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js
View File

@@ -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"

4
browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js
View File

@@ -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 = {

6
browser/components/preferences/dialogs/browserLanguages.js
View File

@@ -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(

4
browser/components/preferences/tests/browser_browser_languages_subdialog.js
View File

@@ -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);

4
browser/components/preferences/tests/browser_extension_controlled.js
View File

@@ -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);

4
browser/components/preferences/tests/browser_searchChangedEngine.js
View File

@@ -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"

4
browser/components/preferences/tests/browser_searchScroll.js
View File

@@ -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"

4
browser/components/search/test/browser/browser_contextmenu.js
View File

@@ -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);

5
browser/components/search/test/browser/head.js
View File

@@ -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"

2
browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs
View File

@@ -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",
});

2
browser/components/urlbar/tests/unit/head.js
View File

@@ -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",
});

4
browser/extensions/formautofill/test/unit/head.js
View File

@@ -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"

4
browser/extensions/search-detection/tests/browser/browser_client_side_redirection.js
View File

@@ -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(

4
browser/extensions/search-detection/tests/browser/browser_server_side_redirection.js
View File

@@ -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(

4
browser/themes/test/browser/browser_expireThemes.js
View File

@@ -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, {

4
devtools/server/tests/xpcshell/head_dbg.js
View File

@@ -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"

2
docshell/test/unit/head_docshell.js
View File

@@ -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",
});

8
dom/midi/tests/browser_midi_permission_gated.js
View File

@@ -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({

4
dom/promise/tests/unit/test_promise_unhandled_rejection.js
View File

@@ -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"

4
dom/streams/test/xpcshell/fetch.js
View File

@@ -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);

4
dom/workers/test/xpcshell/test_ext_redirects_sw_scripts.js
View File

@@ -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(

4
dom/workers/test/xpcshell/test_remoteworker_launch_new_process.js
View File

@@ -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;

5
intl/locale/LangPackMatcher.sys.mjs
View File

@@ -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",
});

4
js/xpconnect/tests/unit/test_compileScript.js
View File

@@ -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);

2
js/xpconnect/tests/unit/test_getCallerLocation.js
View File

@@ -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/");

2
mobile/android/chrome/geckoview/geckoview.js
View File

@@ -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",
});

9
mobile/android/components/extensions/test/xpcshell/head.js
View File

@@ -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);

4
modules/libpref/test/unit/test_parsePrefs.js
View File

@@ -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);

4
netwerk/cookie/CookieXPCShellUtils.sys.mjs
View File

@@ -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) {

8
services/sync/modules/addonutils.sys.mjs
View File

@@ -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");

8
services/sync/modules/engines/addons.sys.mjs
View File

@@ -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;

4
services/sync/tests/unit/head_helpers.js
View File

@@ -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"

5
toolkit/components/extensions/Extension.sys.mjs
View File

@@ -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",
});

6
toolkit/components/extensions/ExtensionXPCShellUtils.sys.mjs
View File

@@ -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",

9
toolkit/components/extensions/parent/ext-theme.js
View File

@@ -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();

4
toolkit/components/extensions/test/browser/browser_ext_extension_page_tab_navigated.js
View File

@@ -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

4
toolkit/components/extensions/test/browser/browser_ext_process_crash_handling.js
View File

@@ -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 } =

4
toolkit/components/extensions/test/browser/browser_ext_themes_experiment.js
View File

@@ -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

4
toolkit/components/extensions/test/browser/browser_ext_themes_warnings.js
View File

@@ -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.

4
toolkit/components/extensions/test/xpcshell/head.js
View File

@@ -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, {

4
toolkit/components/extensions/test/xpcshell/test_ext_experiments.js
View File

@@ -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);

4
toolkit/components/normandy/test/browser/head.js
View File

@@ -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"

4
toolkit/components/normandy/test/unit/test_addon_unenroll.js
View File

@@ -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"

4
toolkit/components/places/tests/unit/head_bookmarks.js
View File

@@ -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);

2
toolkit/components/search/tests/SearchTestUtils.sys.mjs
View File

@@ -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;

4
toolkit/components/search/tests/xpcshell/head_search.js
View File

@@ -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"

2
toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
View File

@@ -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",
});

2
toolkit/components/telemetry/tests/unit/head.js
View File

@@ -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",
});

4
toolkit/modules/GMPInstallManager.sys.mjs
View File

@@ -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 = {};

4
toolkit/modules/LightweightThemeConsumer.sys.mjs
View File

@@ -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);

4
toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
View File

@@ -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(

4
toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
View File

@@ -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"

7
toolkit/mozapps/extensions/AddonManager.jsm
View File

@@ -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",

2
toolkit/mozapps/extensions/content/aboutaddons.js
View File

@@ -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", () => {

4
toolkit/mozapps/extensions/content/aboutaddonsCommon.js
View File

@@ -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"

8
toolkit/mozapps/extensions/content/abuse-report-panel.js
View File

@@ -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;

4
toolkit/mozapps/extensions/content/abuse-reports.js
View File

@@ -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.

4
toolkit/mozapps/extensions/internal/AddonTestUtils.sys.mjs
View File

@@ -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,

12
toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
View File

@@ -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";

6
toolkit/mozapps/extensions/internal/XPIDatabase.jsm
View File

@@ -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",

11
toolkit/mozapps/extensions/internal/XPIInstall.jsm
View File

@@ -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;

Some files were not shown because too many files have changed in this diff Show More