Bug 1780074 - Migrate newtab consumers to use ESM imports directly. r=daleharvey,application-update-reviewers,nalexander

Differential Revision: https://phabricator.services.mozilla.com/D152114

browser/actors/AboutNewTabParent.jsm

@@ -6,14 +6,10 @@
 
 var EXPORTED_SYMBOLS = ["AboutNewTabParent"];
 
-const { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
-
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouter: "resource://activity-stream/lib/ASRouter.sys.mjs",
 });
 
 class AboutNewTabParent extends JSWindowActorParent {

browser/actors/AboutPrivateBrowsingParent.jsm

@@ -6,8 +6,8 @@
 
 var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingParent"];
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { BrowserUtils } = ChromeUtils.import(
   "resource://gre/modules/BrowserUtils.jsm"

browser/actors/BrowserProcessChild.jsm

@@ -14,11 +14,9 @@ ChromeUtils.defineModuleGetter(
   "resource:///actors/WebRTCChild.jsm"
 );
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "AboutHomeStartupCacheChild",
-  "resource:///modules/AboutNewTabService.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutHomeStartupCacheChild: "resource:///modules/AboutNewTabService.sys.mjs",
+});
 
 class BrowserProcessChild extends JSProcessActorChild {
   receiveMessage(message) {

browser/base/content/browser-siteProtections.js

@@ -4,10 +4,13 @@
 
 /* eslint-env mozilla/browser-window */
 
+ChromeUtils.defineESModuleGetters(this, {
+  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   ContentBlockingAllowList:
     "resource://gre/modules/ContentBlockingAllowList.jsm",
-  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(

browser/base/content/browser.js

@@ -15,6 +15,7 @@ ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
 
 ChromeUtils.defineESModuleGetters(this, {
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
+  CFRPageActions: "resource://activity-stream/lib/CFRPageActions.sys.mjs",
   PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
@@ -37,7 +38,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.jsm",
   BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
-  CFRPageActions: "resource://activity-stream/lib/CFRPageActions.jsm",
   Color: "resource://gre/modules/Color.jsm",
   ContextualIdentityService:
     "resource://gre/modules/ContextualIdentityService.jsm",

browser/base/content/spotlight.js

@@ -5,9 +5,9 @@
 const browser = window.docShell.chromeEventHandler;
 const { document: gDoc, XPCOMUtils } = browser.ownerGlobal;
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  AboutWelcomeParent: "resource:///actors/AboutWelcomeParent.jsm",
-  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  AboutWelcomeParent: "resource:///actors/AboutWelcomeParent.sys.mjs",
+  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.sys.mjs",
 });
 
 const [CONFIG, PARAMS] = window.arguments[0];

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

@@ -262,8 +262,8 @@ async function ensureNoPreloadedBrowser(win = window) {
 // which confuses tests that look at repaints in the toolbar.  Use this
 // function to cancel the badge update.
 function disableFxaBadge() {
-  let { ToolbarBadgeHub } = ChromeUtils.import(
-    "resource://activity-stream/lib/ToolbarBadgeHub.jsm"
+  let { ToolbarBadgeHub } = ChromeUtils.importESModule(
+    "resource://activity-stream/lib/ToolbarBadgeHub.sys.mjs"
   );
   ToolbarBadgeHub.removeAllNotifications();
 

browser/components/BrowserGlue.jsm

@@ -19,10 +19,17 @@ const { AppConstants } = ChromeUtils.import(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouter: "resource://activity-stream/lib/ASRouter.sys.mjs",
+  ASRouterDefaultConfig:
+    "resource://activity-stream/lib/ASRouterDefaultConfig.sys.mjs",
+  ASRouterNewTabHook:
+    "resource://activity-stream/lib/ASRouterNewTabHook.sys.mjs",
   BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.sys.mjs",
   BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.sys.mjs",
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
   Interactions: "resource:///modules/Interactions.sys.mjs",
+  OnboardingMessageProvider:
+    "resource://activity-stream/lib/OnboardingMessageProvider.sys.mjs",
   PageDataService: "resource:///modules/pagedata/PageDataService.sys.mjs",
   PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
   PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
@@ -39,10 +46,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
-  ASRouterDefaultConfig:
-    "resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
-  ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
   Blocklist: "resource://gre/modules/Blocklist.jsm",
@@ -70,8 +73,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   Normandy: "resource://normandy/Normandy.jsm",
-  OnboardingMessageProvider:
-    "resource://activity-stream/lib/OnboardingMessageProvider.jsm",
   OsEnvironment: "resource://gre/modules/OsEnvironment.jsm",
   PageActions: "resource:///modules/PageActions.jsm",
   PageThumbs: "resource://gre/modules/PageThumbs.jsm",
@@ -359,10 +360,10 @@ let JSWINDOWACTORS = {
 
   AboutWelcome: {
     parent: {
-      moduleURI: "resource:///actors/AboutWelcomeParent.jsm",
+      esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs",
     },
     child: {
-      moduleURI: "resource:///actors/AboutWelcomeChild.jsm",
+      esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs",
       events: {
         // This is added so the actor instantiates immediately and makes
         // methods available to the page js on load.
@@ -731,10 +732,10 @@ let JSWINDOWACTORS = {
 
   ASRouter: {
     parent: {
-      moduleURI: "resource:///actors/ASRouterParent.jsm",
+      esModuleURI: "resource:///actors/ASRouterParent.sys.mjs",
     },
     child: {
-      moduleURI: "resource:///actors/ASRouterChild.jsm",
+      esModuleURI: "resource:///actors/ASRouterChild.sys.mjs",
       events: {
         // This is added so the actor instantiates immediately and makes
         // methods available to the page js on load.

browser/components/customizableui/content/panelUI.js

@@ -17,11 +17,9 @@ ChromeUtils.defineModuleGetter(
   "PanelMultiView",
   "resource:///modules/PanelMultiView.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "ToolbarPanelHub",
-  "resource://activity-stream/lib/ToolbarPanelHub.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.sys.mjs",
+});
 
 /**
  * Maintains the state and dispatches events for the main menu panel.

browser/components/doh/test/browser/head.js

@@ -1,7 +1,10 @@
 "use strict";
 
+ChromeUtils.defineESModuleGetters(this, {
+  ASRouter: "resource://activity-stream/lib/ASRouter.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
   DoHController: "resource:///modules/DoHController.jsm",
   DoHConfigController: "resource:///modules/DoHConfig.jsm",
   DoHTestUtils: "resource://testing-common/DoHTestUtils.jsm",

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

@@ -6,11 +6,14 @@
 
 "use strict";
 
+ChromeUtils.defineESModuleGetters(this, {
+  getSearchProvider: "resource://activity-stream/lib/SearchShortcuts.sys.mjs",
+  shortURL: "resource://activity-stream/lib/ShortURL.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.jsm",
   NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
-  shortURL: "resource://activity-stream/lib/ShortURL.jsm",
-  getSearchProvider: "resource://activity-stream/lib/SearchShortcuts.jsm",
 });
 
 const SHORTCUTS_PREF =

browser/components/newtab/aboutwelcome/AboutWelcomeChild.sys.mjs

@@ -10,13 +10,17 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  DEFAULT_SITES: "resource://activity-stream/lib/DefaultSites.jsm",
-  ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
-  shortURL: "resource://activity-stream/lib/ShortURL.jsm",
-  TippyTopProvider: "resource://activity-stream/lib/TippyTopProvider.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
   AboutWelcomeDefaults:
-    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm",
+    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.sys.mjs",
+
+  DEFAULT_SITES: "resource://activity-stream/lib/DefaultSites.sys.mjs",
+  TippyTopProvider: "resource://activity-stream/lib/TippyTopProvider.sys.mjs",
+  shortURL: "resource://activity-stream/lib/ShortURL.sys.mjs",
+});
+
+XPCOMUtils.defineLazyModuleGetters(lazy, {
+  ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
 });
 

browser/components/newtab/aboutwelcome/AboutWelcomeParent.sys.mjs

@@ -10,6 +10,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutWelcomeDefaults:
+    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.sys.mjs",
+  AboutWelcomeTelemetry:
+    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
@@ -18,10 +25,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   MigrationUtils: "resource:///modules/MigrationUtils.jsm",
   SpecialMessageActions:
     "resource://messaging-system/lib/SpecialMessageActions.jsm",
-  AboutWelcomeTelemetry:
-    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm",
-  AboutWelcomeDefaults:
-    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
   Region: "resource://gre/modules/Region.jsm",
   ShellService: "resource:///modules/ShellService.jsm",

browser/components/newtab/actors/ASRouterChild.sys.mjs

@@ -4,9 +4,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { MESSAGE_TYPE_LIST, MESSAGE_TYPE_HASH: msg } = ChromeUtils.import(
-  "resource://activity-stream/common/ActorConstants.jsm"
-);
+import {
+  MESSAGE_TYPE_LIST,
+  MESSAGE_TYPE_HASH as msg,
+} from "resource://activity-stream/common/ActorConstants.sys.mjs";
+
 const VALID_TYPES = new Set(MESSAGE_TYPE_LIST);
 
 export class ASRouterChild extends JSWindowActorChild {

browser/components/newtab/actors/ASRouterParent.sys.mjs

@@ -7,13 +7,11 @@
 
 const {
   MESSAGE_TYPE_HASH: { BLOCK_MESSAGE_BY_ID },
-} = ChromeUtils.import("resource://activity-stream/common/ActorConstants.jsm");
-const { ASRouterNewTabHook } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterNewTabHook.jsm"
-);
-const { ASRouterDefaultConfig } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterDefaultConfig.jsm"
+} = ChromeUtils.importESModule(
+  "resource://activity-stream/common/ActorConstants.sys.mjs"
 );
+import { ASRouterNewTabHook } from "resource://activity-stream/lib/ASRouterNewTabHook.sys.mjs";
+import { ASRouterDefaultConfig } from "resource://activity-stream/lib/ASRouterDefaultConfig.sys.mjs";
 
 export class ASRouterTabs {
   constructor({ asRouterNewTabHook }) {

browser/components/newtab/common/Reducers.sys.mjs

@@ -3,12 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-const { Dedupe } = ChromeUtils.import(
-  "resource://activity-stream/common/Dedupe.jsm"
-);
+import { actionTypes as at } from "resource://activity-stream/common/Actions.sys.mjs";
+import { Dedupe } from "resource://activity-stream/common/Dedupe.sys.mjs";
 
 export const TOP_SITES_DEFAULT_ROWS = 1;
 export const TOP_SITES_MAX_SITES_PER_ROW = 8;

browser/components/newtab/components/CustomElements/paragraph.js

@@ -7,8 +7,8 @@
 // This is loaded into all XUL windows. Wrap in a block to prevent
 // leaking to window scope.
 {
-  const { RemoteL10n } = ChromeUtils.import(
-    "resource://activity-stream/lib/RemoteL10n.jsm"
+  const { RemoteL10n } = ChromeUtils.importESModule(
+    "resource://activity-stream/lib/RemoteL10n.sys.mjs"
   );
   class MozTextParagraph extends HTMLElement {
     constructor() {

browser/components/newtab/lib/ASRouter.sys.mjs

@@ -11,51 +11,49 @@ const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  SnippetsTestMessageProvider:
-    "resource://activity-stream/lib/SnippetsTestMessageProvider.jsm",
-  PanelTestProvider: "resource://activity-stream/lib/PanelTestProvider.jsm",
-  Spotlight: "resource://activity-stream/lib/Spotlight.jsm",
-  ToastNotification: "resource://activity-stream/lib/ToastNotification.jsm",
-  ToolbarBadgeHub: "resource://activity-stream/lib/ToolbarBadgeHub.jsm",
-  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.jsm",
-  MomentsPageHub: "resource://activity-stream/lib/MomentsPageHub.jsm",
-  InfoBar: "resource://activity-stream/lib/InfoBar.jsm",
-  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
-  ASRouterPreferences: "resource://activity-stream/lib/ASRouterPreferences.jsm",
-  TARGETING_PREFERENCES:
-    "resource://activity-stream/lib/ASRouterPreferences.jsm",
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouterPreferences:
+    "resource://activity-stream/lib/ASRouterPreferences.sys.mjs",
+  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.sys.mjs",
   ASRouterTriggerListeners:
-    "resource://activity-stream/lib/ASRouterTriggerListeners.jsm",
+    "resource://activity-stream/lib/ASRouterTriggerListeners.sys.mjs",
+  InfoBar: "resource://activity-stream/lib/InfoBar.sys.mjs",
+  MomentsPageHub: "resource://activity-stream/lib/MomentsPageHub.sys.mjs",
+  PanelTestProvider: "resource://activity-stream/lib/PanelTestProvider.sys.mjs",
+  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.sys.mjs",
+  SnippetsTestMessageProvider:
+    "resource://activity-stream/lib/SnippetsTestMessageProvider.sys.mjs",
+  Spotlight: "resource://activity-stream/lib/Spotlight.sys.mjs",
+  TARGETING_PREFERENCES:
+    "resource://activity-stream/lib/ASRouterPreferences.sys.mjs",
+  ToolbarBadgeHub: "resource://activity-stream/lib/ToolbarBadgeHub.sys.mjs",
+  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.sys.mjs",
+});
+
+XPCOMUtils.defineLazyModuleGetters(lazy, {
   KintoHttpClient: "resource://services-common/kinto-http-client.js",
   Downloader: "resource://services-settings/Attachments.jsm",
-  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   SpecialMessageActions:
     "resource://messaging-system/lib/SpecialMessageActions.jsm",
   TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
+  ToastNotification: "resource://activity-stream/lib/ToastNotification.jsm",
   MacAttribution: "resource:///modules/MacAttribution.jsm",
 });
 XPCOMUtils.defineLazyServiceGetters(lazy, {
   BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"],
 });
-const { actionCreators: ac } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import { actionCreators as ac } from "resource://activity-stream/common/Actions.sys.mjs";
+import { CFRMessageProvider } from "resource://activity-stream/lib/CFRMessageProvider.sys.mjs";
+import { OnboardingMessageProvider } from "resource://activity-stream/lib/OnboardingMessageProvider.sys.mjs";
 
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
-);
-const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
-);
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
-const { CFRPageActions } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRPageActions.jsm"
-);
+import { CFRPageActions } from "resource://activity-stream/lib/CFRPageActions.sys.mjs";
+
 const { AttributionCode } = ChromeUtils.import(
   "resource:///modules/AttributionCode.jsm"
 );

browser/components/newtab/lib/ASRouterDefaultConfig.sys.mjs

@@ -5,27 +5,16 @@
 
 "use strict";
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
-);
-const { TelemetryFeed } = ChromeUtils.import(
-  "resource://activity-stream/lib/TelemetryFeed.jsm"
-);
-const { ASRouterParentProcessMessageHandler } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterParentProcessMessageHandler.jsm"
-);
+import { ASRouter } from "resource://activity-stream/lib/ASRouter.sys.mjs";
+import { TelemetryFeed } from "resource://activity-stream/lib/TelemetryFeed.sys.mjs";
+import { ASRouterParentProcessMessageHandler } from "resource://activity-stream/lib/ASRouterParentProcessMessageHandler.sys.mjs";
+
 const { SpecialMessageActions } = ChromeUtils.import(
   "resource://messaging-system/lib/SpecialMessageActions.jsm"
 );
-const { ASRouterPreferences } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterPreferences.jsm"
-);
-const { QueryCache } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
-);
-const { ActivityStreamStorage } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamStorage.jsm"
-);
+import { ASRouterPreferences } from "resource://activity-stream/lib/ASRouterPreferences.sys.mjs";
+import { QueryCache } from "resource://activity-stream/lib/ASRouterTargeting.sys.mjs";
+import { ActivityStreamStorage } from "resource://activity-stream/lib/ActivityStreamStorage.sys.mjs";
 
 const createStorage = async telemetryFeed => {
   const dbStore = new ActivityStreamStorage({

browser/components/newtab/lib/ASRouterParentProcessMessageHandler.sys.mjs

@@ -5,13 +5,8 @@
 
 "use strict";
 
-const { ASRouterPreferences } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterPreferences.jsm"
-);
-
-const { MESSAGE_TYPE_HASH: msg } = ChromeUtils.import(
-  "resource://activity-stream/common/ActorConstants.jsm"
-);
+import { ASRouterPreferences } from "resource://activity-stream/lib/ASRouterPreferences.sys.mjs";
+import { MESSAGE_TYPE_HASH as msg } from "resource://activity-stream/common/ActorConstants.sys.mjs";
 
 export class ASRouterParentProcessMessageHandler {
   constructor({

browser/components/newtab/lib/ASRouterTargeting.sys.mjs

@@ -21,8 +21,12 @@ const { ShellService } = ChromeUtils.import(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouterPreferences:
+    "resource://activity-stream/lib/ASRouterPreferences.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouterPreferences: "resource://activity-stream/lib/ASRouterPreferences.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
   ProfileAge: "resource://gre/modules/ProfileAge.jsm",

browser/components/newtab/lib/AboutPreferences.sys.mjs

@@ -6,9 +6,10 @@
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import {
+  actionTypes as at,
+  actionCreators as ac,
+} from "resource://activity-stream/common/Actions.sys.mjs";
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 export const PREFERENCES_LOADED_EVENT = "home-pane-loaded";

browser/components/newtab/lib/ActivityStream.sys.mjs

@@ -9,11 +9,9 @@ const { AppConstants } = ChromeUtils.import(
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "DEFAULT_SITES",
-  "resource://activity-stream/lib/DefaultSites.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  DEFAULT_SITES: "resource://activity-stream/lib/DefaultSites.sys.mjs",
+});
 
 ChromeUtils.defineModuleGetter(
   lazy,
@@ -23,84 +21,30 @@ ChromeUtils.defineModuleGetter(
 
 // NB: Eagerly load modules that will be loaded/constructed/initialized in the
 // common case to avoid the overhead of wrapping and detecting lazy loading.
-const { actionCreators: ac, actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "AboutPreferences",
-  "resource://activity-stream/lib/AboutPreferences.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "DefaultPrefs",
-  "resource://activity-stream/lib/ActivityStreamPrefs.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "NewTabInit",
-  "resource://activity-stream/lib/NewTabInit.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "SectionsFeed",
-  "resource://activity-stream/lib/SectionsManager.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "RecommendationProvider",
-  "resource://activity-stream/lib/RecommendationProvider.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "PlacesFeed",
-  "resource://activity-stream/lib/PlacesFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "PrefsFeed",
-  "resource://activity-stream/lib/PrefsFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "Store",
-  "resource://activity-stream/lib/Store.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "SystemTickFeed",
-  "resource://activity-stream/lib/SystemTickFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "TelemetryFeed",
-  "resource://activity-stream/lib/TelemetryFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "FaviconFeed",
-  "resource://activity-stream/lib/FaviconFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "TopSitesFeed",
-  "resource://activity-stream/lib/TopSitesFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "TopStoriesFeed",
-  "resource://activity-stream/lib/TopStoriesFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "HighlightsFeed",
-  "resource://activity-stream/lib/HighlightsFeed.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "DiscoveryStreamFeed",
-  "resource://activity-stream/lib/DiscoveryStreamFeed.jsm"
-);
+import {
+  actionCreators as ac,
+  actionTypes as at,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutPreferences: "resource://activity-stream/lib/AboutPreferences.sys.mjs",
+  DefaultPrefs: "resource://activity-stream/lib/ActivityStreamPrefs.sys.mjs",
+  DiscoveryStreamFeed:
+    "resource://activity-stream/lib/DiscoveryStreamFeed.sys.mjs",
+  FaviconFeed: "resource://activity-stream/lib/FaviconFeed.sys.mjs",
+  HighlightsFeed: "resource://activity-stream/lib/HighlightsFeed.sys.mjs",
+  NewTabInit: "resource://activity-stream/lib/NewTabInit.sys.mjs",
+  PlacesFeed: "resource://activity-stream/lib/PlacesFeed.sys.mjs",
+  PrefsFeed: "resource://activity-stream/lib/PrefsFeed.sys.mjs",
+  RecommendationProvider:
+    "resource://activity-stream/lib/RecommendationProvider.sys.mjs",
+  SectionsFeed: "resource://activity-stream/lib/SectionsManager.sys.mjs",
+  Store: "resource://activity-stream/lib/Store.sys.mjs",
+  SystemTickFeed: "resource://activity-stream/lib/SystemTickFeed.sys.mjs",
+  TelemetryFeed: "resource://activity-stream/lib/TelemetryFeed.sys.mjs",
+  TopSitesFeed: "resource://activity-stream/lib/TopSitesFeed.sys.mjs",
+  TopStoriesFeed: "resource://activity-stream/lib/TopStoriesFeed.sys.mjs",
+});
 
 const REGION_STORIES_CONFIG =
   "browser.newtabpage.activity-stream.discoverystream.region-stories-config";

browser/components/newtab/lib/ActivityStreamMessageChannel.sys.mjs

@@ -24,11 +24,11 @@ const { RemotePages } = ChromeUtils.import(
   "resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm"
 );
 
-const {
-  actionCreators: ac,
-  actionTypes: at,
-  actionUtils: au,
-} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+import {
+  actionCreators as ac,
+  actionTypes as at,
+  actionUtils as au,
+} from "resource://activity-stream/common/Actions.sys.mjs";
 
 const ABOUT_NEW_TAB_URL = "about:newtab";
 const ABOUT_HOME_URL = "about:home";

browser/components/newtab/lib/CFRPageActions.sys.mjs

@@ -9,9 +9,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(

browser/components/newtab/lib/DiscoveryStreamFeed.sys.mjs

@@ -22,19 +22,19 @@ ChromeUtils.defineModuleGetter(
 const { setTimeout, clearTimeout } = ChromeUtils.import(
   "resource://gre/modules/Timer.jsm"
 );
-const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import {
+  actionTypes as at,
+  actionCreators as ac,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+
 ChromeUtils.defineModuleGetter(
   lazy,
   "Region",
   "resource://gre/modules/Region.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "PersistentCache",
-  "resource://activity-stream/lib/PersistentCache.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  PersistentCache: "resource://activity-stream/lib/PersistentCache.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   lazy,
   "ExperimentAPI",

browser/components/newtab/lib/DownloadsManager.sys.mjs

@@ -5,9 +5,7 @@
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-const { actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import { actionTypes as at } from "resource://activity-stream/common/Actions.sys.mjs";
 
 const lazy = {};
 

browser/components/newtab/lib/FaviconFeed.sys.mjs

@@ -3,12 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-const { getDomain } = ChromeUtils.import(
-  "resource://activity-stream/lib/TippyTopProvider.jsm"
-);
+import { actionTypes as at } from "resource://activity-stream/common/Actions.sys.mjs";
+import { getDomain } from "resource://activity-stream/lib/TippyTopProvider.sys.mjs";
+
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );

browser/components/newtab/lib/HighlightsFeed.sys.mjs

@@ -3,56 +3,37 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-
-const { shortURL } = ChromeUtils.import(
-  "resource://activity-stream/lib/ShortURL.jsm"
-);
-const { SectionsManager } = ChromeUtils.import(
-  "resource://activity-stream/lib/SectionsManager.jsm"
-);
-const {
+import { actionTypes as at } from "resource://activity-stream/common/Actions.sys.mjs";
+import { shortURL } from "resource://activity-stream/lib/ShortURL.sys.mjs";
+import { SectionsManager } from "resource://activity-stream/lib/SectionsManager.sys.mjs";
+import {
   TOP_SITES_DEFAULT_ROWS,
   TOP_SITES_MAX_SITES_PER_ROW,
-} = ChromeUtils.import("resource://activity-stream/common/Reducers.jsm");
-const { Dedupe } = ChromeUtils.import(
-  "resource://activity-stream/common/Dedupe.jsm"
-);
+} from "resource://activity-stream/common/Reducers.sys.mjs";
+import { Dedupe } from "resource://activity-stream/common/Dedupe.sys.mjs";
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "FilterAdult",
-  "resource://activity-stream/lib/FilterAdult.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "LinksCache",
-  "resource://activity-stream/lib/LinksCache.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
+  LinksCache: "resource://activity-stream/lib/LinksCache.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   lazy,
   "NewTabUtils",
   "resource://gre/modules/NewTabUtils.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "Screenshots",
-  "resource://activity-stream/lib/Screenshots.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  Screenshots: "resource://activity-stream/lib/Screenshots.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   lazy,
   "PageThumbs",
   "resource://gre/modules/PageThumbs.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "DownloadsManager",
-  "resource://activity-stream/lib/DownloadsManager.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  DownloadsManager: "resource://activity-stream/lib/DownloadsManager.sys.mjs",
+});
 
 const HIGHLIGHTS_MAX_LENGTH = 16;
 

browser/components/newtab/lib/InfoBar.sys.mjs

@@ -9,9 +9,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
 });
 
 class InfoBarNotification {

browser/components/newtab/lib/NewTabInit.sys.mjs

@@ -3,9 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { actionCreators: ac, actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import {
+  actionCreators as ac,
+  actionTypes as at,
+} from "resource://activity-stream/common/Actions.sys.mjs";
 
 /**
  * NewTabInit - A placeholder for now. This will send a copy of the state to all

browser/components/newtab/lib/PlacesFeed.sys.mjs

@@ -7,14 +7,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
 
-const {
-  actionCreators: ac,
-  actionTypes: at,
-  actionUtils: au,
-} = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
-const { shortURL } = ChromeUtils.import(
-  "resource://activity-stream/lib/ShortURL.jsm"
-);
+import {
+  actionCreators as ac,
+  actionTypes as at,
+  actionUtils as au,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+import { shortURL } from "resource://activity-stream/lib/ShortURL.sys.mjs";
+
 const { AboutNewTab } = ChromeUtils.import(
   "resource:///modules/AboutNewTab.jsm"
 );

browser/components/newtab/lib/PrefsFeed.sys.mjs

@@ -3,15 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { actionCreators: ac, actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import {
+  actionCreators as ac,
+  actionTypes as at,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-const { Prefs } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamPrefs.jsm"
-);
+import { Prefs } from "resource://activity-stream/lib/ActivityStreamPrefs.sys.mjs";
+
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/components/newtab/lib/RecommendationProvider.sys.mjs

@@ -27,9 +27,11 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
     "resource://activity-stream/lib/PersonalityProvider/PersonalityProvider.jsm",
 });
 
-const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import {
+  actionTypes as at,
+  actionCreators as ac,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+
 const PREF_PERSONALIZATION_MODEL_KEYS =
   "discoverystream.personalization.modelKeys";
 const PREF_PERSONALIZATION = "discoverystream.personalization.enabled";

browser/components/newtab/lib/SectionsManager.sys.mjs

@@ -9,12 +9,11 @@ const { EventEmitter } = ChromeUtils.import(
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-const { actionCreators: ac, actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-const { getDefaultOptions } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamStorage.jsm"
-);
+import {
+  actionCreators as ac,
+  actionTypes as at,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+import { getDefaultOptions } from "resource://activity-stream/lib/ActivityStreamStorage.sys.mjs";
 
 const lazy = {};
 

browser/components/newtab/lib/Spotlight.sys.mjs

@@ -9,10 +9,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
+ChromeUtils.defineESModuleGetters(lazy, {
   AboutWelcomeTelemetry:
-    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm",
-  RemoteImages: "resource://activity-stream/lib/RemoteImages.jsm",
+    "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.sys.mjs",
+  RemoteImages: "resource://activity-stream/lib/RemoteImages.sys.mjs",
+});
+
+XPCOMUtils.defineLazyModuleGetters(lazy, {
   SpecialMessageActions:
     "resource://messaging-system/lib/SpecialMessageActions.jsm",
 });

browser/components/newtab/lib/Store.sys.mjs

@@ -3,18 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { ActivityStreamMessageChannel } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamMessageChannel.jsm"
-);
-const { ActivityStreamStorage } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamStorage.jsm"
-);
-const { Prefs } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamPrefs.jsm"
-);
-const { reducers } = ChromeUtils.import(
-  "resource://activity-stream/common/Reducers.jsm"
-);
+import { ActivityStreamMessageChannel } from "resource://activity-stream/lib/ActivityStreamMessageChannel.sys.mjs";
+import { ActivityStreamStorage } from "resource://activity-stream/lib/ActivityStreamStorage.sys.mjs";
+import { Prefs } from "resource://activity-stream/lib/ActivityStreamPrefs.sys.mjs";
+import { reducers } from "resource://activity-stream/common/Reducers.sys.mjs";
+
 const { redux } = ChromeUtils.import(
   "resource://activity-stream/vendor/Redux.jsm"
 );

browser/components/newtab/lib/SystemTickFeed.sys.mjs

@@ -3,9 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
+import { actionTypes as at } from "resource://activity-stream/common/Actions.sys.mjs";
 
 const lazy = {};
 

browser/components/newtab/lib/TelemetryFeed.sys.mjs

@@ -7,19 +7,13 @@
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-const { MESSAGE_TYPE_HASH: msg } = ChromeUtils.import(
-  "resource://activity-stream/common/ActorConstants.jsm"
-);
-
-const { actionTypes: at, actionUtils: au } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-const { Prefs } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamPrefs.jsm"
-);
-const { classifySite } = ChromeUtils.import(
-  "resource://activity-stream/lib/SiteClassifier.jsm"
-);
+import { MESSAGE_TYPE_HASH as msg } from "resource://activity-stream/common/ActorConstants.sys.mjs";
+import {
+  actionTypes as at,
+  actionUtils as au,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+import { Prefs } from "resource://activity-stream/lib/ActivityStreamPrefs.sys.mjs";
+import { classifySite } from "resource://activity-stream/lib/SiteClassifier.sys.mjs";
 
 const lazy = {};
 
@@ -33,11 +27,9 @@ ChromeUtils.defineModuleGetter(
   "PingCentre",
   "resource:///modules/PingCentre.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "UTEventReporting",
-  "resource://activity-stream/lib/UTEventReporting.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  UTEventReporting: "resource://activity-stream/lib/UTEventReporting.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   lazy,
   "UpdateUtils",

browser/components/newtab/lib/ToolbarBadgeHub.sys.mjs

@@ -9,9 +9,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   EveryWindow: "resource:///modules/EveryWindow.jsm",
-  ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   requestIdleCallback: "resource://gre/modules/Timer.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",

browser/components/newtab/lib/ToolbarPanelHub.sys.mjs

@@ -7,13 +7,17 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
 const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   EveryWindow: "resource:///modules/EveryWindow.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
   SpecialMessageActions:
     "resource://messaging-system/lib/SpecialMessageActions.jsm",
-  RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
 });
 ChromeUtils.defineModuleGetter(
   lazy,

browser/components/newtab/lib/TopSitesFeed.sys.mjs

@@ -7,25 +7,20 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
 
-const { actionCreators: ac, actionTypes: at } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-const { TippyTopProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/TippyTopProvider.jsm"
-);
-const { insertPinned, TOP_SITES_MAX_SITES_PER_ROW } = ChromeUtils.import(
-  "resource://activity-stream/common/Reducers.jsm"
-);
-const { Dedupe } = ChromeUtils.import(
-  "resource://activity-stream/common/Dedupe.jsm"
-);
-const { shortURL } = ChromeUtils.import(
-  "resource://activity-stream/lib/ShortURL.jsm"
-);
-const { getDefaultOptions } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamStorage.jsm"
-);
-const {
+import {
+  actionCreators as ac,
+  actionTypes as at,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+import { TippyTopProvider } from "resource://activity-stream/lib/TippyTopProvider.sys.mjs";
+import {
+  insertPinned,
+  TOP_SITES_MAX_SITES_PER_ROW,
+} from "resource://activity-stream/common/Reducers.sys.mjs";
+import { Dedupe } from "resource://activity-stream/common/Dedupe.sys.mjs";
+import { shortURL } from "resource://activity-stream/lib/ShortURL.sys.mjs";
+import { getDefaultOptions } from "resource://activity-stream/lib/ActivityStreamStorage.sys.mjs";
+
+import {
   CUSTOM_SEARCH_SHORTCUTS,
   SEARCH_SHORTCUTS_EXPERIMENT,
   SEARCH_SHORTCUTS_SEARCH_ENGINES_PREF,
@@ -33,30 +28,20 @@ const {
   checkHasSearchEngine,
   getSearchProvider,
   getSearchFormURL,
-} = ChromeUtils.import("resource://activity-stream/lib/SearchShortcuts.jsm");
+} from "resource://activity-stream/lib/SearchShortcuts.sys.mjs";
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "FilterAdult",
-  "resource://activity-stream/lib/FilterAdult.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "LinksCache",
-  "resource://activity-stream/lib/LinksCache.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
+  LinksCache: "resource://activity-stream/lib/LinksCache.sys.mjs",
+  Screenshots: "resource://activity-stream/lib/Screenshots.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   lazy,
   "NewTabUtils",
   "resource://gre/modules/NewTabUtils.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "Screenshots",
-  "resource://activity-stream/lib/Screenshots.jsm"
-);
 ChromeUtils.defineModuleGetter(
   lazy,
   "PageThumbs",

browser/components/newtab/lib/TopStoriesFeed.sys.mjs

@@ -7,21 +7,14 @@ const { NewTabUtils } = ChromeUtils.import(
   "resource://gre/modules/NewTabUtils.jsm"
 );
 
-const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-const { Prefs } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStreamPrefs.jsm"
-);
-const { shortURL } = ChromeUtils.import(
-  "resource://activity-stream/lib/ShortURL.jsm"
-);
-const { SectionsManager } = ChromeUtils.import(
-  "resource://activity-stream/lib/SectionsManager.jsm"
-);
-const { PersistentCache } = ChromeUtils.import(
-  "resource://activity-stream/lib/PersistentCache.jsm"
-);
+import {
+  actionTypes as at,
+  actionCreators as ac,
+} from "resource://activity-stream/common/Actions.sys.mjs";
+import { Prefs } from "resource://activity-stream/lib/ActivityStreamPrefs.sys.mjs";
+import { shortURL } from "resource://activity-stream/lib/ShortURL.sys.mjs";
+import { SectionsManager } from "resource://activity-stream/lib/SectionsManager.sys.mjs";
+import { PersistentCache } from "resource://activity-stream/lib/PersistentCache.sys.mjs";
 
 const lazy = {};
 ChromeUtils.defineModuleGetter(

browser/components/newtab/test/RemoteImagesTestUtils.sys.mjs

@@ -5,9 +5,11 @@
 
 const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
 const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { RemoteImages, REMOTE_IMAGES_PATH } = ChromeUtils.import(
-  "resource://activity-stream/lib/RemoteImages.jsm"
-);
+import {
+  RemoteImages,
+  REMOTE_IMAGES_PATH,
+} from "resource://activity-stream/lib/RemoteImages.sys.mjs";
+
 const RS_SERVER_PREF = "services.settings.server";
 
 class RemoteSettingsRecord {

browser/components/newtab/test/browser/abouthomecache/browser_shutdown_timeout.js

@@ -22,8 +22,8 @@ add_task(async function test_shutdown_timeout() {
     // Next, manually shutdown the AboutHomeStartupCacheChild so that
     // it doesn't respond to requests to the cache streams.
     await SpecialPowers.spawn(browser, [], async () => {
-      let { AboutHomeStartupCacheChild } = ChromeUtils.import(
-        "resource:///modules/AboutNewTabService.jsm"
+      let { AboutHomeStartupCacheChild } = ChromeUtils.importESModule(
+        "resource:///modules/AboutNewTabService.sys.mjs"
       );
       AboutHomeStartupCacheChild.uninit();
     });

browser/components/newtab/test/browser/abouthomecache/head.js

@@ -13,8 +13,8 @@ let { AboutHomeStartupCache } = ChromeUtils.import(
 // we need and write them to preferences here dynamically. We do this in
 // its own scope to avoid polluting the global scope.
 {
-  const { PREFS_CONFIG } = ChromeUtils.import(
-    "resource://activity-stream/lib/ActivityStream.jsm"
+  const { PREFS_CONFIG } = ChromeUtils.importESModule(
+    "resource://activity-stream/lib/ActivityStream.sys.mjs"
   );
 
   let defaultDSConfig = JSON.parse(
@@ -112,8 +112,8 @@ async function simulateRestart(
 
   info("Waiting for AboutHomeStartupCacheChild to uninit");
   await SpecialPowers.spawn(browser, [], async () => {
-    let { AboutHomeStartupCacheChild } = ChromeUtils.import(
-      "resource:///modules/AboutNewTabService.jsm"
+    let { AboutHomeStartupCacheChild } = ChromeUtils.importESModule(
+      "resource:///modules/AboutNewTabService.sys.mjs"
     );
     AboutHomeStartupCacheChild.uninit();
   });
@@ -134,8 +134,8 @@ async function simulateRestart(
     if (ensureCacheWinsRace) {
       info("Ensuring cache bytes are available");
       await SpecialPowers.spawn(browser, [], async () => {
-        let { AboutHomeStartupCacheChild } = ChromeUtils.import(
-          "resource:///modules/AboutNewTabService.jsm"
+        let { AboutHomeStartupCacheChild } = ChromeUtils.importESModule(
+          "resource:///modules/AboutNewTabService.sys.mjs"
         );
         let pageStream = AboutHomeStartupCacheChild._pageInputStream;
         let scriptStream = AboutHomeStartupCacheChild._scriptInputStream;

browser/components/newtab/test/browser/browser_aboutwelcome_attribution.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { AttributionCode } = ChromeUtils.import(
   "resource:///modules/AttributionCode.jsm"

browser/components/newtab/test/browser/browser_aboutwelcome_multistage_primary.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { AboutWelcomeParent } = ChromeUtils.import(
-  "resource:///actors/AboutWelcomeParent.jsm"
+const { AboutWelcomeParent } = ChromeUtils.importESModule(
+  "resource:///actors/AboutWelcomeParent.sys.mjs"
 );
 
 const TEST_PROTON_CONTENT = [

browser/components/newtab/test/browser/browser_aboutwelcome_observer.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { AboutWelcomeParent } = ChromeUtils.import(
-  "resource:///actors/AboutWelcomeParent.jsm"
+const { AboutWelcomeParent } = ChromeUtils.importESModule(
+  "resource:///actors/AboutWelcomeParent.sys.mjs"
 );
 
 async function openAboutWelcomeTab() {

browser/components/newtab/test/browser/browser_aboutwelcome_rtamo.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { AddonRepository } = ChromeUtils.import(
   "resource://gre/modules/addons/AddonRepository.jsm"

browser/components/newtab/test/browser/browser_asrouter_bug1761522.js

@@ -3,15 +3,15 @@
 
 "use strict";
 
-const { ASRouter, MessageLoaderUtils } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter, MessageLoaderUtils } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
-const { PanelTestProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/PanelTestProvider.jsm"
+const { PanelTestProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
 );
 const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
-const { RemoteL10n } = ChromeUtils.import(
-  "resource://activity-stream/lib/RemoteL10n.jsm"
+const { RemoteL10n } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/RemoteL10n.sys.mjs"
 );
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"

browser/components/newtab/test/browser/browser_asrouter_cfr.js

@@ -1,18 +1,18 @@
-const { CFRPageActions } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRPageActions.jsm"
+const { CFRPageActions } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRPageActions.sys.mjs"
 );
-const { ASRouterTriggerListeners } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTriggerListeners.jsm"
+const { ASRouterTriggerListeners } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTriggerListeners.sys.mjs"
 );
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
 
-const { TelemetryFeed } = ChromeUtils.import(
-  "resource://activity-stream/lib/TelemetryFeed.jsm"
+const { TelemetryFeed } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/TelemetryFeed.sys.mjs"
 );
 
 const createDummyRecommendation = ({

browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js

@@ -4,8 +4,8 @@ const { BrowserTestUtils } = ChromeUtils.import(
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
   "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
@@ -19,8 +19,8 @@ const { ExperimentFakes, ExperimentTestUtils } = ChromeUtils.import(
 const { ExperimentManager } = ChromeUtils.import(
   "resource://nimbus/lib/ExperimentManager.jsm"
 );
-const { TelemetryFeed } = ChromeUtils.import(
-  "resource://activity-stream/lib/TelemetryFeed.jsm"
+const { TelemetryFeed } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/TelemetryFeed.sys.mjs"
 );
 const { TelemetryTestUtils } = ChromeUtils.import(
   "resource://testing-common/TelemetryTestUtils.jsm"

browser/components/newtab/test/browser/browser_asrouter_group_frequency.js

@@ -1,14 +1,14 @@
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
-const { CFRPageActions } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRPageActions.jsm"
+const { CFRPageActions } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRPageActions.sys.mjs"
 );
 
 /**

browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js

@@ -1,14 +1,14 @@
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
-const { CFRPageActions } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRPageActions.jsm"
+const { CFRPageActions } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRPageActions.sys.mjs"
 );
 
 /**

browser/components/newtab/test/browser/browser_asrouter_infobar.js

@@ -3,14 +3,14 @@
 
 "use strict";
 
-const { InfoBar } = ChromeUtils.import(
-  "resource://activity-stream/lib/InfoBar.jsm"
+const { InfoBar } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/InfoBar.sys.mjs"
 );
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 const { BrowserWindowTracker } = ChromeUtils.import(
   "resource:///modules/BrowserWindowTracker.jsm"

browser/components/newtab/test/browser/browser_asrouter_momentspagehub.js

@@ -1,14 +1,14 @@
-const { PanelTestProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/PanelTestProvider.jsm"
+const { PanelTestProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
 );
-const { MomentsPageHub } = ChromeUtils.import(
-  "resource://activity-stream/lib/MomentsPageHub.jsm"
+const { MomentsPageHub } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/MomentsPageHub.sys.mjs"
 );
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 
 const HOMEPAGE_OVERRIDE_PREF = "browser.startup.homepage_override.once";

browser/components/newtab/test/browser/browser_asrouter_remoteimages.js

@@ -13,9 +13,14 @@ const {
   RemoteImages,
   REMOTE_IMAGES_PATH,
   REMOTE_IMAGES_DB_PATH,
-} = ChromeUtils.import("resource://activity-stream/lib/RemoteImages.jsm");
-const { RemoteImagesTestUtils, RemoteSettingsServer } = ChromeUtils.import(
-  "resource://testing-common/RemoteImagesTestUtils.jsm"
+} = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/RemoteImages.sys.mjs"
+);
+const {
+  RemoteImagesTestUtils,
+  RemoteSettingsServer,
+} = ChromeUtils.importESModule(
+  "resource://testing-common/RemoteImagesTestUtils.sys.mjs"
 );
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"

browser/components/newtab/test/browser/browser_asrouter_snippets.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 
-const { TelemetryFeed } = ChromeUtils.import(
-  "resource://activity-stream/lib/TelemetryFeed.jsm"
+const { TelemetryFeed } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/TelemetryFeed.sys.mjs"
 );
 
 add_task(async function render_below_search_snippet() {

browser/components/newtab/test/browser/browser_asrouter_snippets_dismiss.js

@@ -9,8 +9,8 @@
  * will clear the snippet on the next (preloaded) about:newtab.
  */
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 
 async function setup() {

browser/components/newtab/test/browser/browser_asrouter_spotlight.js

@@ -3,11 +3,11 @@
 
 "use strict";
 
-const { Spotlight } = ChromeUtils.import(
-  "resource://activity-stream/lib/Spotlight.jsm"
+const { Spotlight } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/Spotlight.sys.mjs"
 );
-const { PanelTestProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/PanelTestProvider.jsm"
+const { PanelTestProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
 );
 const { BrowserWindowTracker } = ChromeUtils.import(
   "resource:///modules/BrowserWindowTracker.jsm"
@@ -15,8 +15,8 @@ const { BrowserWindowTracker } = ChromeUtils.import(
 const { SpecialMessageActions } = ChromeUtils.import(
   "resource://messaging-system/lib/SpecialMessageActions.jsm"
 );
-const { RemoteImagesTestUtils } = ChromeUtils.import(
-  "resource://testing-common/RemoteImagesTestUtils.jsm"
+const { RemoteImagesTestUtils } = ChromeUtils.importESModule(
+  "resource://testing-common/RemoteImagesTestUtils.sys.mjs"
 );
 
 function waitForDialog(callback = win => win.close()) {

browser/components/newtab/test/browser/browser_asrouter_targeting.js

@@ -1,11 +1,11 @@
-const { ASRouterTargeting, QueryCache } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
+const { ASRouterTargeting, QueryCache } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTargeting.sys.mjs"
 );
 const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
 ChromeUtils.defineModuleGetter(
   this,

browser/components/newtab/test/browser/browser_asrouter_toolbarbadge.js

@@ -1,8 +1,8 @@
-const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+const { OnboardingMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/OnboardingMessageProvider.sys.mjs"
 );
-const { ToolbarBadgeHub } = ChromeUtils.import(
-  "resource://activity-stream/lib/ToolbarBadgeHub.jsm"
+const { ToolbarBadgeHub } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ToolbarBadgeHub.sys.mjs"
 );
 
 add_task(async function test_setup() {

browser/components/newtab/test/browser/browser_getScreenshots.js

@@ -8,11 +8,9 @@ const TEST_URL =
   "https://example.com/browser/browser/components/newtab/test/browser/blue_page.html";
 const XHTMLNS = "http://www.w3.org/1999/xhtml";
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "Screenshots",
-  "resource://activity-stream/lib/Screenshots.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+  Screenshots: "resource://activity-stream/lib/Screenshots.sys.mjs",
+});
 
 function get_pixels(stringOrObject, width, height) {
   return new Promise(resolve => {

browser/components/newtab/test/browser/browser_multistage_spotlight.js

@@ -3,11 +3,11 @@
 
 "use strict";
 
-const { Spotlight } = ChromeUtils.import(
-  "resource://activity-stream/lib/Spotlight.jsm"
+const { Spotlight } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/Spotlight.sys.mjs"
 );
-const { PanelTestProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/PanelTestProvider.jsm"
+const { PanelTestProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
 );
 const { BrowserWindowTracker } = ChromeUtils.import(
   "resource:///modules/BrowserWindowTracker.jsm"

browser/components/newtab/test/browser/browser_multistage_spotlight_telemetry.js

@@ -1,17 +1,17 @@
 "use strict";
 
-const { Spotlight } = ChromeUtils.import(
-  "resource://activity-stream/lib/Spotlight.jsm"
+const { Spotlight } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/Spotlight.sys.mjs"
 );
-const { PanelTestProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/PanelTestProvider.jsm"
+const { PanelTestProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
 );
 const { BrowserWindowTracker } = ChromeUtils.import(
   "resource:///modules/BrowserWindowTracker.jsm"
 );
 
-const { AboutWelcomeTelemetry } = ChromeUtils.import(
-  "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm"
+const { AboutWelcomeTelemetry } = ChromeUtils.importESModule(
+  "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.sys.mjs"
 );
 
 async function waitForClick(selector, win) {

browser/components/newtab/test/browser/browser_newtab_ping.js

@@ -6,8 +6,8 @@
 const { AboutNewTab } = ChromeUtils.import(
   "resource:///modules/AboutNewTab.jsm"
 );
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 
 const { ExperimentFakes } = ChromeUtils.import(

browser/components/newtab/test/browser/browser_newtab_trigger.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 
 let sendTriggerMessageSpy;

browser/components/newtab/test/browser/browser_remote_l10n.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { RemoteL10n } = ChromeUtils.import(
-  "resource://activity-stream/lib/RemoteL10n.jsm"
+const { RemoteL10n } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/RemoteL10n.sys.mjs"
 );
 
 const ID = "remote_l10n_test_string";

browser/components/newtab/test/browser/browser_trigger_listeners.js

@@ -1,5 +1,5 @@
-const { ASRouterTriggerListeners } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTriggerListeners.jsm"
+const { ASRouterTriggerListeners } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTriggerListeners.sys.mjs"
 );
 
 add_setup(async function() {

browser/components/newtab/test/browser/head.js

@@ -7,12 +7,8 @@ ChromeUtils.defineModuleGetter(
 );
 ChromeUtils.defineESModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+  QueryCache: "resource://activity-stream/lib/ASRouterTargeting.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  this,
-  "QueryCache",
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
-);
 // eslint-disable-next-line no-unused-vars
 const { FxAccounts } = ChromeUtils.import(
   "resource://gre/modules/FxAccounts.jsm"

browser/components/newtab/test/xpcshell/test_ASRouterTargeting_attribution.js

@@ -7,8 +7,8 @@
 const { AttributionCode } = ChromeUtils.import(
   "resource:///modules/AttributionCode.jsm"
 );
-const { ASRouterTargeting } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
+const { ASRouterTargeting } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTargeting.sys.mjs"
 );
 const { MacAttribution } = ChromeUtils.import(
   "resource:///modules/MacAttribution.jsm"

browser/components/newtab/test/xpcshell/test_ASRouterTargeting_snapshot.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const { ASRouterTargeting } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
+const { ASRouterTargeting } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTargeting.sys.mjs"
 );
 
 add_task(async function should_ignore_rejections() {

browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheChild.js

@@ -3,8 +3,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const { AboutHomeStartupCacheChild } = ChromeUtils.import(
-  "resource:///modules/AboutNewTabService.jsm"
+const { AboutHomeStartupCacheChild } = ChromeUtils.importESModule(
+  "resource:///modules/AboutNewTabService.sys.mjs"
 );
 
 /**

browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js

@@ -31,8 +31,8 @@ AddonTestUtils.createAppInfo(
 const { AboutNewTab } = ChromeUtils.import(
   "resource:///modules/AboutNewTab.jsm"
 );
-const { PREFS_CONFIG } = ChromeUtils.import(
-  "resource://activity-stream/lib/ActivityStream.jsm"
+const { PREFS_CONFIG } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ActivityStream.sys.mjs"
 );
 
 ChromeUtils.defineModuleGetter(

browser/components/newtab/test/xpcshell/test_AboutWelcomeAttribution.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const { AboutWelcomeDefaults } = ChromeUtils.import(
-  "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm"
+const { AboutWelcomeDefaults } = ChromeUtils.importESModule(
+  "resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.sys.mjs"
 );
 const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
 const { AttributionCode } = ChromeUtils.import(

browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const { AboutWelcomeTelemetry } = ChromeUtils.import(
-  "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm"
+const { AboutWelcomeTelemetry } = ChromeUtils.importESModule(
+  "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.sys.mjs"
 );
 const { AttributionCode } = ChromeUtils.import(
   "resource:///modules/AttributionCode.jsm"

browser/components/newtab/test/xpcshell/test_OnboardingMessageProvider.js

@@ -4,8 +4,8 @@
 const { JsonSchema } = ChromeUtils.import(
   "resource://gre/modules/JsonSchema.jsm"
 );
-const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+const { OnboardingMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/OnboardingMessageProvider.sys.mjs"
 );
 const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
 

browser/components/newtab/test/xpcshell/test_PanelTestProvider.js

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

browser/components/places/CommonNames.sys.mjs

@@ -4,14 +4,10 @@
 
 "use strict";
 
-const { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
-
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  shortURL: "resource://activity-stream/lib/ShortURL.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  shortURL: "resource://activity-stream/lib/ShortURL.sys.mjs",
 });
 
 /**

browser/components/places/InteractionsBlocklist.sys.mjs

@@ -11,13 +11,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(lazy, "logConsole", function() {
   return console.createInstance({
     prefix: "InteractionsBlocklist",

browser/components/places/SnapshotScorer.sys.mjs

@@ -9,13 +9,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
   Snapshots: "resource:///modules/Snapshots.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(lazy, "logConsole", function() {
   return console.createInstance({
     prefix: "SnapshotSelector",

browser/components/places/SnapshotSelector.sys.mjs

@@ -11,6 +11,7 @@ const { EventEmitter } = ChromeUtils.import(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
   SnapshotScorer: "resource:///modules/SnapshotScorer.sys.mjs",
   Snapshots: "resource:///modules/Snapshots.sys.mjs",
@@ -18,7 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   DeferredTask: "resource://gre/modules/DeferredTask.jsm",
-  FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(lazy, "logConsole", function() {

browser/components/places/tests/browser/interactions/browser_interactions_blocklist.js

@@ -9,13 +9,10 @@ const ALLOWED_TEST_URL = "http://mochi.test:8888/";
 const BLOCKED_TEST_URL = "https://example.com/browser";
 
 ChromeUtils.defineESModuleGetters(this, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
   InteractionsBlocklist: "resource:///modules/InteractionsBlocklist.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
-});
-
 add_setup(async function() {
   let oldBlocklistValue = Services.prefs.getStringPref(
     "places.interactions.customBlocklist",

browser/components/places/tests/unit/interactions/test_snapshotselection_adult.js

@@ -12,8 +12,8 @@ const TEST_URL3 = "https://foo.com/";
 const TEST_URL4 = "https://bar.com/";
 const TEST_URL5 = "https://something.com/";
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+  FilterAdult: "resource://activity-stream/lib/FilterAdult.sys.mjs",
 });
 
 async function addSnapshotAndFilter(url) {

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_focus_promo.js

@@ -1,6 +1,6 @@
 const { Region } = ChromeUtils.import("resource://gre/modules/Region.jsm");
-const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+const { ASRouter } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouter.sys.mjs"
 );
 
 const initialHomeRegion = Region._home;

browser/components/privatebrowsing/test/browser/head.js

@@ -19,11 +19,14 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/FileUtils.jsm"
 );
 
+ChromeUtils.defineESModuleGetters(this, {
+  ASRouter: "resource://activity-stream/lib/ASRouter.sys.mjs",
+  PanelTestProvider: "resource://activity-stream/lib/PanelTestProvider.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
-  PanelTestProvider: "resource://activity-stream/lib/PanelTestProvider.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 

browser/components/urlbar/UrlbarProviderTopSites.sys.mjs

@@ -21,6 +21,9 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+  TOP_SITES_DEFAULT_ROWS: "resource://activity-stream/common/Reducers.sys.mjs",
+  TOP_SITES_MAX_SITES_PER_ROW:
+    "resource://activity-stream/common/Reducers.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs",
   UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
@@ -32,8 +35,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   CONTEXTUAL_SERVICES_PING_TYPES:
     "resource:///modules/PartnerLinkAttribution.jsm",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
-  TOP_SITES_MAX_SITES_PER_ROW: "resource://activity-stream/common/Reducers.jsm",
-  TOP_SITES_DEFAULT_ROWS: "resource://activity-stream/common/Reducers.jsm",
 });
 
 // The scalar category of TopSites impression for Contextual Services

browser/modules/AboutNewTab.jsm

@@ -14,8 +14,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  ActivityStream: "resource://activity-stream/lib/ActivityStream.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ActivityStream: "resource://activity-stream/lib/ActivityStream.jsm",
   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
   RemotePages:
     "resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm",

toolkit/components/backgroundtasks/tests/BackgroundTask_targeting.jsm

@@ -9,8 +9,8 @@ const { EXIT_CODE } = ChromeUtils.import(
   "resource://gre/modules/BackgroundTasksManager.jsm"
 ).BackgroundTasksManager;
 
-const { ASRouterTargeting } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
+const { ASRouterTargeting } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTargeting.sys.mjs"
 );
 
 // Background tasks are "live" with a temporary profile that doesn't map common

toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtasksutils.js

@@ -12,8 +12,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 );
 
 const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.sys.mjs",
 });
 
 setupProfileService();

toolkit/components/messaging-system/lib/SpecialMessageActions.jsm

@@ -13,12 +13,15 @@ const NETWORK_TRR_MODE_PREF = "network.trr.mode";
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  Spotlight: "resource://activity-stream/lib/Spotlight.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   UITour: "resource:///modules/UITour.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",
   MigrationUtils: "resource:///modules/MigrationUtils.jsm",
-  Spotlight: "resource://activity-stream/lib/Spotlight.jsm",
 });
 
 const SpecialMessageActions = {

toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_cfrmessageprovider.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
 
 add_task(async function test_all_test_messages() {

toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_open_spotlight_dialog.js

@@ -3,12 +3,12 @@
 
 "use strict";
 
-const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+const { OnboardingMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/OnboardingMessageProvider.sys.mjs"
 );
 
-const { Spotlight } = ChromeUtils.import(
-  "resource://activity-stream/lib/Spotlight.jsm"
+const { Spotlight } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/Spotlight.sys.mjs"
 );
 
 add_task(async function test_OPEN_SPOTLIGHT_DIALOG() {

toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js

@@ -1,11 +1,11 @@
 const TEST_URL =
   "https://example.com/browser/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/index.md";
 
-const { ASRouterTriggerListeners } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTriggerListeners.jsm"
+const { ASRouterTriggerListeners } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/ASRouterTriggerListeners.sys.mjs"
 );
-const { CFRMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/CFRMessageProvider.jsm"
+const { CFRMessageProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
 const { JsonSchema } = ChromeUtils.import(
   "resource://gre/modules/JsonSchema.jsm"

toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js

@@ -1,8 +1,7 @@
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterTriggerListeners",
-  "resource://activity-stream/lib/ASRouterTriggerListeners.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+  ASRouterTriggerListeners:
+    "resource://activity-stream/lib/ASRouterTriggerListeners.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   this,
   "TestUtils",

toolkit/components/messaging-system/targeting/Targeting.jsm

@@ -11,10 +11,14 @@ const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   clearTimeout: "resource://gre/modules/Timer.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
-  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
   FilterExpressions:
     "resource://gre/modules/components-utils/FilterExpressions.jsm",
   ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",

toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm

@@ -15,8 +15,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
   TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
   ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",

toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js

@@ -9,8 +9,8 @@ const { FirstStartup } = ChromeUtils.import(
 const { NimbusFeatures } = ChromeUtils.import(
   "resource://nimbus/ExperimentAPI.jsm"
 );
-const { PanelTestProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/PanelTestProvider.jsm"
+const { PanelTestProvider } = ChromeUtils.importESModule(
+  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
 );
 const { TelemetryTestUtils } = ChromeUtils.import(
   "resource://testing-common/TelemetryTestUtils.jsm"

toolkit/modules/NewTabUtils.jsm

@@ -15,9 +15,11 @@ let shortURL = {};
 let searchShortcuts = {};
 let didSuccessfulImport = false;
 try {
-  shortURL = ChromeUtils.import("resource://activity-stream/lib/ShortURL.jsm");
-  searchShortcuts = ChromeUtils.import(
-    "resource://activity-stream/lib/SearchShortcuts.jsm"
+  shortURL = ChromeUtils.importESModule(
+    "resource://activity-stream/lib/ShortURL.sys.mjs"
+  );
+  searchShortcuts = ChromeUtils.importESModule(
+    "resource://activity-stream/lib/SearchShortcuts.sys.mjs"
   );
   didSuccessfulImport = true;
 } catch (e) {