Backed out 2 changesets (bug 1824612) for causing dt failures on browser_dbg-features-source-tree.js. CLOSED TREE

Backed out changeset c3f38adc818e (bug 1824612)
Backed out changeset 58ba8bb3398a (bug 1824612)

browser/actors/ClickHandlerParent.sys.mjs

@@ -9,8 +9,12 @@ ChromeUtils.defineESModuleGetters(lazy, {
   E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.sys.mjs",
 });
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "WebNavigationFrames",
+  "resource://gre/modules/WebNavigationFrames.jsm"
+);
 
 let gContentClickListeners = new Set();
 

browser/base/content/browser-addons.js

@@ -12,10 +12,22 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "OriginControls",
+  "resource://gre/modules/ExtensionPermissions.jsm"
+);
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionPermissions",
+  "resource://gre/modules/ExtensionPermissions.jsm"
+);
 ChromeUtils.defineESModuleGetters(lazy, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-  ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.sys.mjs",
-  OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs",
   SITEPERMS_ADDON_TYPE:
     "resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
 });

browser/base/content/browser-unified-extensions.js

@@ -6,9 +6,11 @@
 // This file is loaded into the browser window scope.
 /* eslint-env mozilla/browser-window */
 
-ChromeUtils.defineESModuleGetters(this, {
-  OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "OriginControls",
+  "resource://gre/modules/ExtensionPermissions.jsm"
+);
 
 /**
  * The `unified-extensions-item` custom element is used to manage an extension

browser/base/content/browser.js

@@ -76,7 +76,6 @@ ChromeUtils.defineESModuleGetters(this, {
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
   UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.sys.mjs",
   Weave: "resource://services-sync/main.sys.mjs",
-  WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.sys.mjs",
   WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",
 });
 
@@ -98,6 +97,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   SiteDataManager: "resource:///modules/SiteDataManager.jsm",
   TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
   Translation: "resource:///modules/translation/TranslationParent.jsm",
+  WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
   webrtcUI: "resource:///modules/webrtcUI.jsm",
   ZoomUI: "resource:///modules/ZoomUI.jsm",
 });

browser/base/content/nsContextMenu.js

@@ -2540,7 +2540,10 @@ ChromeUtils.defineESModuleGetters(nsContextMenu, {
   DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs",
   LoginManagerContextMenu:
     "resource://gre/modules/LoginManagerContextMenu.sys.mjs",
-  WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.sys.mjs",
+});
+
+XPCOMUtils.defineLazyModuleGetters(nsContextMenu, {
+  WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(

browser/base/content/test/pageActions/head.js

@@ -4,12 +4,15 @@
 ChromeUtils.defineESModuleGetters(this, {
   EnterprisePolicyTesting:
     "resource://testing-common/EnterprisePolicyTesting.sys.mjs",
-  ExtensionCommon: "resource://gre/modules/ExtensionCommon.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
+});
+
 async function promisePageActionPanelOpen(win = window, eventDict = {}) {
   await BrowserTestUtils.waitForCondition(() => {
     // Wait for the main page action button to become visible.  It's hidden for

browser/base/content/test/performance/browser_startup_content.js

@@ -42,8 +42,8 @@ const known_scripts = {
     "resource://gre/modules/TelemetryControllerContent.sys.mjs", // bug 1470339
 
     // Extensions
-    "resource://gre/modules/ExtensionProcessScript.sys.mjs",
-    "resource://gre/modules/ExtensionUtils.sys.mjs",
+    "resource://gre/modules/ExtensionProcessScript.jsm",
+    "resource://gre/modules/ExtensionUtils.jsm",
   ]),
   frameScripts: new Set([
     // Test related

browser/base/content/test/performance/browser_startup_content_subframe.js

@@ -48,8 +48,8 @@ const known_scripts = {
     "resource://gre/modules/TelemetryControllerContent.sys.mjs", // bug 1470339
 
     // Extensions
-    "resource://gre/modules/ExtensionProcessScript.sys.mjs",
-    "resource://gre/modules/ExtensionUtils.sys.mjs",
+    "resource://gre/modules/ExtensionProcessScript.jsm",
+    "resource://gre/modules/ExtensionUtils.jsm",
   ]),
   processScripts: new Set([
     "chrome://global/content/process-content.js",

browser/base/content/test/webextensions/head.js

@@ -11,8 +11,8 @@ const BASE = getRootDirectory(gTestPath).replace(
 
 XPCOMUtils.defineLazyGetter(this, "Management", () => {
   // eslint-disable-next-line no-shadow
-  const { Management } = ChromeUtils.importESModule(
-    "resource://gre/modules/Extension.sys.mjs"
+  const { Management } = ChromeUtils.import(
+    "resource://gre/modules/Extension.jsm"
   );
   return Management;
 });

browser/base/content/utilityOverlay.js

@@ -13,10 +13,10 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
 
 ChromeUtils.defineESModuleGetters(this, {
   BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+
   ContextualIdentityService:
     "resource://gre/modules/ContextualIdentityService.sys.mjs",
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
+
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   ShellService: "resource:///modules/ShellService.sys.mjs",
   URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs",
@@ -25,6 +25,7 @@ ChromeUtils.defineESModuleGetters(this, {
 XPCOMUtils.defineLazyModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
+  ExtensionSettingsStore: "resource://gre/modules/ExtensionSettingsStore.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () =>

browser/base/content/webext-panels.js

@@ -7,12 +7,14 @@
 /* import-globals-from browser.js */
 /* import-globals-from nsContextMenu.js */
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 
-const { ExtensionUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionUtils.sys.mjs"
+const { ExtensionUtils } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionUtils.jsm"
 );
 
 var { promiseEvent } = ExtensionUtils;

browser/components/enterprisepolicies/tests/xpcshell/test_addon_update.js

@@ -9,8 +9,8 @@ const { AddonTestUtils } = ChromeUtils.import(
 const { AddonManager } = ChromeUtils.import(
   "resource://gre/modules/AddonManager.jsm"
 );
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 AddonTestUtils.init(this);

browser/components/extensions/ExtensionBrowsingData.jsm

@@ -12,8 +12,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 const lazy = {};
 
 XPCOMUtils.defineLazyGetter(lazy, "makeRange", () => {
-  const { ExtensionParent } = ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionParent.sys.mjs"
+  const { ExtensionParent } = ChromeUtils.import(
+    "resource://gre/modules/ExtensionParent.jsm"
   );
   // Defined in ext-browsingData.js
   return ExtensionParent.apiManager.global.makeRange;

browser/components/extensions/ExtensionControlledPopup.jsm

@@ -19,8 +19,8 @@
 
 var EXPORTED_SYMBOLS = ["ExtensionControlledPopup"];
 
-const { ExtensionCommon } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionCommon.sys.mjs"
+const { ExtensionCommon } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionCommon.jsm"
 );
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -40,10 +40,13 @@ ChromeUtils.defineModuleGetter(
 );
 ChromeUtils.defineESModuleGetters(lazy, {
   CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
 });
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 
 let { makeWidgetId } = ExtensionCommon;
 

browser/components/extensions/ExtensionPopups.jsm

@@ -18,18 +18,22 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 
 const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
-const { ExtensionCommon } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionCommon.sys.mjs"
+const { ExtensionCommon } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionCommon.jsm"
 );
-const { ExtensionUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionUtils.sys.mjs"
+const { ExtensionUtils } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionUtils.jsm"
 );
 
 var { DefaultWeakMap, promiseEvent } = ExtensionUtils;

browser/components/extensions/child/ext-devtools-panels.js

@@ -12,10 +12,11 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionChildDevToolsUtils:
-    "resource://gre/modules/ExtensionChildDevToolsUtils.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionChildDevToolsUtils",
+  "resource://gre/modules/ExtensionChildDevToolsUtils.jsm"
+);
 
 var { promiseDocumentLoaded } = ExtensionUtils;
 

browser/components/extensions/parent/ext-browserAction.js

@@ -8,11 +8,14 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
-  ExtensionTelemetry: "resource://gre/modules/ExtensionTelemetry.sys.mjs",
-  OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs",
   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionTelemetry",
+  "resource://gre/modules/ExtensionTelemetry.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "ViewPopup",
@@ -23,14 +26,19 @@ ChromeUtils.defineModuleGetter(
   "BrowserUsageTelemetry",
   "resource:///modules/BrowserUsageTelemetry.jsm"
 );
+ChromeUtils.defineModuleGetter(
+  this,
+  "OriginControls",
+  "resource://gre/modules/ExtensionPermissions.jsm"
+);
 
 var { DefaultWeakMap, ExtensionError } = ExtensionUtils;
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
-var { BrowserActionBase } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionActions.sys.mjs"
+var { BrowserActionBase } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionActions.jsm"
 );
 
 var { IconDetails, StartupCache } = ExtensionParent;

