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

Bug 1834204 - Update more consumers to import ES modules directly. r=kpatenio,geckoview-reviewers,whimboo,m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D178590
This commit is contained in:
Mark Banner
2023-05-26 11:36:33 +00:00
parent 775c509402
commit 81c86b200c
84 changed files with 163 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/actors/AboutNewTabChild.sys.mjs
View File

@@ -4,13 +4,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
import { PrivateBrowsingUtils } from "resource://gre/modules/PrivateBrowsingUtils.sys.mjs";
const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
const lazy = {};

3
browser/base/content/test/static/browser_all_files_referenced.js
View File

@@ -281,9 +281,6 @@ var whitelist = [
// toolkit/xre/MacRunFromDmgUtils.mm
{ file: "resource://gre/localization/en-US/toolkit/global/run-from-dmg.ftl" },
// References to esm generated from jsm programmatically
{ file: "resource://gre/modules/LangPackMatcher.sys.mjs" },
// Referenced by screenshots extension
{ file: "chrome://browser/content/screenshots/cancel.svg" },
{ file: "chrome://browser/content/screenshots/copy.svg" },

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

@@ -55,6 +55,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
@@ -93,7 +94,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
"resource://activity-stream/lib/OnboardingMessageProvider.jsm",
PageActions: "resource:///modules/PageActions.jsm",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
TabUnloader: "resource:///modules/TabUnloader.jsm",
});

5
browser/components/aboutlogins/AboutLoginsParent.sys.mjs
View File

@@ -16,14 +16,11 @@ ChromeUtils.defineESModuleGetters(lazy, {
LoginCSVImport: "resource://gre/modules/LoginCSVImport.sys.mjs",
LoginExport: "resource://gre/modules/LoginExport.sys.mjs",
LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs",
OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
UIState: "resource://services-sync/UIState.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
MigrationUtils: "resource:///modules/MigrationUtils.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
return lazy.LoginHelper.createLogger("AboutLoginsParent");
});

7
browser/components/customizableui/CustomizableWidgets.sys.mjs
View File

@@ -10,16 +10,13 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
RecentlyClosedTabsAndWindowsMenuUtils:
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Sanitizer: "resource:///modules/Sanitizer.jsm",
});
const kPrefCustomizationDebug = "browser.uiCustomization.debug";

4
browser/components/downloads/test/unit/test_DownloadLastDir_basics.js
View File

