Bug 1806359 - Convert telemetry imports to direct ES imports. r=necko-reviewers,application-update-reviewers,pip-reviewers,credential-management-reviewers,janerik,mconley,sgalich,bytesized,kershaw

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

accessible/tests/browser/telemetry/browser_HCM_telemetry.js

@@ -11,8 +11,8 @@ Services.scriptloader.loadSubScript(
   this
 );
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 registerCleanupFunction(() => {

browser/base/content/browser.js

@@ -48,6 +48,7 @@ ChromeUtils.defineESModuleGetters(this, {
   SubDialogManager: "resource://gre/modules/SubDialog.sys.mjs",
   TabsSetupFlowManager:
     "resource:///modules/firefox-view-tabs-setup-manager.sys.mjs",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
   UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
   UrlbarInput: "resource:///modules/UrlbarInput.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
@@ -84,10 +85,8 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Pocket: "chrome://pocket/content/Pocket.jsm",
   ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
   PromptUtils: "resource://gre/modules/SharedPromptUtils.jsm",
-
   // TODO (Bug 1529552): Remove once old urlbar code goes away.
   ReaderMode: "resource://gre/modules/ReaderMode.jsm",
-
   RFPHelper: "resource://gre/modules/RFPHelper.jsm",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
   SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
@@ -95,7 +94,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   SitePermissions: "resource:///modules/SitePermissions.jsm",
   TabModalPrompt: "chrome://global/content/tabprompts.jsm",
   TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   Translation: "resource:///modules/translation/TranslationParent.jsm",
   UITour: "resource:///modules/UITour.jsm",
   Weave: "resource://services-sync/main.js",
@@ -1895,8 +1893,8 @@ var gBrowserInit = {
   },
 
   _delayedStartup() {
-    let { TelemetryTimestamps } = ChromeUtils.import(
+    let { TelemetryTimestamps } = ChromeUtils.importESModule(
-      "resource://gre/modules/TelemetryTimestamps.jsm"
+      "resource://gre/modules/TelemetryTimestamps.sys.mjs"
     );
     TelemetryTimestamps.add("delayedStartupStarted");
 

browser/base/content/test/general/browser_datachoices_notification.js

@@ -7,8 +7,8 @@
 var { Preferences } = ChromeUtils.importESModule(
   "resource://gre/modules/Preferences.sys.mjs"
 );
-var { TelemetryReportingPolicy } = ChromeUtils.import(
+var { TelemetryReportingPolicy } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetryReportingPolicy.jsm"
+  "resource://gre/modules/TelemetryReportingPolicy.sys.mjs"
 );
 
 const PREF_BRANCH = "datareporting.policy.";
@@ -26,16 +26,16 @@ const PREF_TELEMETRY_LOG_LEVEL = "toolkit.telemetry.log.level";
 const TEST_POLICY_VERSION = 37;
 
 function fakeShowPolicyTimeout(set, clear) {
-  let reportingPolicy = ChromeUtils.import(
+  let reportingPolicy = ChromeUtils.importESModule(
-    "resource://gre/modules/TelemetryReportingPolicy.jsm"
+    "resource://gre/modules/TelemetryReportingPolicy.sys.mjs"
   ).Policy;
   reportingPolicy.setShowInfobarTimeout = set;
   reportingPolicy.clearShowInfobarTimeout = clear;
 }
 
 function sendSessionRestoredNotification() {
-  let reportingPolicy = ChromeUtils.import(
+  let reportingPolicy = ChromeUtils.importESModule(
-    "resource://gre/modules/TelemetryReportingPolicy.jsm"
+    "resource://gre/modules/TelemetryReportingPolicy.sys.mjs"
   ).Policy;
 
   reportingPolicy.fakeSessionRestoreNotification();

browser/base/content/test/notificationbox/browser_notificationbar_telemetry.js

@@ -1,10 +1,8 @@
 const TELEMETRY_BASE = "notificationbar.";
 
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 add_task(async function showNotification() {
   Services.telemetry.clearScalars();

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

@@ -5,12 +5,12 @@ ChromeUtils.defineESModuleGetters(this, {
   EnterprisePolicyTesting:
     "resource://testing-common/EnterprisePolicyTesting.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 async function promisePageActionPanelOpen(win = window, eventDict = {}) {

browser/base/content/test/protectionsUI/browser_protectionsUI_cookie_banner.js

@@ -7,8 +7,8 @@
  * Tests the cookie banner handling section in the protections panel.
  */
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const {

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

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

browser/components/BrowserContentHandler.sys.mjs

@@ -11,6 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
+  UpdatePing: "resource://gre/modules/UpdatePing.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -20,7 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   LaterRun: "resource:///modules/LaterRun.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   ShellService: "resource:///modules/ShellService.jsm",
-  UpdatePing: "resource://gre/modules/UpdatePing.jsm",
 });
 XPCOMUtils.defineLazyServiceGetters(lazy, {
   UpdateManager: ["@mozilla.org/updates/update-manager;1", "nsIUpdateManager"],

browser/components/BrowserGlue.sys.mjs

@@ -40,6 +40,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
   ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
   SnapshotMonitor: "resource:///modules/SnapshotMonitor.sys.mjs",
+  TelemetryUtils: "resource://gre/modules/TelemetryUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   WebChannel: "resource://gre/modules/WebChannel.sys.mjs",
   WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
@@ -90,7 +91,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
     "resource://messaging-system/lib/SpecialMessageActions.jsm",
   TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
   TabUnloader: "resource:///modules/TabUnloader.jsm",
-  TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
   TRRRacer: "resource:///modules/TRRPerformance.jsm",
   UIState: "resource://services-sync/UIState.jsm",
 });
@@ -1564,8 +1564,8 @@ BrowserGlue.prototype = {
     ChromeUtils.addProfilerMarker("earlyBlankFirstPaint", startTime);
     win.openTime = Cu.now();
 
-    let { TelemetryTimestamps } = ChromeUtils.import(
+    let { TelemetryTimestamps } = ChromeUtils.importESModule(
-      "resource://gre/modules/TelemetryTimestamps.jsm"
+      "resource://gre/modules/TelemetryTimestamps.sys.mjs"
     );
     TelemetryTimestamps.add("blankWindowShown");
   },

browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js

@@ -3,8 +3,8 @@
 
 requestLongerTimeout(2);
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 EXPECTED_BREACH = {

browser/components/aboutlogins/tests/browser/browser_openExport.js

@@ -11,8 +11,8 @@
 let { OSKeyStore } = ChromeUtils.importESModule(
   "resource://gre/modules/OSKeyStore.sys.mjs"
 );
-let { TelemetryTestUtils } = ChromeUtils.import(
+let { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 let { MockFilePicker } = SpecialPowers;

browser/components/aboutlogins/tests/browser/browser_openImport.js

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

browser/components/aboutlogins/tests/browser/browser_openImportCSV.js

@@ -6,8 +6,8 @@ const { FileTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/FileTestUtils.sys.mjs"
 );
 
-let { TelemetryTestUtils } = ChromeUtils.import(
+let { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 let { MockFilePicker } = SpecialPowers;

browser/components/aboutlogins/tests/browser/browser_openPreferences.js

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

browser/components/attribution/test/browser/browser_AttributionCode_Mac_telemetry.js

@@ -1,8 +1,6 @@
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 const { MacAttribution } = ChromeUtils.import(
   "resource:///modules/MacAttribution.jsm"
 );

browser/components/attribution/test/browser/browser_AttributionCode_telemetry.js

@@ -1,8 +1,6 @@
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 const { AttributionIOUtils } = ChromeUtils.import(
   "resource:///modules/AttributionCode.jsm"
 );

browser/components/colorways/tests/browser/browser_colorwayCloset_telemetry.js

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

browser/components/doh/DoHController.jsm

@@ -19,13 +19,13 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
+  ClientID: "resource://gre/modules/ClientID.sys.mjs",
   Preferences: "resource://gre/modules/Preferences.sys.mjs",
   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ClientID: "resource://gre/modules/ClientID.jsm",
   DoHConfigController: "resource:///modules/DoHConfig.jsm",
   Heuristics: "resource:///modules/DoHHeuristics.jsm",
 });

browser/components/downloads/test/browser/browser_download_is_clickable.js

@@ -7,8 +7,8 @@ ChromeUtils.defineESModuleGetters(this, {
   DownloadsViewUI: "resource:///modules/DownloadsViewUI.sys.mjs",
 });
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 add_task(async function test_download_clickable() {

browser/components/downloads/test/browser/browser_download_opens_on_click.js

@@ -7,8 +7,8 @@ ChromeUtils.defineESModuleGetters(this, {
   DownloadsViewUI: "resource:///modules/DownloadsViewUI.sys.mjs",
 });
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const { DownloadIntegration } = ChromeUtils.importESModule(

browser/components/downloads/test/browser/browser_download_opens_policy.js

@@ -11,8 +11,8 @@ ChromeUtils.defineESModuleGetters(this, {
   DownloadsViewUI: "resource:///modules/DownloadsViewUI.sys.mjs",
 });
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const { DownloadIntegration } = ChromeUtils.importESModule(

browser/components/enterprisepolicies/tests/browser/browser_policy_disable_telemetry.js

@@ -4,8 +4,8 @@
 "use strict";
 
 add_task(async function test_policy_disable_telemetry() {
-  const { TelemetryReportingPolicy } = ChromeUtils.import(
+  const { TelemetryReportingPolicy } = ChromeUtils.importESModule(
-    "resource://gre/modules/TelemetryReportingPolicy.jsm"
+    "resource://gre/modules/TelemetryReportingPolicy.sys.mjs"
   );
 
   ok(TelemetryReportingPolicy, "TelemetryReportingPolicy exists");

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

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

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

@@ -7,7 +7,9 @@
 const { AddonStudies } = ChromeUtils.import(
   "resource://normandy/lib/AddonStudies.jsm"
 );
-const { ClientID } = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
+const { ClientID } = ChromeUtils.importESModule(
+  "resource://gre/modules/ClientID.sys.mjs"
+);
 
 ChromeUtils.defineModuleGetter(
   this,

browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js

@@ -2,8 +2,8 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 ChromeUtils.defineModuleGetter(

browser/components/extensions/test/browser/browser_ext_settings_overrides_default_search.js

@@ -5,12 +5,12 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 const EXTENSION1_ID = "extension1@mozilla.com";

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

@@ -14,8 +14,8 @@ ChromeUtils.defineModuleGetter(
 const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
   "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const TELEMETRY_EVENTS_FILTERS = {

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

@@ -6,11 +6,14 @@ const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
+ChromeUtils.defineESModuleGetters(this, {
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   HomePage: "resource:///modules/HomePage.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 function promisePrefChanged(expectedValue) {

browser/components/firefoxview/tests/browser/head.js

@@ -13,8 +13,8 @@ const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
 const { FeatureCalloutMessages } = ChromeUtils.import(
   "resource://activity-stream/lib/FeatureCalloutMessages.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {

browser/components/ion/content/ion.js

@@ -19,8 +19,8 @@ const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
 
-const { TelemetryController } = ChromeUtils.import(
+const { TelemetryController } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetryController.jsm"
+  "resource://gre/modules/TelemetryController.sys.mjs"
 );
 
 let parserUtils = Cc["@mozilla.org/parserutils;1"].getService(

browser/components/ion/test/browser/browser_ion_ui.js

@@ -8,12 +8,12 @@ const { JsonSchema } = ChromeUtils.importESModule(
   "resource://gre/modules/JsonSchema.sys.mjs"
 );
 
-const { TelemetryArchive } = ChromeUtils.import(
+const { TelemetryArchive } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetryArchive.jsm"
+  "resource://gre/modules/TelemetryArchive.sys.mjs"
 );
 
-const { TelemetryStorage } = ChromeUtils.import(
+const { TelemetryStorage } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetryStorage.jsm"
+  "resource://gre/modules/TelemetryStorage.sys.mjs"
 );
 
 const ORIG_AVAILABLE_LOCALES = Services.locale.availableLocales;

browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm

@@ -10,10 +10,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  ClientID: "resource://gre/modules/ClientID.sys.mjs",
+  TelemetrySession: "resource://gre/modules/TelemetrySession.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   PingCentre: "resource:///modules/PingCentre.jsm",
-  ClientID: "resource://gre/modules/ClientID.jsm",
-  TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
   AttributionCode: "resource:///modules/AttributionCode.jsm",
 });
 XPCOMUtils.defineLazyPreferenceGetter(

browser/components/newtab/lib/ASRouterTargeting.jsm

@@ -22,19 +22,19 @@ const { ShellService } = ChromeUtils.import(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
   ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
-  BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
+  TelemetrySession: "resource://gre/modules/TelemetrySession.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   ASRouterPreferences: "resource://activity-stream/lib/ASRouterPreferences.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   AttributionCode: "resource:///modules/AttributionCode.jsm",
   TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
-  TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
   HomePage: "resource:///modules/HomePage.jsm",
   AboutNewTab: "resource:///modules/AboutNewTab.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",

browser/components/newtab/lib/TelemetryFeed.jsm

@@ -44,7 +44,10 @@ ChromeUtils.defineModuleGetter(
   "resource://activity-stream/lib/UTEventReporting.jsm"
 );
 ChromeUtils.defineESModuleGetters(lazy, {
+  ClientID: "resource://gre/modules/ClientID.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
+  TelemetrySession: "resource://gre/modules/TelemetrySession.sys.mjs",
   UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
 });
 ChromeUtils.defineModuleGetter(
@@ -57,17 +60,10 @@ ChromeUtils.defineModuleGetter(
   "ExtensionSettingsStore",
   "resource://gre/modules/ExtensionSettingsStore.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ClientID",
-  "resource://gre/modules/ClientID.jsm"
-);
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
-  TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
 });
 
 const ACTIVITY_STREAM_ID = "activity-stream";

browser/components/newtab/test/browser/browser_aboutwelcome_multistage_experimentAPI.js

@@ -6,8 +6,8 @@ const { ExperimentAPI } = ChromeUtils.import(
 const { ExperimentFakes } = ChromeUtils.import(
   "resource://testing-common/NimbusTestUtils.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const TEST_PROTON_CONTENT = [

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

@@ -19,8 +19,8 @@ const { ExperimentManager } = ChromeUtils.import(
 const { TelemetryFeed } = ChromeUtils.import(
   "resource://activity-stream/lib/TelemetryFeed.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const MESSAGE_CONTENT = {

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

@@ -14,8 +14,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   QueryCache: "resource://activity-stream/lib/ASRouterTargeting.jsm",
   ShellService: "resource:///modules/ShellService.jsm",
   TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
-  TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
 });
 ChromeUtils.defineESModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
@@ -24,6 +22,8 @@ ChromeUtils.defineESModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
+  TelemetrySession: "resource://gre/modules/TelemetrySession.sys.mjs",
 });
 
 // ASRouterTargeting.findMatchingMessage

browser/components/newtab/test/browser/browser_topsites_annotation.js

@@ -17,11 +17,11 @@ const { XPCOMUtils } = ChromeUtils.import(
 
 ChromeUtils.defineESModuleGetters(this, {
   NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
   UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
 });
 

browser/components/places/tests/browser/browser_bookmarks_toolbar_telemetry.js

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

browser/components/pocket/content/pktTelemetry.jsm

@@ -20,8 +20,8 @@ ChromeUtils.defineModuleGetter(
   "pktApi",
   "chrome://pocket/content/pktApi.jsm"
 );
-XPCOMUtils.defineLazyModuleGetters(lazy, {
+ChromeUtils.defineESModuleGetters(lazy, {
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
 });
 
 // List of namespaces for the structured ingestion system.

browser/components/preferences/tests/browser_moreFromMozilla.js

@@ -7,8 +7,8 @@ const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
   "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
-let { TelemetryTestUtils } = ChromeUtils.import(
+let { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 async function clearPolicies() {

browser/components/preferences/tests/browser_password_management.js

@@ -3,8 +3,8 @@
 const { LoginTestUtils } = ChromeUtils.import(
   "resource://testing-common/LoginTestUtils.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 var passwordsDialog;

browser/components/preferences/tests/browser_searchDefaultEngine.js

@@ -5,8 +5,8 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
+ChromeUtils.defineESModuleGetters(this, {
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 SearchTestUtils.init(this);

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

@@ -8,6 +8,7 @@ ChromeUtils.defineESModuleGetters(this, {
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
@@ -15,7 +16,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
   PanelTestProvider: "resource://activity-stream/lib/PanelTestProvider.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 function whenNewWindowLoaded(aOptions, aCallback) {

browser/components/search/test/browser/head.js

@@ -8,6 +8,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
 });
 
@@ -16,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
   CustomizableUITestUtils:
     "resource://testing-common/CustomizableUITestUtils.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 let gCUITestUtils = new CustomizableUITestUtils(window);

browser/components/search/test/unit/test_urlTelemetry.js

@@ -9,12 +9,12 @@ ChromeUtils.defineESModuleGetters(this, {
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 const TESTS = [

browser/components/search/test/unit/test_urlTelemetry_generic.js

@@ -9,12 +9,12 @@ ChromeUtils.defineESModuleGetters(this, {
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   NetUtil: "resource://gre/modules/NetUtil.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 const TEST_PROVIDER_INFO = [

browser/components/sessionstore/SessionStore.sys.mjs

@@ -215,9 +215,7 @@ const kLastIndex = Number.MAX_SAFE_INTEGER - 1;
 
 import { PrivateBrowsingUtils } from "resource://gre/modules/PrivateBrowsingUtils.sys.mjs";
 
-const { TelemetryTimestamps } = ChromeUtils.import(
+import { TelemetryTimestamps } from "resource://gre/modules/TelemetryTimestamps.sys.mjs";
-  "resource://gre/modules/TelemetryTimestamps.jsm"
-);
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 import { GlobalState } from "resource:///modules/sessionstore/GlobalState.sys.mjs";

browser/components/tests/browser/head.js

@@ -3,9 +3,12 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
+ChromeUtils.defineESModuleGetters(this, {
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 // Helpers for testing telemetry events.

browser/components/uitour/UITour.jsm

@@ -18,6 +18,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
   ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
   ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
+  TelemetryController: "resource://gre/modules/TelemetryController.sys.mjs",
   UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
 });
 
@@ -27,7 +28,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   CustomizableUI: "resource:///modules/CustomizableUI.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",
   PanelMultiView: "resource:///modules/PanelMultiView.jsm",
-  TelemetryController: "resource://gre/modules/TelemetryController.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {

browser/components/uitour/test/browser_UITour.js

@@ -8,13 +8,10 @@ var gContentAPI;
 
 ChromeUtils.defineESModuleGetters(this, {
   ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
-  UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(this, {
   TelemetryArchiveTesting:
-    "resource://testing-common/TelemetryArchiveTesting.jsm",
+    "resource://testing-common/TelemetryArchiveTesting.sys.mjs",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
+  UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
 });
 
 function test() {

browser/components/urlbar/UrlbarPrefs.sys.mjs

@@ -14,12 +14,12 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   Region: "resource://gre/modules/Region.sys.mjs",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
 });
 
 const PREF_URLBAR_BRANCH = "browser.urlbar.";

browser/components/urlbar/tests/browser-tips/head.js

@@ -16,6 +16,7 @@ Services.scriptloader.loadSubScript(
 
 ChromeUtils.defineESModuleGetters(this, {
   ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarProviderInterventions:
     "resource:///modules/UrlbarProviderInterventions.sys.mjs",
   UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
@@ -24,7 +25,6 @@ ChromeUtils.defineESModuleGetters(this, {
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   HttpServer: "resource://testing-common/httpd.js",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => {

browser/components/urlbar/tests/browser/head.js

@@ -15,6 +15,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
   ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
   UrlbarQueryContext: "resource:///modules/UrlbarUtils.sys.mjs",
   UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
@@ -29,7 +30,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 let sandbox;

browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs

@@ -1,19 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
-});
-
 const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
 
 // The following properties and methods are copied from the test scope to the

browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs

@@ -13,12 +13,13 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
-  setTimeout: "resource://gre/modules/Timer.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   TestUtils: "resource://testing-common/TestUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderQuickSuggest:
     "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs",
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
+  setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -26,7 +27,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
   ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 let gTestScope;

browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_onboardingDialog.js

@@ -7,8 +7,8 @@
  * Tests the buttons in the onboarding dialog for quick suggest/Firefox Suggest.
  */
 
-XPCOMUtils.defineLazyModuleGetters(this, {
+ChromeUtils.defineESModuleGetters(this, {
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
 });
 
 const OTHER_DIALOG_URI = getRootDirectory(gTestPath) + "subdialog.xhtml";

browser/components/urlbar/tests/quicksuggest/browser/browser_telemetry_other.js

@@ -8,8 +8,8 @@
 
 "use strict";
 
-XPCOMUtils.defineLazyModuleGetters(this, {
+ChromeUtils.defineESModuleGetters(this, {
-  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
 });
 
 const SPONSORED_SUGGESTION = {

browser/components/urlbar/tests/quicksuggest/browser/head.js

@@ -15,14 +15,11 @@ ChromeUtils.defineESModuleGetters(this, {
   CONTEXTUAL_SERVICES_PING_TYPES:
     "resource:///modules/PartnerLinkAttribution.jsm",
   QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarProviderQuickSuggest:
     "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => {
   const { QuickSuggestTestUtils: Utils } = ChromeUtils.importESModule(
     "resource://testing-common/QuickSuggestTestUtils.sys.mjs"

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

@@ -4,18 +4,15 @@
 /* import-globals-from ../../unit/head.js */
 
 ChromeUtils.defineESModuleGetters(this, {
+  QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
   RemoteSettingsClient:
     "resource:///modules/urlbar/private/RemoteSettingsClient.sys.mjs",
-  QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.sys.mjs",
   UrlbarProviderQuickSuggest:
     "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
-});
-
 add_setup(async function setUpQuickSuggestXpcshellTest() {
   // Initializing TelemetryEnvironment in an xpcshell environment requires
   // jumping through a bunch of hoops. Suggest's use of TelemetryEnvironment is

browser/extensions/formautofill/test/browser/creditCard/browser_creditCard_telemetry.js

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

browser/extensions/search-detection/tests/browser/browser_client_side_redirection.js

@@ -7,8 +7,8 @@ const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 AddonTestUtils.initMochitest(this);

browser/extensions/search-detection/tests/browser/browser_server_side_redirection.js

@@ -7,8 +7,8 @@ const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 AddonTestUtils.initMochitest(this);

browser/modules/BrowserUsageTelemetry.jsm

@@ -22,6 +22,7 @@ const { AppConstants } = ChromeUtils.importESModule(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  ClientID: "resource://gre/modules/ClientID.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
   clearInterval: "resource://gre/modules/Timer.sys.mjs",
@@ -31,7 +32,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ClientID: "resource://gre/modules/ClientID.jsm",
   CustomizableUI: "resource:///modules/CustomizableUI.jsm",
   PageActions: "resource:///modules/PageActions.jsm",
   WindowsInstallsInfo:

browser/modules/Discovery.jsm

@@ -11,12 +11,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ClientID",
-  "resource://gre/modules/ClientID.jsm"
-);
 ChromeUtils.defineESModuleGetters(lazy, {
+  ClientID: "resource://gre/modules/ClientID.sys.mjs",
   ContextualIdentityService:
     "resource://gre/modules/ContextualIdentityService.sys.mjs",
 });
@@ -115,7 +111,7 @@ const DiscoveryInternal = {
 
     if (Discovery.enabled) {
       // If the client id is not cached, wait for the notification that it is
-      // cached.  This will happen shortly after startup in TelemetryController.jsm.
+      // cached.  This will happen shortly after startup in TelemetryController.sys.mjs.
       // When that happens, we'll get a pref notification for the cached id,
       // which will call update again.
       if (!lazy.gCachedClientID) {

browser/modules/PingCentre.jsm

@@ -7,18 +7,10 @@ const { AppConstants } = ChromeUtils.importESModule(
 );
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
   UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+  sendStandalonePing: "resource://gre/modules/TelemetrySend.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "TelemetryEnvironment",
-  "resource://gre/modules/TelemetryEnvironment.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "sendStandalonePing",
-  "resource://gre/modules/TelemetrySend.jsm"
-);
 
 const PREF_BRANCH = "browser.ping-centre.";
 

browser/modules/test/browser/browser_Telemetry_numberOfSiteOrigins.js

@@ -9,11 +9,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 const gTestRoot = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",

browser/modules/test/browser/browser_Telemetry_numberOfSiteOriginsPerDocument.js

@@ -4,11 +4,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 const histogramName = "FX_NUMBER_OF_UNIQUE_SITE_ORIGINS_PER_DOCUMENT";
 const testRoot = getRootDirectory(gTestPath).replace(

browser/modules/test/browser/head.js

@@ -1,11 +1,7 @@
 ChromeUtils.defineESModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  this,
-  "TelemetryTestUtils",
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 const SINGLE_TRY_TIMEOUT = 100;
 const NUMBER_OF_TRIES = 30;

browser/modules/test/unit/test_HomePage_ignore.js

@@ -8,11 +8,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
 
+ChromeUtils.defineESModuleGetters(this, {
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(this, {
   HomePage: "resource:///modules/HomePage.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   sinon: "resource://testing-common/Sinon.jsm",
-  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
 });
 
 const HOMEPAGE_IGNORELIST = "homepage-urls";

browser/modules/test/unit/test_InstallationTelemetry.js

@@ -9,8 +9,8 @@ const { AppConstants } = ChromeUtils.importESModule(
 const { BrowserUsageTelemetry } = ChromeUtils.import(
   "resource:///modules/BrowserUsageTelemetry.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 ChromeUtils.defineESModuleGetters(this, {
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",

browser/modules/test/unit/test_PingCentre.js

@@ -7,8 +7,8 @@
 const { PingCentre, PingCentreConstants } = ChromeUtils.import(
   "resource:///modules/PingCentre.jsm"
 );
-const { TelemetryEnvironment } = ChromeUtils.import(
+const { TelemetryEnvironment } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetryEnvironment.jsm"
+  "resource://gre/modules/TelemetryEnvironment.sys.mjs"
 );
 const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"

browser/modules/test/unit/test_ProfileCounter.js

@@ -6,8 +6,8 @@
 const { BrowserUsageTelemetry } = ChromeUtils.import(
   "resource:///modules/BrowserUsageTelemetry.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const PROFILE_COUNT_SCALAR = "browser.engagement.profile_count";

browser/modules/test/unit/test_discovery.js

@@ -10,7 +10,9 @@ do_get_profile();
 const { TestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TestUtils.sys.mjs"
 );
-const { ClientID } = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
+const { ClientID } = ChromeUtils.importESModule(
+  "resource://gre/modules/ClientID.sys.mjs"
+);
 const { Discovery } = ChromeUtils.import("resource:///modules/Discovery.jsm");
 const { ContextualIdentityService } = ChromeUtils.importESModule(
   "resource://gre/modules/ContextualIdentityService.sys.mjs"

devtools/client/framework/test/browser_toolbox_telemetry_close.js

@@ -4,8 +4,8 @@
 "use strict";
 
 const { Toolbox } = require("resource://devtools/client/framework/toolbox.js");
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const URL = "data:text/html;charset=utf8,browser_toolbox_telemetry_close.js";

devtools/client/netmonitor/test/browser_net_telemetry_persist_toggle_changed.js

@@ -6,8 +6,8 @@
 /**
  * Tests the log persistence telemetry event
  */
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 function togglePersistLogsOption(monitor) {

devtools/client/netmonitor/test/browser_net_telemetry_select_ws_frame.js

@@ -6,8 +6,8 @@
 /**
  * Tests the select_ws_frame telemetry event.
  */
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 add_task(async function() {

devtools/client/shared/telemetry.js

@@ -14,8 +14,8 @@ const TelemetryStopwatch = require("TelemetryStopwatch");
 const {
   getNthPathExcluding,
 } = require("resource://devtools/shared/platform/stack.js");
-const { TelemetryEnvironment } = ChromeUtils.import(
+const { TelemetryEnvironment } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetryEnvironment.jsm"
+  "resource://gre/modules/TelemetryEnvironment.sys.mjs"
 );
 const WeakMapMap = require("resource://devtools/client/shared/WeakMapMap.js");
 

devtools/client/webconsole/test/browser/browser_webconsole_telemetry_persist_toggle_changed.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const TEST_URI = `data:text/html,<!DOCTYPE html><meta charset=utf8><script>

devtools/client/webconsole/test/browser/browser_webconsole_telemetry_reverse_search.js

@@ -6,8 +6,8 @@
 
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const TEST_URI = `data:text/html,<!DOCTYPE html><meta charset=utf8>Test reverse_search telemetry event`;

dom/base/test/browser_page_load_event_telemetry.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const ALL_CHANNELS = Ci.nsITelemetry.DATASET_ALL_CHANNELS;

dom/crypto/test/browser/browser_WebCrypto_telemetry.js

@@ -8,11 +8,9 @@
 
 const WEBCRYPTO_ALG_PROBE = "WEBCRYPTO_ALG";
 
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 add_task(async function ecdh_key() {
   let hist = TelemetryTestUtils.getAndClearHistogram(WEBCRYPTO_ALG_PROBE);

dom/ipc/tests/browser_memory_distribution_telemetry.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { TelemetrySession } = ChromeUtils.import(
+const { TelemetrySession } = ChromeUtils.importESModule(
-  "resource://gre/modules/TelemetrySession.jsm"
+  "resource://gre/modules/TelemetrySession.sys.mjs"
 );
 
 const DUMMY_PAGE_DATA_URI = `data:text/html,

dom/quota/test/xpcshell/telemetry/test_qm_first_initialization_attempt.js

@@ -6,8 +6,8 @@
 const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const storageDirName = "storage";

dom/security/test/general/browser_test_report_blocking.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { TelemetryArchiveTesting } = ChromeUtils.import(
+const { TelemetryArchiveTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryArchiveTesting.jsm"
+  "resource://testing-common/TelemetryArchiveTesting.sys.mjs"
 );
 
 const kTestPath = getRootDirectory(gTestPath).replace(

dom/webauthn/tests/browser/browser_webauthn_telemetry.js

@@ -4,11 +4,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 const TEST_URL = "https://example.com/";
 

dom/webauthn/tests/u2f/browser/browser_webauthn_telemetry.js

@@ -4,11 +4,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
-  "TelemetryTestUtils",
+});
-  "resource://testing-common/TelemetryTestUtils.jsm"
-);
 
 const TEST_URL = "https://example.com/";
 

dom/xhr/XMLHttpRequestMainThread.h

@@ -204,7 +204,7 @@ class XMLHttpRequestMainThread final : public XMLHttpRequest,
   };
 
   // Make sure that any additions done to ErrorType enum are also mirrored in
-  // XHR_ERROR_TYPE enum of TelemetrySend.jsm.
+  // XHR_ERROR_TYPE enum of TelemetrySend.sys.mjs.
   enum class ErrorType : uint16_t {
     eOK,
     eRequest,

modules/libjar/test/unit/test_empty_jar_telemetry.js

@@ -6,8 +6,8 @@
 
 const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const nsIBinaryInputStream = Components.Constructor(

modules/libpref/test/browser/browser_sanitization_events.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 // eslint-disable-next-line

netwerk/test/browser/browser_103_telemetry.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 Services.prefs.setCharPref("dom.securecontext.allowlist", "example.com");

netwerk/test/unit/head_telemetry.js

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

netwerk/test/unit/test_http3_large_post_telemetry.js

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 let indexes_10_100 = [

parser/htmlparser/tests/mochitest/browser_ysod_telemetry.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 add_task(async function test_popup_opened() {

services/common/tests/unit/test_uptake_telemetry.js

@@ -1,5 +1,5 @@
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 const { UptakeTelemetry } = ChromeUtils.import(
   "resource://services-common/uptake-telemetry.js"

services/common/uptake-telemetry.js

@@ -13,11 +13,9 @@ const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
 const lazy = {};
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(lazy, {
-  lazy,
+  ClientID: "resource://gre/modules/ClientID.sys.mjs",
-  "ClientID",
+});
-  "resource://gre/modules/ClientID.jsm"
-);
 
 XPCOMUtils.defineLazyGetter(lazy, "CryptoHash", () => {
   return Components.Constructor(

services/settings/test/unit/test_attachments_downloader.js

@@ -9,8 +9,8 @@ const { UptakeTelemetry } = ChromeUtils.import(
 const { Downloader } = ChromeUtils.import(
   "resource://services-settings/Attachments.jsm"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 

services/settings/test/unit/test_remote_settings.js

@@ -17,8 +17,8 @@ const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm");
 const { UptakeTelemetry, Policy } = ChromeUtils.import(
   "resource://services-common/uptake-telemetry.js"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const IS_ANDROID = AppConstants.platform == "android";

services/settings/test/unit/test_remote_settings_poll.js

@@ -25,8 +25,8 @@ const {
   BROADCAST_ID,
 } = ChromeUtils.import("resource://services-settings/remote-settings.js");
 const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm");
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const IS_ANDROID = AppConstants.platform == "android";

services/settings/test/unit/test_remote_settings_signatures.js

@@ -10,8 +10,8 @@ const { RemoteSettingsClient } = ChromeUtils.import(
 const { UptakeTelemetry, Policy } = ChromeUtils.import(
   "resource://services-common/uptake-telemetry.js"
 );
-const { TelemetryTestUtils } = ChromeUtils.import(
+const { TelemetryTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+  "resource://testing-common/TelemetryTestUtils.sys.mjs"
 );
 
 const PREF_SETTINGS_SERVER = "services.settings.server";