browser/components/extensions/parent/ext-chrome-settings-overrides.js

@@ -4,19 +4,24 @@
 
 "use strict";
 
-var { ExtensionPreferencesManager } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPreferencesManager.sys.mjs"
+var { ExtensionPreferencesManager } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPreferencesManager.jsm"
 );
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.sys.mjs",
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionPermissions",
+  "resource://gre/modules/ExtensionPermissions.jsm"
+);
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "ExtensionControlledPopup",

browser/components/extensions/parent/ext-commands.js

@@ -6,9 +6,11 @@
 
 "use strict";
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionShortcuts: "resource://gre/modules/ExtensionShortcuts.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionShortcuts",
+  "resource://gre/modules/ExtensionShortcuts.jsm"
+);
 
 this.commands = class extends ExtensionAPIPersistent {
   PERSISTENT_EVENTS = {

browser/components/extensions/parent/ext-devtools-panels.js

@@ -6,13 +6,15 @@
 
 "use strict";
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
 
-ChromeUtils.defineESModuleGetters(this, {
-  BroadcastConduit: "resource://gre/modules/ConduitsParent.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "BroadcastConduit",
+  "resource://gre/modules/ConduitsParent.jsm"
+);
 
 var { watchExtensionProxyContextLoad } = ExtensionParent;
 

browser/components/extensions/parent/ext-devtools.js

@@ -15,8 +15,8 @@ ChromeUtils.defineESModuleGetters(this, {
   DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs",
 });
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
 
 var { HiddenExtensionPage, watchExtensionProxyContextLoad } = ExtensionParent;

browser/components/extensions/parent/ext-menus.js

@@ -13,8 +13,8 @@ ChromeUtils.defineESModuleGetters(this, {
 
 var { DefaultMap, ExtensionError, parseMatchPatterns } = ExtensionUtils;
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
 
 var { IconDetails, StartupCache } = ExtensionParent;

browser/components/extensions/parent/ext-pageAction.js

@@ -6,9 +6,11 @@
 
 "use strict";
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionTelemetry: "resource://gre/modules/ExtensionTelemetry.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionTelemetry",
+  "resource://gre/modules/ExtensionTelemetry.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "PageActions",
@@ -27,11 +29,11 @@ ChromeUtils.defineModuleGetter(
 
 var { DefaultWeakMap } = ExtensionUtils;
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
-var { PageActionBase } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionActions.sys.mjs"
+var { PageActionBase } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionActions.jsm"
 );
 
 // WeakMap[Extension -> PageAction]

browser/components/extensions/parent/ext-pkcs11.js

@@ -5,10 +5,13 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  NativeManifests: "resource://gre/modules/NativeManifests.sys.mjs",
   ctypes: "resource://gre/modules/ctypes.sys.mjs",
 });
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  NativeManifests: "resource://gre/modules/NativeManifests.jsm",
+});
+
 XPCOMUtils.defineLazyServiceGetter(
   this,
   "pkcs11db",

browser/components/extensions/parent/ext-sidebarAction.js

@@ -6,8 +6,8 @@
 
 "use strict";
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
 
 var { ExtensionError } = ExtensionUtils;

browser/components/extensions/parent/ext-url-overrides.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-var { ExtensionParent } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionParent.sys.mjs"
+var { ExtensionParent } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionParent.jsm"
 );
 
 ChromeUtils.defineModuleGetter(
@@ -13,10 +13,11 @@ ChromeUtils.defineModuleGetter(
   "ExtensionControlledPopup",
   "resource:///modules/ExtensionControlledPopup.jsm"
 );
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "AboutNewTab",

browser/components/extensions/parent/ext-urlbar.js

@@ -10,8 +10,8 @@ ChromeUtils.defineESModuleGetters(this, {
     "resource:///modules/UrlbarProviderExtension.sys.mjs",
 });
 
-var { ExtensionPreferencesManager } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPreferencesManager.sys.mjs"
+var { ExtensionPreferencesManager } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPreferencesManager.jsm"
 );
 var { getSettingsAPI } = ExtensionPreferencesManager;
 

browser/components/extensions/test/browser/browser_ExtensionControlledPopup.js

@@ -6,10 +6,11 @@ const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
 );
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "ExtensionControlledPopup",