@@ -10,8 +10,8 @@ const SAVE_PER_SITE_PREF = SAVE_PER_SITE_PREF_BRANCH + ".savePerSite";
let { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
let { DownloadLastDir } = ChromeUtils.import(
"resource://gre/modules/DownloadLastDir.jsm"
let { DownloadLastDir } = ChromeUtils.importESModule(
"resource://gre/modules/DownloadLastDir.sys.mjs"
);
add_task(

5
browser/components/extensions/ExtensionBrowsingData.jsm
View File

@@ -21,10 +21,7 @@ XPCOMUtils.defineLazyGetter(lazy, "makeRange", () => {
ChromeUtils.defineESModuleGetters(lazy, {
Preferences: "resource://gre/modules/Preferences.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Sanitizer: "resource:///modules/Sanitizer.jsm",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
});
class BrowsingDataDelegate {

6
browser/components/extensions/test/xpcshell/test_ext_browsingData_settings.js
View File

@@ -4,12 +4,8 @@
ChromeUtils.defineESModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.sys.mjs",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
});
ChromeUtils.defineModuleGetter(
this,
"Sanitizer",
"resource:///modules/Sanitizer.jsm"
);
const PREF_DOMAIN = "privacy.cpd.";
const SETTINGS_LIST = [

11
browser/components/migration/FileMigrators.sys.mjs
View File

@@ -5,8 +5,10 @@
const lazy = {};
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginCSVImport: "resource://gre/modules/LoginCSVImport.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
LoginCSVImport: "resource://gre/modules/LoginCSVImport.sys.mjs",
MigrationWizardConstants:
"chrome://browser/content/migration/migration-wizard-constants.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "gFluentStrings", function () {
@@ -16,11 +18,6 @@ XPCOMUtils.defineLazyGetter(lazy, "gFluentStrings", function () {
]);
});
ChromeUtils.defineESModuleGetters(lazy, {
MigrationWizardConstants:
"chrome://browser/content/migration/migration-wizard-constants.mjs",
});
/**
* Base class for a migration that involves reading a single file off of
* the disk that the user picks using a file picker. The file might be

4
browser/components/migration/MigrationUtils.sys.mjs
View File

@@ -898,8 +898,8 @@ class MigrationUtils {
async insertCreditCardsWrapper(cards) {
this._importQuantities.cards += cards.length;
let { formAutofillStorage } = ChromeUtils.import(
"resource://autofill/FormAutofillStorage.jsm"
let { formAutofillStorage } = ChromeUtils.importESModule(
"resource://autofill/FormAutofillStorage.sys.mjs"
);
await formAutofillStorage.initialize();

4
browser/components/migration/tests/unit/test_PasswordFileMigrator.js
View File

@@ -6,8 +6,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
const { PasswordFileMigrator } = ChromeUtils.importESModule(
"resource:///modules/FileMigrators.sys.mjs"
);
const { LoginCSVImport } = ChromeUtils.import(
"resource://gre/modules/LoginCSVImport.jsm"
const { LoginCSVImport } = ChromeUtils.importESModule(
"resource://gre/modules/LoginCSVImport.sys.mjs"
);
const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"

5
browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
View File

@@ -16,6 +16,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
FxAccounts: "resource://gre/modules/FxAccounts.sys.mjs",
LangPackMatcher: "resource://gre/modules/LangPackMatcher.sys.mjs",
ShellService: "resource:///modules/ShellService.sys.mjs",
SpecialMessageActions:
"resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
@@ -23,14 +24,10 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AboutWelcomeTelemetry:
"resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm",
AboutWelcomeDefaults:
"resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm",
LangPackMatcher: "resource://gre/modules/LangPackMatcher.jsm",
AWScreenUtils: "resource://activity-stream/lib/AWScreenUtils.jsm",
});

2
browser/components/newtab/lib/ASRouter.jsm
View File

@@ -21,6 +21,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
TargetingContext: "resource://messaging-system/targeting/Targeting.sys.mjs",
Utils: "resource://services-settings/Utils.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -41,7 +42,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
"resource://activity-stream/lib/ASRouterTriggerListeners.jsm",
KintoHttpClient: "resource://services-common/kinto-http-client.js",
RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
XPCOMUtils.defineLazyServiceGetters(lazy, {

6
browser/components/newtab/lib/ActivityStream.jsm
View File

@@ -16,6 +16,7 @@ ChromeUtils.defineModuleGetter(
);
ChromeUtils.defineESModuleGetters(lazy, {
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
});
@@ -99,11 +100,6 @@ ChromeUtils.defineModuleGetter(
"DiscoveryStreamFeed",
"resource://activity-stream/lib/DiscoveryStreamFeed.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"NimbusFeatures",
"resource://nimbus/ExperimentAPI.jsm"
);
const REGION_BASIC_CONFIG =
"browser.newtabpage.activity-stream.discoverystream.region-basic-config";

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

@@ -1,7 +1,7 @@
"use strict";
const { getAddonAndLocalAPIsMocker } = ChromeUtils.import(
"resource://testing-common/LangPackMatcherTestUtils.jsm"
const { getAddonAndLocalAPIsMocker } = ChromeUtils.importESModule(
"resource://testing-common/LangPackMatcherTestUtils.sys.mjs"
);
const { AWScreenUtils } = ChromeUtils.import(

11
browser/components/newtab/test/browser/browser_topsites_annotation.js
View File

@@ -11,18 +11,11 @@ if (AppConstants.platform === "macosx") {
requestLongerTimeout(2);
}
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs",
});
const OPEN_TYPE = {

4
browser/components/places/tests/browser/browser_library_telemetry.js
View File

@@ -4,8 +4,8 @@
"use strict";
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
// Visited pages listed by descending visit date.

4
browser/components/places/tests/browser/browser_sidebar_bookmarks_telemetry.js
View File

@@ -4,8 +4,8 @@
"use strict";
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
let bookmarks;
let folder;

4
browser/components/places/tests/browser/browser_sidebar_history_telemetry.js
View File

@@ -4,8 +4,8 @@
"use strict";
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
const firstNodeIndex = 0;

4
browser/components/places/tests/unit/test_clearHistory_shutdown.js
View File

@@ -17,7 +17,9 @@ const URIS = [
const FTP_URL = "ftp://localhost/clearHistoryOnShutdown/";
const { Sanitizer } = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
const { Sanitizer } = ChromeUtils.importESModule(
"resource:///modules/Sanitizer.sys.mjs"
);
// Send the profile-after-change notification to the form history component to ensure
// that it has been initialized.

2
browser/components/preferences/preferences.js
View File

@@ -87,6 +87,7 @@ ChromeUtils.defineESModuleGetters(this, {
FeatureGate: "resource://featuregates/FeatureGate.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
FirefoxRelay: "resource://gre/modules/FirefoxRelay.sys.mjs",
LangPackMatcher: "resource://gre/modules/LangPackMatcher.sys.mjs",
LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
@@ -106,7 +107,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
"resource://gre/modules/ExtensionPreferencesManager.jsm",
ExtensionSettingsStore: "resource://gre/modules/ExtensionSettingsStore.jsm",
HomePage: "resource:///modules/HomePage.jsm",
LangPackMatcher: "resource://gre/modules/LangPackMatcher.jsm",
SelectionChangedMenulist: "resource:///modules/SelectionChangedMenulist.jsm",
SiteDataManager: "resource:///modules/SiteDataManager.jsm",
TransientPrefs: "resource:///modules/TransientPrefs.jsm",

5
browser/components/preferences/tests/browser_contentblocking.js
View File

@@ -32,8 +32,9 @@ const ISOLATE_UI_PREF =
"browser.contentblocking.reject-and-isolate-cookies.preferences.ui.enabled";
const FPI_PREF = "privacy.firstparty.isolate";
const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
"resource://testing-common/EnterprisePolicyTesting.jsm"
const { EnterprisePolicyTesting, PoliciesPrefTracker } =
ChromeUtils.importESModule(
"resource://testing-common/EnterprisePolicyTesting.sys.mjs"
);
requestLongerTimeout(2);

8
browser/components/preferences/tests/siteData/head.js
View File

@@ -26,11 +26,9 @@ const TEST_SERVICE_WORKER_URL =
const REMOVE_DIALOG_URL =
"chrome://browser/content/preferences/dialogs/siteDataRemoveSelected.xhtml";
ChromeUtils.defineModuleGetter(
this,
"SiteDataTestUtils",
"resource://testing-common/SiteDataTestUtils.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
SiteDataTestUtils: "resource://testing-common/SiteDataTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyServiceGetter(
this,

8
browser/components/resistfingerprinting/test/browser/browser_animationapi_iframes.js
View File

@@ -19,11 +19,9 @@
requestLongerTimeout(3);
ChromeUtils.defineModuleGetter(
this,
"AppConstants",
"resource://gre/modules/AppConstants.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
// =============================================================================================
// =============================================================================================

8
browser/components/resistfingerprinting/test/browser/browser_reduceTimePrecision_iframes.js
View File

@@ -19,11 +19,9 @@
requestLongerTimeout(3);
ChromeUtils.defineModuleGetter(
this,
"AppConstants",
"resource://gre/modules/AppConstants.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
});
// =============================================================================================
// =============================================================================================

15
browser/components/screenshots/fileHelpers.mjs
View File

@@ -2,27 +2,20 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
DownloadLastDir: "resource://gre/modules/DownloadLastDir.sys.mjs",
DownloadPaths: "resource://gre/modules/DownloadPaths.sys.mjs",
Downloads: "resource://gre/modules/Downloads.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Downloads: "resource://gre/modules/Downloads.jsm",
DownloadPaths: "resource://gre/modules/DownloadPaths.jsm",
});
/**
* Gets the filename automatically or by a file picker depending on "browser.download.useDownloadDir"
* @param filenameTitle The title of the current page

4
browser/components/screenshots/tests/browser/head.js
View File

@@ -316,8 +316,8 @@ class ScreenshotsHelper {
async zoomBrowser(zoom) {
await SpecialPowers.spawn(this.browser, [zoom], zoomLevel => {
const { Layout } = ChromeUtils.import(
"chrome://mochitests/content/browser/accessible/tests/browser/Layout.jsm"
const { Layout } = ChromeUtils.importESModule(
"chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs"
);
Layout.zoomDocument(content.document, zoomLevel);
});

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

@@ -5,8 +5,8 @@
// Test whether a visit information is annotated correctly when searching on searchbar.
XPCOMUtils.defineLazyModuleGetters(this, {
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
ChromeUtils.defineESModuleGetters(this, {
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
});
const FRECENCY = {

5
browser/components/urlbar/UrlbarController.sys.mjs
View File

@@ -2,9 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
const lazy = {};

6
browser/components/urlbar/UrlbarProviderContextualSearch.sys.mjs
View File

@@ -2,9 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import {
UrlbarProvider,
@@ -14,6 +12,7 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
@@ -22,7 +21,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.jsm",
});
const DYNAMIC_RESULT_TYPE = "contextualSearch";

2
browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
View File

@@ -16,6 +16,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
NLP: "resource://gre/modules/NLP.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
@@ -23,7 +24,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "appUpdater", () => new lazy.AppUpdater());

4
browser/components/urlbar/tests/quicksuggest/browser/browser_telemetry_dynamicWikipedia.js
View File

@@ -7,9 +7,9 @@
"use strict";
XPCOMUtils.defineLazyModuleGetters(this, {
ChromeUtils.defineESModuleGetters(this, {
CONTEXTUAL_SERVICES_PING_TYPES:
"resource:///modules/PartnerLinkAttribution.jsm",
"resource:///modules/PartnerLinkAttribution.sys.mjs",
});
const { TELEMETRY_SCALARS } = UrlbarProviderQuickSuggest;

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

@@ -6,8 +6,8 @@ const { AddressComparison, AddressComponent } = ChromeUtils.importESModule(
"resource://gre/modules/shared/AddressComponent.sys.mjs"
);
const { FormAutofill } = ChromeUtils.import(
"resource://autofill/FormAutofill.jsm"
const { FormAutofill } = ChromeUtils.importESModule(
"resource://autofill/FormAutofill.sys.mjs"
);
const BOTH_EMPTY = AddressComparison.BOTH_EMPTY;

4
devtools/client/debugger/test/mochitest/browser_dbg-backgroundtask-debugging.js
View File

@@ -26,8 +26,8 @@ Services.scriptloader.loadSubScript(
this
);
const { BackgroundTasksTestUtils } = ChromeUtils.import(
"resource://testing-common/BackgroundTasksTestUtils.jsm"
const { BackgroundTasksTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/BackgroundTasksTestUtils.sys.mjs"
);
BackgroundTasksTestUtils.init(this);
const do_backgroundtask = BackgroundTasksTestUtils.do_backgroundtask.bind(

6
devtools/client/framework/browser-toolbox/Launcher.sys.mjs
View File

@@ -20,12 +20,8 @@ import { Subprocess } from "resource://gre/modules/Subprocess.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"BackgroundTasksUtils",
"resource://gre/modules/BackgroundTasksUtils.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
BackgroundTasksUtils: "resource://gre/modules/BackgroundTasksUtils.sys.mjs",
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
});

4
devtools/client/storage/test/browser_storage_dfpi.js
View File

@@ -7,8 +7,8 @@
"use strict";
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
// Ensure iframe.src in storage-dfpi.html starts with PREFIX.

4
devtools/client/storage/test/browser_storage_dfpi_always_partition_storage.js
View File

@@ -8,8 +8,8 @@
"use strict";
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
// Ensure iframe.src in storage-dfpi.html starts with PREFIX.

8
devtools/server/actors/descriptors/tab.js
View File

@@ -21,11 +21,9 @@ const {
connectToFrame,
} = require("resource://devtools/server/connectors/frame-connector.js");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"PlacesUtils",
"resource://gre/modules/PlacesUtils.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"

4
devtools/shared/commands/resource/tests/browser_resources_target_destroy.js
View File

@@ -35,8 +35,8 @@ add_task(async function () {
const { require } = ChromeUtils.importESModule(
"resource://devtools/shared/loader/Loader.sys.mjs"
);
const { TargetActorRegistry } = ChromeUtils.import(
"resource://devtools/server/actors/targets/target-actor-registry.jsm"
const { TargetActorRegistry } = ChromeUtils.importESModule(
"resource://devtools/server/actors/targets/target-actor-registry.sys.mjs"
);
const {
getResourceWatcher,

2
devtools/shared/test-helpers/thread-helpers.sys.mjs
View File

@@ -7,6 +7,8 @@
**/
function getSandboxWithDebuggerSymbol() {
// Bug 1835268 - Changing this to an ES module import currently throws an
// assertion in test_javascript_tracer.js in debug builds.
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
);

4
dom/media/test/manifest.js
View File

@@ -1,5 +1,5 @@
const { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
const { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
// In each list of tests below, test file types that are not supported should

4
dom/media/webrtc/tests/mochitests/pc.js
View File

@@ -2481,8 +2481,8 @@ var setupIceServerConfig = useIceServer => {
};
async function runNetworkTest(testFunction, fixtureOptions = {}) {
let { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
let { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
await scriptsReady;

4
dom/security/test/general/browser_test_referrer_loadInOtherProcess.js
View File

@@ -77,8 +77,8 @@ var checkResult = async function (isRemote, browserKey, uri) {
sessionHistory.count - 1
);
var { E10SUtils } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/E10SUtils.jsm"
var { E10SUtils } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/E10SUtils.sys.mjs"
);
Assert.equal(entry.URI.spec, args.uri, "Uri should be correct");

4
dom/tests/mochitest/general/test_interfaces.js
View File

@@ -32,8 +32,8 @@
// channel/OS) or one of the is* constants below (in cases when
// exposure is affected by channel or OS in a nontrivial way).
const { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
const { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const isNightly = AppConstants.NIGHTLY_BUILD;

4
dom/webauthn/tests/u2futil.js
View File

@@ -16,8 +16,8 @@ const cose_crv_P256 = 1;
const cose_crv_x = -2;
const cose_crv_y = -3;
var { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
var { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
function handleEventMessage(event) {

4
dom/workers/test/test_navigator_iframe.js
View File

@@ -55,8 +55,8 @@ worker.onerror = function (event) {
SimpleTest.finish();
};
var { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
var { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
var isNightly = AppConstants.NIGHTLY_BUILD;
var isRelease = AppConstants.RELEASE_OR_BETA;

4
dom/workers/test/worker_driver.js
View File

@@ -34,8 +34,8 @@ function workerTestExec(script) {
} else if (event.data.type == "status") {
ok(event.data.status, event.data.msg);
} else if (event.data.type == "getHelperData") {
const { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
const { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const isNightly = AppConstants.NIGHTLY_BUILD;
const isEarlyBetaOrEarlier = AppConstants.EARLY_BETA_OR_EARLIER;

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

@@ -4,8 +4,8 @@
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { AddonTestUtils } = ChromeUtils.import(

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

@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"

4
mobile/android/components/extensions/test/mochitest/head.js
View File

@@ -2,8 +2,8 @@
/* exported assertPersistentListeners, AppConstants, TEST_ICON_ARRAYBUFFER */
var { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
var { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
var TEST_ICON_DATA =

4
netwerk/test/browser/browser_bug1629307.js
View File

@@ -7,8 +7,8 @@
// Load a web page containing an iframe that requires authentication but includes the X-Frame-Options: SAMEORIGIN header.
// Make sure that we don't needlessly show an authentication prompt for it.
const { PromptTestUtils } = ChromeUtils.import(
"resource://testing-common/PromptTestUtils.jsm"
const { PromptTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PromptTestUtils.sys.mjs"
);
add_task(async function () {

4
netwerk/test/browser/early_hint_main_redirect.sjs
View File

@@ -3,7 +3,9 @@
// In an SJS file we need to get the setTimeout bits ourselves, despite
// what eslint might think applies for browser tests.
// eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
let { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
let { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
async function handleRequest(request, response) {
let hinted =

4
netwerk/test/httpserver/httpd.js
View File

@@ -49,8 +49,8 @@ var DEBUG = false; // non-const *only* so tweakable in server tests
/** True if debugging output should be timestamped. */
var DEBUG_TIMESTAMP = false; // non-const so tweakable in server tests
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
/**

2
netwerk/test/unit/test_retry_0rtt.js
View File

@@ -18,7 +18,7 @@ function handlerCount(path) {
return handlerCallbacks[path] || 0;
}
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.importESModule("resource://gre/modules/AppConstants.sys.mjs");
// Bug 1805371: Tests that require FaultyServer can't currently be built
// with system NSS.

4
netwerk/test/unit/test_trr_telemetry.js
View File

@@ -9,8 +9,8 @@ Services.prefs.setBoolPref(
true
);
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
function setup() {

5
security/manager/ssl/tests/unit/test_sss_sanitizeOnShutdown.js
View File

@@ -7,13 +7,10 @@
// service data on shutdown if configured to do so.
ChromeUtils.defineESModuleGetters(this, {
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
Sanitizer: "resource:///modules/Sanitizer.jsm",
});
Sanitizer.onStartup();
// This helps us away from test timed out. If service worker manager(swm) hasn't

5
services/sync/modules/SyncDisconnect.sys.mjs
View File

@@ -12,14 +12,11 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
Log: "resource://gre/modules/Log.sys.mjs",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
Utils: "resource://services-sync/util.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Sanitizer: "resource:///modules/Sanitizer.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
return ChromeUtils.importESModule(
"resource://gre/modules/FxAccounts.sys.mjs"

2
testing/specialpowers/content/SpecialPowersParent.sys.mjs
View File

@@ -11,13 +11,13 @@ ChromeUtils.defineESModuleGetters(lazy, {
HiddenFrame: "resource://gre/modules/HiddenFrame.sys.mjs",
PerTestCoverageUtils:
"resource://testing-common/PerTestCoverageUtils.sys.mjs",
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.sys.mjs",
SpecialPowersSandbox: "resource://specialpowers/SpecialPowersSandbox.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.jsm",
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
});
class SpecialPowersError extends Error {

4
toolkit/components/antitracking/test/browser/browser_partitionedClearSiteDataHeader.js
View File

@@ -9,8 +9,8 @@
* we clear storage under the correct partition.
*/
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
const HOST_A = "example.com";

4
toolkit/components/antitracking/test/xpcshell/test_purge_trackers.js
View File

@@ -12,8 +12,8 @@ const FOREIGN_PAGE3 = "https://example.net^partitionKey=(https,example.org)";
const { UrlClassifierTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/UrlClassifierTestUtils.sys.mjs"
);
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
const { PermissionTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PermissionTestUtils.sys.mjs"

4
toolkit/components/antitracking/test/xpcshell/test_purge_trackers_telemetry.js
View File

@@ -7,8 +7,8 @@ const BENIGN_PAGE = "https://example.com";
const { UrlClassifierTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/UrlClassifierTestUtils.sys.mjs"
);
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
const { PermissionTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PermissionTestUtils.sys.mjs"

4
toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_removeDirectory.js
View File

@@ -7,8 +7,8 @@
// This test exercises functionality and also ensures the exit codes,
// which are a public API, do not change over time.
const { EXIT_CODE } = ChromeUtils.import(
"resource://gre/modules/BackgroundTasksManager.jsm"
const { EXIT_CODE } = ChromeUtils.importESModule(
"resource://gre/modules/BackgroundTasksManager.sys.mjs"
);
const LEAF_NAME = "newCacheFolder";

4
toolkit/components/cookiebanners/test/browser/browser_cookiebanner_telemetry.js
View File

@@ -3,8 +3,8 @@
"use strict";
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
const { MODE_DISABLED, MODE_REJECT, MODE_REJECT_OR_ACCEPT, MODE_UNSET } =

4
toolkit/components/cookiebanners/test/browser/browser_cookieinjector.js
View File

@@ -3,8 +3,8 @@
"use strict";
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
const DOMAIN_A = "example.com";

4
toolkit/components/cookiebanners/test/browser/browser_cookieinjector_events.js
View File

@@ -3,8 +3,8 @@
"use strict";
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
add_setup(cookieInjectorTestSetup);

4
toolkit/components/credentialmanagement/tests/xpcshell/head.js
View File

@@ -4,6 +4,6 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);

2
toolkit/components/extensions/Extension.jsm
View File

@@ -60,6 +60,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
"resource://gre/modules/ExtensionPermissionMessages.sys.mjs",
SITEPERMS_ADDON_TYPE:
"resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -78,7 +79,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "resourceProtocol", () =>

2
toolkit/components/extensions/ExtensionDNRStore.sys.mjs
View File

@@ -17,13 +17,13 @@ const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
Extension: "resource://gre/modules/Extension.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
});
ChromeUtils.defineESModuleGetters(lazy, {
DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
ExtensionDNR: "resource://gre/modules/ExtensionDNR.sys.mjs",
ExtensionDNRLimits: "resource://gre/modules/ExtensionDNRLimits.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
XPCOMUtils.defineLazyServiceGetters(lazy, {

2
toolkit/components/extensions/parent/ext-browsingData.js
View File

@@ -6,11 +6,11 @@
ChromeUtils.defineESModuleGetters(this, {
LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
// This helper contains the platform-specific bits of browsingData.
BrowsingDataDelegate: "resource:///modules/ExtensionBrowsingData.jsm",
});

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

@@ -2,8 +2,8 @@
/* exported AppConstants, Assert, AppTestDelegate */
var { AppConstants } = SpecialPowers.ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
var { AppConstants } = SpecialPowers.ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
var { AppTestDelegate } = SpecialPowers.ChromeUtils.importESModule(
"resource://specialpowers/AppTestDelegate.sys.mjs"

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

@@ -3,8 +3,8 @@
/* eslint-disable mozilla/no-arbitrary-setTimeout */
"use strict";
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
const COOKIE = {

8
toolkit/components/extensions/test/xpcshell/test_ext_storage_sanitizer.js
View File

@@ -3,11 +3,9 @@
"use strict";
ChromeUtils.defineModuleGetter(
this,
"Sanitizer",
"resource:///modules/Sanitizer.jsm"
);
ChromeUtils.defineESModuleGetters(this, {
Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
});
async function test_sanitize_offlineApps(storageHelpersScript) {
const extension = ExtensionTestUtils.loadExtension({

4
toolkit/components/forgetaboutsite/test/browser/browser_cookieDomain.js
View File

@@ -1,8 +1,8 @@
const { ForgetAboutSite } = ChromeUtils.importESModule(
"resource://gre/modules/ForgetAboutSite.sys.mjs"
);
const { SiteDataTestUtils } = ChromeUtils.import(
"resource://testing-common/SiteDataTestUtils.jsm"
const { SiteDataTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/SiteDataTestUtils.sys.mjs"
);
function checkCookie(host, originAttributes) {

4
toolkit/components/nimbus/test/unit/test_localization.js
View File

@@ -9,8 +9,8 @@ const { ExperimentFakes, ExperimentTestUtils } = ChromeUtils.importESModule(
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
const { TelemetryEvents } = ChromeUtils.import(
"resource://normandy/lib/TelemetryEvents.jsm"
const { TelemetryEvents } = ChromeUtils.importESModule(
"resource://normandy/lib/TelemetryEvents.sys.mjs"
);
const LOCALIZATIONS = {

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

@@ -24,8 +24,8 @@ const { ExperimentFakes } = ChromeUtils.importESModule(
const { RecipeRunner } = ChromeUtils.importESModule(
"resource://normandy/lib/RecipeRunner.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const SURVEY = {

4
toolkit/components/passwordmgr/FirefoxRelay.sys.mjs
View File

@@ -10,9 +10,7 @@ import {
} from "resource://gre/modules/LoginHelper.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
import { TelemetryUtils } from "resource://gre/modules/TelemetryUtils.sys.mjs";
const lazy = {};

4
toolkit/components/passwordmgr/test/browser/browser_autocomplete_import.js
View File

@@ -1,5 +1,5 @@
const { ChromeMigrationUtils } = ChromeUtils.import(
"resource:///modules/ChromeMigrationUtils.jsm"
const { ChromeMigrationUtils } = ChromeUtils.importESModule(
"resource:///modules/ChromeMigrationUtils.sys.mjs"
);
const { ExperimentAPI } = ChromeUtils.importESModule(
"resource://nimbus/ExperimentAPI.sys.mjs"

4
toolkit/components/passwordmgr/test/browser/browser_relay_telemetry.js
View File

@@ -2,8 +2,8 @@ const { sinon } = ChromeUtils.importESModule(
"resource://testing-common/Sinon.sys.mjs"
);
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const { getFxAccountsSingleton } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"
const { getFxAccountsSingleton } = ChromeUtils.importESModule(
"resource://gre/modules/FxAccounts.sys.mjs"
);
const { FirefoxRelayTelemetry } = ChromeUtils.importESModule(
"resource://gre/modules/FirefoxRelayTelemetry.mjs"

7
toolkit/components/search/SearchSuggestionController.sys.mjs
View File

@@ -7,16 +7,11 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"FormHistory",
"resource://gre/modules/FormHistory.jsm"
);
const DEFAULT_FORM_HISTORY_PARAM = "searchbar-history";
const HTTP_OK = 200;
const BROWSER_SUGGEST_PREF = "browser.search.suggest.enabled";

13
toolkit/components/search/SearchSuggestions.sys.mjs
View File

@@ -6,19 +6,12 @@ import { FormAutoCompleteResult } from "resource://gre/modules/nsFormAutoComplet
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
FormAutoCompleteResult: "resource://gre/modules/FormAutoComplete.sys.mjs",
FormHistoryClient: "resource://gre/modules/FormAutoComplete.sys.mjs",
SearchSuggestionController:
"resource://gre/modules/SearchSuggestionController.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"FormHistoryClient",
"resource://gre/modules/FormAutoComplete.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"FormAutoCompleteResult",
"resource://gre/modules/FormAutoComplete.jsm"
);
/**
* SuggestAutoComplete is a base class that implements nsIAutoCompleteSearch

4
toolkit/components/telemetry/tests/unit/test_RDDScalars.js
View File

@@ -2,8 +2,8 @@
http://creativecommons.org/publicdomain/zero/1.0/
*/
const { TelemetryController } = ChromeUtils.import(
"resource://gre/modules/TelemetryController.jsm"
const { TelemetryController } = ChromeUtils.importESModule(
"resource://gre/modules/TelemetryController.sys.mjs"
);
const { ContentTaskUtils } = ChromeUtils.importESModule(
"resource://testing-common/ContentTaskUtils.sys.mjs"

4
toolkit/components/translations/tests/browser/browser_remote_settings.js
View File

@@ -8,8 +8,8 @@
* @typedef {import("../../translations").TranslationModelRecord} TranslationModelRecord
*/
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
// The full Firefox version string.

12
toolkit/components/translations/tests/browser/shared-head.js
View File

@@ -634,8 +634,8 @@ async function createTranslationModelsRemoteClient(
}
}
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const client = RemoteSettings("test-translation-models");
const metadata = {};
@@ -662,8 +662,8 @@ async function createTranslationsWasmRemoteClient(
schema: Date.now(),
}));
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const client = RemoteSettings("test-translations-wasm");
const metadata = {};
@@ -692,8 +692,8 @@ async function createLanguageIdModelsRemoteClient(
},
];
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const client = RemoteSettings("test-language-id-models");
const metadata = {};

7
toolkit/content/aboutSupport.js
View File

@@ -17,15 +17,10 @@ const { AppConstants } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
PluralForm: "resource://gre/modules/PluralForm.sys.mjs",
ProcessType: "resource://gre/modules/ProcessType.sys.mjs",
});
ChromeUtils.defineModuleGetter(
this,
"PluralForm",
"resource://gre/modules/PluralForm.jsm"
);
window.addEventListener("load", function onload(event) {
try {
window.removeEventListener("load", onload);