browser/components/extensions/test/browser/browser_ext_activeScript.js

@@ -2,8 +2,8 @@
 
 requestLongerTimeout(2);
 
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 loadTestSubscript("head_unified_extensions.js");

browser/components/extensions/test/browser/browser_ext_browserAction_context.js

@@ -1090,7 +1090,7 @@ add_task(async function testNavigationClearsData() {
     Management: {
       global: { tabTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
   let extension,
     tabs = [];
   async function addTab(...args) {

browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js

@@ -40,7 +40,7 @@ add_task(async function testBrowserActionClickCanceled() {
     Management: {
       global: { browserActionFor },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let ext = WebExtensionPolicy.getByID(extension.id)?.extension;
   let browserAction = browserActionFor(ext);
@@ -186,7 +186,7 @@ add_task(async function testBrowserActionDisabled() {
     Management: {
       global: { browserActionFor },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let ext = WebExtensionPolicy.getByID(extension.id)?.extension;
   let browserAction = browserActionFor(ext);
@@ -358,7 +358,7 @@ add_task(async function testClosePopupDuringPreload() {
     Management: {
       global: { browserActionFor },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let ext = WebExtensionPolicy.getByID(extension.id)?.extension;
   let browserAction = browserActionFor(ext);

browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload_smoketest.js

@@ -79,7 +79,7 @@ async function waitForExtensionAndBrowserAction(addonId) {
     Management: {
       global: { browserActionFor },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   // trigger a number of preloads
   let extension;

browser/components/extensions/test/browser/browser_ext_chrome_settings_overrides_home.js

@@ -5,13 +5,9 @@
 
 requestLongerTimeout(4);
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
-
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
+  ExtensionSettingsStore: "resource://gre/modules/ExtensionSettingsStore.jsm",
   HomePage: "resource:///modules/HomePage.jsm",
 });
 

browser/components/extensions/test/browser/browser_ext_commands_update.js

@@ -2,10 +2,11 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "AddonManager",

browser/components/extensions/test/browser/browser_ext_currentWindow.js

@@ -110,7 +110,7 @@ add_task(async function () {
     Management: {
       global: { windowTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let winId1 = windowTracker.getId(win1);
   let winId2 = windowTracker.getId(win2);

browser/components/extensions/test/browser/browser_ext_find.js

@@ -15,8 +15,8 @@ function frameScript() {
   }
 
   let range = selection.getRangeAt(0);
-  const { FindContent } = ChromeUtils.importESModule(
-    "resource://gre/modules/FindContent.sys.mjs"
+  const { FindContent } = ChromeUtils.import(
+    "resource://gre/modules/FindContent.jsm"
   );
   let highlighter = new FindContent(docShell).highlighter;
   let r1 = content.parent.frameElement.getBoundingClientRect();

browser/components/extensions/test/browser/browser_ext_getViews.js

@@ -166,7 +166,7 @@ add_task(async function () {
     Management: {
       global: { windowTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let winId1 = windowTracker.getId(win1);
   let winId2 = windowTracker.getId(win2);
@@ -345,7 +345,7 @@ add_task(async function test_getViews_excludes_blocked_parsing_documents() {
     Management: {
       global: { browserActionFor },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let ext = WebExtensionPolicy.getByID(extension.id)?.extension;
   let browserAction = browserActionFor(ext);

browser/components/extensions/test/browser/browser_ext_menus_events.js

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 const PAGE =
@@ -657,8 +657,8 @@ add_task(async function test_show_hide_frame() {
         gBrowser.selectedBrowser,
         [],
         function () {
-          const { WebNavigationFrames } = ChromeUtils.importESModule(
-            "resource://gre/modules/WebNavigationFrames.sys.mjs"
+          const { WebNavigationFrames } = ChromeUtils.import(
+            "resource://gre/modules/WebNavigationFrames.jsm"
           );
 
           let { contentWindow } = content.document.getElementById("frame");

browser/components/extensions/test/browser/browser_ext_menus_replace_menu_permissions.js

@@ -192,8 +192,8 @@ add_task(async function overrideContext_permissions() {
     SidebarUI.browser.contentDocument.getElementById("webext-panels-browser"),
     [],
     () => {
-      const { ExtensionCommon } = ChromeUtils.importESModule(
-        "resource://gre/modules/ExtensionCommon.sys.mjs"
+      const { ExtensionCommon } = ChromeUtils.import(
+        "resource://gre/modules/ExtensionCommon.jsm"
       );
       Cu.exportFunction(
         fn => {

browser/components/extensions/test/browser/browser_ext_originControls.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 loadTestSubscript("head_unified_extensions.js");

browser/components/extensions/test/browser/browser_ext_pageAction_context.js

@@ -349,7 +349,7 @@ add_task(async function testNavigationClearsData() {
     Management: {
       global: { tabTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
   let extension,
     tabs = [];
   async function addTab(...args) {

browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js

@@ -63,7 +63,7 @@ function getId(tab) {
     Management: {
       global: { tabTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
   getId = tabTracker.getId.bind(tabTracker); // eslint-disable-line no-func-assign
   return getId(tab);
 }

browser/components/extensions/test/browser/browser_ext_reload_manifest_cache.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 add_task(async function test_reload_manifest_startupcache() {

browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js

@@ -7,8 +7,8 @@
 // into the scope, and so although eslint thinks this global is
 // available, it really isn't.
 // eslint-disable-next-line mozilla/no-redeclare-with-import-autofix
-let { ExtensionTestCommon } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionTestCommon.sys.mjs"
+let { ExtensionTestCommon } = ChromeUtils.import(
+  "resource://testing-common/ExtensionTestCommon.jsm"
 );
 
 async function makeAndInstallXPI(id, backgroundScript, loadedURL) {

browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js

@@ -36,7 +36,7 @@ async function run_test_extension(incognitoOverride) {
     Management: {
       global: { windowTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
   let privateWinId = windowTracker.getId(privateWin);
 
   extension.sendMessage("check-sessions");

browser/components/extensions/test/browser/browser_ext_sessions_restore.js

@@ -66,7 +66,7 @@ add_task(async function test_sessions_restore() {
     Management: {
       global: { windowTracker, tabTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   function checkLocalTab(tab, expectedUrl) {
     let realTab = tabTracker.getTab(tab.id);

browser/components/extensions/test/browser/browser_ext_tabs_audio.js

@@ -213,7 +213,7 @@ add_task(async function () {
       Management: {
         global: { tabTracker },
       },
-    } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+    } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
     let tab = tabTracker.getTab(tabId);
 

browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js

@@ -118,7 +118,7 @@ add_task(async function testDuplicateTabLazily() {
       Management: {
         global: { tabTracker },
       },
-    } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+    } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
     let tab = tabTracker.getTab(tabId);
     // This is a bit of a hack to load a tab in the background.

browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js

@@ -3,8 +3,8 @@
 "use strict";
 
 add_task(async function testExecuteScript() {
-  let { MessageChannel } = ChromeUtils.importESModule(
-    "resource://testing-common/MessageChannel.sys.mjs"
+  let { MessageChannel } = ChromeUtils.import(
+    "resource://testing-common/MessageChannel.jsm"
   );
 
   function countMM(messageManagerMap) {

browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js

@@ -9,8 +9,8 @@ const { AddonTestUtils } = ChromeUtils.import(
 AddonTestUtils.initMochitest(this);
 
 add_task(async function testExecuteScript() {
-  let { MessageChannel } = ChromeUtils.importESModule(
-    "resource://testing-common/MessageChannel.sys.mjs"
+  let { MessageChannel } = ChromeUtils.import(
+    "resource://testing-common/MessageChannel.jsm"
   );
 
   // When the first extension is started, ProxyMessenger.init adds MessageChannel

browser/components/extensions/test/browser/browser_ext_tabs_newtab_private.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 const NEWTAB_PRIVATE_ALLOWED = "browser.newtab.privateAllowed";

browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js

@@ -126,8 +126,8 @@ add_task(async function testExecuteScript() {
   // Verify that scripts created by tabs.removeCSS are not added to the content scripts
   // that requires cleanup (Bug 1464711).
   await SpecialPowers.spawn(tab.linkedBrowser, [extension.id], async extId => {
-    const { ExtensionContent } = ChromeUtils.importESModule(
-      "resource://gre/modules/ExtensionContent.sys.mjs"
+    const { ExtensionContent } = ChromeUtils.import(
+      "resource://gre/modules/ExtensionContent.jsm"
     );
 
     let contentScriptContext = ExtensionContent.getContextByExtensionId(

browser/components/extensions/test/browser/browser_ext_tabs_zoom.js

@@ -277,7 +277,7 @@ add_task(async function test_zoom_api() {
       Management: {
         global: { tabTracker },
       },
-    } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+    } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
     let resp;
     if (msg == "get-zoom") {

browser/components/extensions/test/browser/browser_ext_topSites.js

@@ -8,7 +8,7 @@ const { PlacesTestUtils } = ChromeUtils.importESModule(
 
 const {
   ExtensionUtils: { makeDataURI },
-} = ChromeUtils.importESModule("resource://gre/modules/ExtensionUtils.sys.mjs");
+} = ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
 
 // A small 1x1 test png
 const IMAGE_1x1 =

browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js

@@ -5,10 +5,11 @@
 
 requestLongerTimeout(4);
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "AboutNewTab",

browser/components/extensions/test/browser/browser_ext_windows.js

@@ -127,7 +127,7 @@ add_task(async function testWindowTitle() {
     Management: {
       global: { windowTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   async function createApiWin(options) {
     let promiseLoaded = BrowserTestUtils.waitForNewWindow({ url: START_URL });

browser/components/extensions/test/browser/browser_ext_windows_create_tabId.js

@@ -4,8 +4,8 @@
 
 function assertNoLeaksInTabTracker() {
   // Check that no tabs have been leaked by the internal tabTracker helper class.
-  const { ExtensionParent } = ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionParent.sys.mjs"
+  const { ExtensionParent } = ChromeUtils.import(
+    "resource://gre/modules/ExtensionParent.jsm"
   );
   const { tabTracker } = ExtensionParent.apiManager.global;
 

browser/components/extensions/test/browser/browser_ext_windows_events.js

@@ -87,7 +87,7 @@ add_task(async function test_windows_events_not_allowed() {
     Management: {
       global: { windowTracker },
     },
-  } = ChromeUtils.importESModule("resource://gre/modules/Extension.sys.mjs");
+  } = ChromeUtils.import("resource://gre/modules/Extension.jsm");
 
   let currentWindow = window;
   let currentWindowId = windowTracker.getId(currentWindow);

browser/components/extensions/test/browser/browser_unified_extensions.js

@@ -7,8 +7,8 @@ requestLongerTimeout(2);
 
 /* import-globals-from ../../../../../toolkit/mozapps/extensions/test/browser/head.js */
 
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 loadTestSubscript("head_unified_extensions.js");

browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js

@@ -555,8 +555,8 @@ add_task(async function test_open_context_menu_with_keyboard() {
 });
 
 add_task(async function test_context_menu_without_browserActionFor_global() {
-  const { ExtensionParent } = ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionParent.sys.mjs"
+  const { ExtensionParent } = ChromeUtils.import(
+    "resource://gre/modules/ExtensionParent.jsm"
   );
   const { browserActionFor } = ExtensionParent.apiManager.global;
   const cleanup = () => {

browser/components/extensions/test/browser/head.js

@@ -61,9 +61,11 @@ const { ClientEnvironmentBase } = ChromeUtils.importESModule(
   "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs"
 );
 
-ChromeUtils.defineESModuleGetters(this, {
-  Management: "resource://gre/modules/Extension.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "Management",
+  "resource://gre/modules/Extension.jsm"
+);
 
 var { makeWidgetId, promisePopupShown, getPanelForNode, awaitBrowserLoaded } =
   AppUiTestInternals;

browser/components/extensions/test/xpcshell/head.js

@@ -11,18 +11,17 @@ const { AppConstants } = ChromeUtils.importESModule(
 
 // eslint-disable-next-line no-unused-vars
 ChromeUtils.defineESModuleGetters(this, {
-  Extension: "resource://gre/modules/Extension.sys.mjs",
-  ExtensionData: "resource://gre/modules/Extension.sys.mjs",
-  ExtensionTestUtils:
-    "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
-  Schemas: "resource://gre/modules/Schemas.sys.mjs",
   TestUtils: "resource://testing-common/TestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+  Extension: "resource://gre/modules/Extension.jsm",
+  ExtensionData: "resource://gre/modules/Extension.jsm",
+  ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
   HttpServer: "resource://testing-common/httpd.js",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
+  Schemas: "resource://gre/modules/Schemas.jsm",
 });
 
 ExtensionTestUtils.init(this);

browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js

@@ -517,8 +517,8 @@ async function test_default_search_on_updating_addons_installed_before_bug175776
     },
   };
 
-  const { ExtensionSettingsStore } = ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs"
+  const { ExtensionSettingsStore } = ChromeUtils.import(
+    "resource://gre/modules/ExtensionSettingsStore.jsm"
   );
 
   async function assertExtensionSettingsStore(

browser/components/extensions/test/xpcshell/test_ext_distribution_popup.js

@@ -3,10 +3,11 @@
 
 "use strict";
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 ChromeUtils.defineModuleGetter(
   this,
   "ExtensionControlledPopup",

browser/components/extensions/test/xpcshell/test_ext_history.js

@@ -7,10 +7,14 @@ const { AddonTestUtils } = ChromeUtils.import(
 );
 
 ChromeUtils.defineESModuleGetters(this, {
-  ExtensionCommon: "resource://gre/modules/ExtensionCommon.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
 });
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionCommon",
+  "resource://gre/modules/ExtensionCommon.jsm"
+);
 
 AddonTestUtils.init(this);
 AddonTestUtils.overrideCertDB();

browser/components/extensions/test/xpcshell/test_ext_homepage_overrides_private.js

@@ -6,8 +6,8 @@ const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm");
-const { ExtensionPermissions } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPermissions.sys.mjs"
+const { ExtensionPermissions } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPermissions.jsm"
 );
 
 const { createAppInfo, promiseShutdownManager, promiseStartupManager } =

browser/components/extensions/test/xpcshell/test_ext_menu_startup.js

@@ -1,9 +1,16 @@
 "use strict";
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-  Management: "resource://gre/modules/Extension.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
+
+ChromeUtils.defineModuleGetter(
+  this,
+  "Management",
+  "resource://gre/modules/Extension.jsm"
+);
 
 const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"

browser/components/extensions/test/xpcshell/test_ext_settings_overrides_shutdown.js

@@ -8,9 +8,11 @@ const { AddonTestUtils } = ChromeUtils.import(
 );
 // Lazily import ExtensionParent to allow AddonTestUtils.createAppInfo to
 // override Services.appinfo.
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 
 AddonTestUtils.init(this);
 AddonTestUtils.overrideCertDB();

browser/components/extensions/test/xpcshell/test_ext_settings_validate.js

@@ -15,9 +15,11 @@ const { AboutNewTab } = ChromeUtils.import(
 );
 
 // Lazy load to avoid having Services.appinfo cached first.
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 
 const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm");
 

browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js

@@ -8,9 +8,11 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/AddonManager.jsm"
 );
 
-ChromeUtils.defineESModuleGetters(this, {
-  Management: "resource://gre/modules/Extension.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "Management",
+  "resource://gre/modules/Extension.jsm"
+);
 
 const { AboutNewTab } = ChromeUtils.import(
   "resource:///modules/AboutNewTab.jsm"

browser/components/extensions/test/xpcshell/test_ext_urlbar.js

@@ -5,7 +5,6 @@ const { AddonTestUtils } = ChromeUtils.import(
 );
 
 ChromeUtils.defineESModuleGetters(this, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
@@ -13,6 +12,10 @@ ChromeUtils.defineESModuleGetters(this, {
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
 });
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
+});
+
 ChromeUtils.defineLazyGetter(this, "UrlbarTestUtils", () => {
   const { UrlbarTestUtils: module } = ChromeUtils.importESModule(
     "resource://testing-common/UrlbarTestUtils.sys.mjs"

browser/components/newtab/lib/TelemetryFeed.jsm

@@ -36,8 +36,6 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineESModuleGetters(lazy, {
   ClientID: "resource://gre/modules/ClientID.sys.mjs",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
@@ -51,6 +49,11 @@ ChromeUtils.defineModuleGetter(
   "HomePage",
   "resource:///modules/HomePage.jsm"
 );
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   AboutWelcomeTelemetry:
     "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm",

browser/components/preferences/extensionControlled.js

@@ -15,17 +15,14 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
 ChromeUtils.defineESModuleGetters(this, {
   BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
-
-  ExtensionPreferencesManager:
-    "resource://gre/modules/ExtensionPreferencesManager.sys.mjs",
-
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-  Management: "resource://gre/modules/Extension.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
+  ExtensionPreferencesManager:
+    "resource://gre/modules/ExtensionPreferencesManager.jsm",
+  ExtensionSettingsStore: "resource://gre/modules/ExtensionSettingsStore.jsm",
+  Management: "resource://gre/modules/Extension.jsm",
 });
 
 const PREF_SETTING_TYPE = "prefs";

browser/components/preferences/preferences.js

@@ -84,10 +84,6 @@ ChromeUtils.defineESModuleGetters(this, {
   ContextualIdentityService:
     "resource://gre/modules/ContextualIdentityService.sys.mjs",
   DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-  ExtensionPreferencesManager:
-    "resource://gre/modules/ExtensionPreferencesManager.sys.mjs",
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
   FeatureGate: "resource://featuregates/FeatureGate.sys.mjs",
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
   FirefoxRelay: "resource://gre/modules/FirefoxRelay.sys.mjs",
@@ -107,6 +103,9 @@ ChromeUtils.defineESModuleGetters(this, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+  ExtensionPreferencesManager:
+    "resource://gre/modules/ExtensionPreferencesManager.jsm",
+  ExtensionSettingsStore: "resource://gre/modules/ExtensionSettingsStore.jsm",
   HomePage: "resource:///modules/HomePage.jsm",
   SelectionChangedMenulist: "resource:///modules/SelectionChangedMenulist.jsm",
   SiteDataManager: "resource:///modules/SiteDataManager.jsm",

browser/components/preferences/tests/browser_extension_controlled.js

@@ -7,10 +7,11 @@ const URL_OVERRIDES_TYPE = "url_overrides";
 const NEW_TAB_KEY = "newTabURL";
 const PREF_SETTING_TYPE = "prefs";
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionSettingsStore:
-    "resource://gre/modules/ExtensionSettingsStore.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionSettingsStore",
+  "resource://gre/modules/ExtensionSettingsStore.jsm"
+);
 
 ChromeUtils.defineModuleGetter(
   this,
@@ -25,8 +26,8 @@ const { AddonTestUtils } = ChromeUtils.import(
 );
 AddonTestUtils.initMochitest(this);
 
-const { ExtensionPreferencesManager } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionPreferencesManager.sys.mjs"
+const { ExtensionPreferencesManager } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPreferencesManager.jsm"
 );
 
 const TEST_DIR = gTestPath.substr(0, gTestPath.lastIndexOf("/"));

browser/components/screenshots/tests/browser/browser_screenshots_test_toggle_pref.js

@@ -11,8 +11,8 @@ ChromeUtils.defineESModuleGetters(this, {
   ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
 });
 XPCOMUtils.defineLazyGetter(this, "ExtensionManagement", () => {
-  const { Management } = ChromeUtils.importESModule(
-    "resource://gre/modules/Extension.sys.mjs"
+  const { Management } = ChromeUtils.import(
+    "resource://gre/modules/Extension.jsm"
   );
   return Management;
 });

browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_addons.js

@@ -11,9 +11,11 @@ ChromeUtils.defineModuleGetter(
   "AddonManager",
   "resource://gre/modules/AddonManager.jsm"
 );
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionTestCommon",
+  "resource://testing-common/ExtensionTestCommon.jsm"
+);
 
 const MERINO_SUGGESTIONS = [
   {

browser/extensions/formautofill/test/unit/head.js

@@ -19,8 +19,8 @@ var { FormAutofillHandler } = ChromeUtils.importESModule(
 var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
-var { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+var { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 var { FileTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/FileTestUtils.sys.mjs"
@@ -46,10 +46,15 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/AddonManager.jsm"
 );
 ChromeUtils.defineESModuleGetters(this, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
 });
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
+
 {
   // We're going to register a mock file source
   // with region names based on en-US. This is

browser/extensions/report-site-issue/test/browser/head.js

@@ -6,8 +6,8 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/AddonManager.jsm"
 );
 
-const { Management } = ChromeUtils.importESModule(
-  "resource://gre/modules/Extension.sys.mjs"
+const { Management } = ChromeUtils.import(
+  "resource://gre/modules/Extension.jsm"
 );
 
 const PREF_WC_REPORTER_ENABLED = "extensions.webcompat-reporter.enabled";

browser/extensions/search-detection/extension/api.js

@@ -9,8 +9,8 @@
 const { AddonManager } = ChromeUtils.import(
   "resource://gre/modules/AddonManager.jsm"
 );
-const { WebRequest } = ChromeUtils.importESModule(
-  "resource://gre/modules/WebRequest.sys.mjs"
+const { WebRequest } = ChromeUtils.import(
+  "resource://gre/modules/WebRequest.jsm"
 );
 const lazy = {};
 

browser/modules/ExtensionsUI.jsm

@@ -16,15 +16,15 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
-  ExtensionData: "resource://gre/modules/Extension.sys.mjs",
-  ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.sys.mjs",
-  OriginControls: "resource://gre/modules/ExtensionPermissions.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
   AMTelemetry: "resource://gre/modules/AddonManager.jsm",
+  ExtensionData: "resource://gre/modules/Extension.jsm",
+  ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.jsm",
+  OriginControls: "resource://gre/modules/ExtensionPermissions.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(

browser/modules/HomePage.jsm

@@ -6,17 +6,25 @@
 
 var EXPORTED_SYMBOLS = ["HomePage"];
 
+const { XPCOMUtils } = ChromeUtils.importESModule(
+  "resource://gre/modules/XPCOMUtils.sys.mjs"
+);
+
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-  ExtensionPreferencesManager:
-    "resource://gre/modules/ExtensionPreferencesManager.sys.mjs",
   IgnoreLists: "resource://gre/modules/IgnoreLists.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
 });
 
+XPCOMUtils.defineLazyModuleGetters(lazy, {
+  ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
+
+  ExtensionPreferencesManager:
+    "resource://gre/modules/ExtensionPreferencesManager.jsm",
+});
+
 const kPrefName = "browser.startup.homepage";
 const kDefaultHomePage = "about:home";
 const kExtensionControllerPref =

browser/modules/test/browser/browser_PageActions_contextMenus.js

@@ -2,8 +2,8 @@
 
 // This is a test for PageActions.jsm, specifically the context menus.
 
-ChromeUtils.defineESModuleGetters(this, {
-  ExtensionCommon: "resource://gre/modules/ExtensionCommon.sys.mjs",
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
 });
 
 // Initialization.  Must run first.

caps/tests/unit/test_precursor_principal.js

@@ -5,8 +5,8 @@ const { TestUtils } = ChromeUtils.importESModule(
 const { XPCShellContentUtils } = ChromeUtils.importESModule(
   "resource://testing-common/XPCShellContentUtils.sys.mjs"
 );
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 XPCShellContentUtils.init(this);

devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_debug_popup.js

@@ -208,8 +208,8 @@ async function installTestAddon(doc) {
  * Helper to retrieve the Extension instance.
  */
 async function waitForExtension(addonName) {
-  const { Management } = ChromeUtils.importESModule(
-    "resource://gre/modules/Extension.sys.mjs"
+  const { Management } = ChromeUtils.import(
+    "resource://gre/modules/Extension.jsm"
   );
 
   return new Promise(resolve => {

devtools/client/aboutdebugging/test/browser/helper-addons.js

@@ -48,8 +48,8 @@ async function installRegularExtension(pathOrFile) {
  * Will use a mock file picker to select the file.
  */
 async function installTemporaryExtension(pathOrFile, name, document) {
-  const { Management } = ChromeUtils.importESModule(
-    "resource://gre/modules/Extension.sys.mjs"
+  const { Management } = ChromeUtils.import(
+    "resource://gre/modules/Extension.jsm"
   );
 
   info("Install temporary extension named " + name);
@@ -76,8 +76,8 @@ async function installTemporaryExtension(pathOrFile, name, document) {
 /* exported installTemporaryExtension */
 
 function createTemporaryXPI(xpiData) {
-  const { ExtensionTestCommon } = ChromeUtils.importESModule(
-    "resource://testing-common/ExtensionTestCommon.sys.mjs"
+  const { ExtensionTestCommon } = ChromeUtils.import(
+    "resource://testing-common/ExtensionTestCommon.jsm"
   );
 
   const { background, files, id, name, extraProperties } = xpiData;
@@ -186,8 +186,8 @@ function prepareMockFilePicker(pathOrFile) {
 /* exported prepareMockFilePicker */
 
 function promiseBackgroundContextEvent(extensionId, eventName) {
-  const { Management } = ChromeUtils.importESModule(
-    "resource://gre/modules/Extension.sys.mjs"
+  const { Management } = ChromeUtils.import(
+    "resource://gre/modules/Extension.jsm"
   );
 
   return new Promise(resolve => {

devtools/client/shared/remote-debugging/adb/adb-binary.js

@@ -8,8 +8,12 @@ const { dumpn } = require("resource://devtools/shared/DevToolsUtils.js");
 
 const lazy = {};
 
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 ChromeUtils.defineESModuleGetters(lazy, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
 });
 ChromeUtils.defineModuleGetter(

devtools/client/shared/remote-debugging/adb/xpcshell/test_adb.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 const {

devtools/server/actors/descriptors/webextension.js

@@ -30,9 +30,11 @@ ChromeUtils.defineModuleGetter(
   "AddonManager",
   "resource://gre/modules/AddonManager.jsm"
 );
-ChromeUtils.defineESModuleGetters(lazy, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 loader.lazyRequireGetter(
   this,
   "WatcherActor",

devtools/server/actors/resources/storage/extension-storage.js

@@ -14,19 +14,16 @@ const {
   LongStringActor,
 } = require("resource://devtools/server/actors/string.js");
 loader.lazyGetter(this, "ExtensionParent", () => {
-  return ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionParent.sys.mjs"
-  ).ExtensionParent;
+  return ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm")
+    .ExtensionParent;
 });
 loader.lazyGetter(this, "ExtensionProcessScript", () => {
-  return ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionProcessScript.sys.mjs"
-  ).ExtensionProcessScript;
+  return ChromeUtils.import("resource://gre/modules/ExtensionProcessScript.jsm")
+    .ExtensionProcessScript;
 });
 loader.lazyGetter(this, "ExtensionStorageIDB", () => {
-  return ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionStorageIDB.sys.mjs"
-  ).ExtensionStorageIDB;
+  return ChromeUtils.import("resource://gre/modules/ExtensionStorageIDB.jsm")
+    .ExtensionStorageIDB;
 });
 
 /**

devtools/server/tests/xpcshell/test_addon_debugging_connect.js

@@ -3,14 +3,16 @@
 
 "use strict";
 
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-});
+ChromeUtils.defineModuleGetter(
+  lazy,
+  "ExtensionParent",
+  "resource://gre/modules/ExtensionParent.jsm"
+);
 
 const { createAppInfo, promiseStartupManager } = AddonTestUtils;
 

devtools/server/tests/xpcshell/test_addon_reload.js

@@ -21,8 +21,8 @@ function promiseAddonEvent(event) {
 }
 
 function promiseWebExtensionStartup() {
-  const { Management } = ChromeUtils.importESModule(
-    "resource://gre/modules/Extension.sys.mjs"
+  const { Management } = ChromeUtils.import(
+    "resource://gre/modules/Extension.jsm"
   );
 
   return new Promise(resolve => {

devtools/server/tests/xpcshell/test_extension_storage_actor.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 const { TestUtils } = ChromeUtils.importESModule(

devtools/server/tests/xpcshell/test_extension_storage_actor_upgrade.js

@@ -9,8 +9,8 @@
  * See Bug 1618059.
  */
 
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 const {

devtools/server/tests/xpcshell/test_webext_apis.js

@@ -6,8 +6,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 const { AddonManager } = ChromeUtils.import(
   "resource://gre/modules/AddonManager.jsm"
 );
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 ExtensionTestUtils.init(this);

devtools/server/tests/xpcshell/webextension-helpers.js

@@ -12,8 +12,8 @@
 const { FileUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/FileUtils.sys.mjs"
 );
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 const {

dom/ipc/tests/test_sharedMap.js

@@ -16,8 +16,8 @@ XPCShellContentUtils.init(this);
 let contentPage;
 
 async function readBlob(key, sharedData = Services.cpmm.sharedData) {
-  const { ExtensionUtils } = ChromeUtils.importESModule(
-    "resource://gre/modules/ExtensionUtils.sys.mjs"
+  const { ExtensionUtils } = ChromeUtils.import(
+    "resource://gre/modules/ExtensionUtils.jsm"
   );
 
   let reader = new FileReader();

dom/workers/test/xpcshell/test_ext_redirects_sw_scripts.js

@@ -12,8 +12,8 @@ const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 const { createHttpServer } = AddonTestUtils;

extensions/permissions/test/unit/test_permmanager_ipc.js

@@ -1,8 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const { ExtensionTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/ExtensionXPCShellUtils.sys.mjs"
+const { ExtensionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 
 add_task(async function test_permissions_sent_over_ipc_on_bloburl() {

mobile/android/components/extensions/ExtensionBrowsingData.jsm

@@ -5,8 +5,8 @@
 
 const EXPORTED_SYMBOLS = ["BrowsingDataDelegate"];
 
-const { ExtensionUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ExtensionUtils.sys.mjs"
+const { ExtensionUtils } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionUtils.jsm"
 );
 
 const lazy = {};