Bug 1792824 - Convert ObjectUtils.jsm to an ES module. r=barret,necko-reviewers,devtools-reviewers,kershaw

Depends on D183308

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

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

@@ -1,11 +1,7 @@
 "use strict";
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "ObjectUtils",
-  "resource://gre/modules/ObjectUtils.jsm"
-);
 ChromeUtils.defineESModuleGetters(this, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
 });
 ChromeUtils.defineModuleGetter(

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

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

browser/components/sessionstore/SessionStartup.sys.mjs

@@ -30,9 +30,8 @@
 /* :::::::: Constants and Helpers ::::::::::::::: */
 
 const lazy = {};
-const { AppConstants } = ChromeUtils.import(
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
-  "resource://gre/modules/AppConstants.jsm"
+
-);
 ChromeUtils.defineESModuleGetters(lazy, {
   CrashMonitor: "resource://gre/modules/CrashMonitor.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",

browser/components/urlbar/UrlbarInput.sys.mjs

@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   BrowserUIUtils: "resource:///modules/BrowserUIUtils.sys.mjs",
   ExtensionSearchHandler:
     "resource://gre/modules/ExtensionSearchHandler.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
@@ -30,10 +31,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   UrlbarView: "resource:///modules/UrlbarView.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyServiceGetter(
   lazy,
   "ClipboardHelper",

browser/components/urlbar/UrlbarProviderPlaces.sys.mjs

@@ -114,6 +114,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   KeywordUtils: "resource://gre/modules/KeywordUtils.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
   Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
@@ -125,10 +126,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 function setTimeout(callback, ms) {
   let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
   timer.initWithCallback(callback, ms, timer.TYPE_ONE_SHOT);

browser/components/urlbar/UrlbarProvidersManager.sys.mjs

@@ -12,6 +12,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   SkippableTimer: "resource:///modules/UrlbarUtils.sys.mjs",
   UrlbarMuxer: "resource:///modules/UrlbarUtils.sys.mjs",
@@ -22,10 +23,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(lazy, "logger", () =>
   lazy.UrlbarUtils.getLogger({ prefix: "ProvidersManager" })
 );

browser/components/urlbar/UrlbarView.sys.mjs

@@ -10,6 +10,7 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
   L10nCache: "resource:///modules/UrlbarUtils.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderQuickSuggest:
     "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs",
@@ -22,10 +23,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyServiceGetter(
   lazy,
   "styleSheetService",

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

@@ -11,6 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
   ExperimentFakes: "resource://testing-common/NimbusTestUtils.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
   PromptTestUtils: "resource://testing-common/PromptTestUtils.sys.mjs",
   ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
@@ -25,10 +26,6 @@ ChromeUtils.defineESModuleGetters(this, {
   sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(this, "PlacesFrecencyRecalculator", () => {
   return Cc["@mozilla.org/places/frecency-recalculator;1"].getService(
     Ci.nsIObserver

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

@@ -7,14 +7,11 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   SuggestionsMap:
     "resource:///modules/urlbar/private/QuickSuggestRemoteSettings.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 // This overrides `SuggestionsMap.chunkSize`. Testing the actual value can make
 // the test run too long. This is OK because the correctness of the chunking
 // behavior doesn't depend on the chunk size.

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

@@ -7,8 +7,8 @@
 var { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-var { ObjectUtils } = ChromeUtils.import(
+var { ObjectUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ObjectUtils.jsm"
+  "resource://gre/modules/ObjectUtils.sys.mjs"
 );
 var { FormLikeFactory } = ChromeUtils.importESModule(
   "resource://gre/modules/FormLikeFactory.sys.mjs"

browser/modules/AboutNewTab.sys.mjs

@@ -7,9 +7,12 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   ActivityStream: "resource://activity-stream/lib/ActivityStream.jsm",
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
 });
 
 const ABOUT_URL = "about:newtab";

browser/modules/test/browser/browser_UsageTelemetry.js

@@ -23,8 +23,8 @@ ChromeUtils.defineESModuleGetters(this, {
     "resource:///modules/BrowserUsageTelemetry.sys.mjs",
 });
 
-const { ObjectUtils } = ChromeUtils.import(
+const { ObjectUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ObjectUtils.jsm"
+  "resource://gre/modules/ObjectUtils.sys.mjs"
 );
 
 BrowserUsageTelemetry._onTabsOpenedTask._timeoutMs = 0;

devtools/shared/DevToolsUtils.js

@@ -20,14 +20,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
   NetworkHelper:
     "resource://devtools/shared/network-observer/NetworkHelper.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
 });
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ObjectUtils",
-  "resource://gre/modules/ObjectUtils.jsm"
-);
-
 // Native getters which are considered to be side effect free.
 ChromeUtils.defineLazyGetter(lazy, "sideEffectFreeGetters", () => {
   const {

dom/push/PushServiceWebSocket.sys.mjs

@@ -11,13 +11,9 @@ import { PushCrypto } from "resource://gre/modules/PushCrypto.sys.mjs";
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   pushBroadcastService: "resource://gre/modules/PushBroadcastService.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ObjectUtils",
-  "resource://gre/modules/ObjectUtils.jsm"
-);
 
 const kPUSHWSDB_DB_NAME = "pushapi";
 const kPUSHWSDB_DB_VERSION = 5; // Change this if the IndexedDB format changes

dom/push/test/xpcshell/head.js

@@ -8,6 +8,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
 );
 
 ChromeUtils.defineESModuleGetters(this, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PermissionTestUtils: "resource://testing-common/PermissionTestUtils.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
@@ -19,9 +20,6 @@ ChromeUtils.defineESModuleGetters(this, {
   pushBroadcastService: "resource://gre/modules/PushBroadcastService.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
 var {
   clearInterval,
   clearTimeout,

netwerk/test/unit/test_websocket_500k.js

@@ -9,8 +9,8 @@
 /* import-globals-from head_channels.js */
 /* import-globals-from head_servers.js */
 
-XPCOMUtils.defineLazyModuleGetters(this, {
+ChromeUtils.defineESModuleGetters(this, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
 });
 
 add_setup(async function () {

services/settings/Database.sys.mjs

@@ -10,12 +10,10 @@ ChromeUtils.defineESModuleGetters(lazy, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
   CommonUtils: "resource://services-common/utils.sys.mjs",
   IDBHelpers: "resource://services-settings/IDBHelpers.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   Utils: "resource://services-settings/Utils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
 XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);
 
 /**

services/settings/RemoteSettingsClient.sys.mjs

@@ -15,6 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   Database: "resource://services-settings/Database.sys.mjs",
   IDBHelpers: "resource://services-settings/IDBHelpers.sys.mjs",
   KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   RemoteSettingsWorker:
     "resource://services-settings/RemoteSettingsWorker.sys.mjs",
   SharedUtils: "resource://services-settings/SharedUtils.sys.mjs",
@@ -22,10 +23,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   Utils: "resource://services-settings/Utils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 const TELEMETRY_COMPONENT = "remotesettings";
 
 XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);

services/settings/test/unit/test_remote_settings.js

@@ -3,8 +3,8 @@
 const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
-const { ObjectUtils } = ChromeUtils.import(
+const { ObjectUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ObjectUtils.jsm"
+  "resource://gre/modules/ObjectUtils.sys.mjs"
 );
 const { setTimeout } = ChromeUtils.importESModule(
   "resource://gre/modules/Timer.sys.mjs"

services/sync/modules/telemetry.sys.mjs

@@ -22,6 +22,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   Async: "resource://services-common/async.sys.mjs",
   AuthenticationError: "resource://services-sync/sync_auth.sys.mjs",
   FxAccounts: "resource://gre/modules/FxAccounts.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   Observers: "resource://services-common/observers.sys.mjs",
   Resource: "resource://services-sync/resource.sys.mjs",
   Status: "resource://services-sync/status.sys.mjs",
@@ -32,10 +33,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   Weave: "resource://services-sync/main.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
   return ChromeUtils.importESModule(
     "resource://gre/modules/FxAccounts.sys.mjs"

services/sync/tests/unit/head_helpers.js

@@ -36,8 +36,8 @@ var { PlacesUtils } = ChromeUtils.importESModule(
 var { PlacesSyncUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/PlacesSyncUtils.sys.mjs"
 );
-var { ObjectUtils } = ChromeUtils.import(
+var { ObjectUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ObjectUtils.jsm"
+  "resource://gre/modules/ObjectUtils.sys.mjs"
 );
 var {
   MockFxaStorageManager,

services/sync/tps/extensions/tps/resource/logger.sys.mjs

@@ -7,12 +7,10 @@
     Only the following listed symbols will exposed on import, and only when
     and where imported. */
 
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
+ChromeUtils.defineESModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
 });
 
 export var Logger = {

testing/modules/Assert.sys.mjs

@@ -6,9 +6,7 @@
 // Copyright (c) 2009 Thomas Robinson <280north.com>
 // MIT license: http://opensource.org/licenses/MIT
 
-const { ObjectUtils } = ChromeUtils.import(
+import { ObjectUtils } from "resource://gre/modules/ObjectUtils.sys.mjs";
-  "resource://gre/modules/ObjectUtils.jsm"
-);
 
 /**
  * This module is based on the

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

@@ -7,14 +7,10 @@ const { sinon } = ChromeUtils.importESModule(
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "ObjectUtils",
-  "resource://gre/modules/ObjectUtils.jsm"
-);
 ChromeUtils.defineESModuleGetters(this, {
   ExperimentFakes: "resource://testing-common/NimbusTestUtils.sys.mjs",
   ExperimentTestUtils: "resource://testing-common/NimbusTestUtils.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
 });
 
 // Sinon does not support Set or Map in spy.calledWith()

toolkit/components/places/PlacesFrecencyRecalculator.sys.mjs

@@ -14,16 +14,11 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
 });
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ObjectUtils",
-  "resource://gre/modules/ObjectUtils.jsm"
-);
-
 XPCOMUtils.defineLazyGetter(lazy, "logger", function () {
   return lazy.PlacesUtils.getLogger({ prefix: "FrecencyRecalculator" });
 });

toolkit/components/places/PlacesQuery.sys.mjs

@@ -3,17 +3,13 @@
  * 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/. */
 
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   requestIdleCallback: "resource://gre/modules/Timer.sys.mjs",
 });
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
 
 function isRedirectType(visitType) {
   const { TRANSITIONS } = lazy.PlacesUtils.history;

toolkit/components/places/tests/head_common.js

@@ -35,6 +35,7 @@ ChromeUtils.defineESModuleGetters(this, {
   BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.sys.mjs",
   FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
   NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
   PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
@@ -46,10 +47,6 @@ ChromeUtils.defineESModuleGetters(this, {
   TestUtils: "resource://testing-common/TestUtils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(this, "SMALLPNG_DATA_URI", function () {
   return NetUtil.newURI(
     "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAA" +

toolkit/components/search/SearchSettings.sys.mjs

@@ -8,13 +8,10 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGetter(lazy, "logConsole", () => {
   return console.createInstance({
     prefix: "SearchSettings",

toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js

@@ -10,6 +10,7 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 ChromeUtils.defineESModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
   SearchEngine: "resource://gre/modules/SearchEngine.sys.mjs",
@@ -19,10 +20,6 @@ ChromeUtils.defineESModuleGetters(this, {
   sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-});
-
 XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
 
 const GLOBAL_SCOPE = this;

toolkit/components/telemetry/app/TelemetryEnvironment.sys.mjs

@@ -6,9 +6,7 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
 
 import { TelemetryUtils } from "resource://gre/modules/TelemetryUtils.sys.mjs";
 
-const { ObjectUtils } = ChromeUtils.import(
+import { ObjectUtils } from "resource://gre/modules/ObjectUtils.sys.mjs";
-  "resource://gre/modules/ObjectUtils.jsm"
-);
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 import { UpdateUtils } from "resource://gre/modules/UpdateUtils.sys.mjs";
 

toolkit/content/aboutTelemetry.js

@@ -24,13 +24,9 @@ const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
 ChromeUtils.defineESModuleGetters(this, {
+  ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   Preferences: "resource://gre/modules/Preferences.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  this,
-  "ObjectUtils",
-  "resource://gre/modules/ObjectUtils.jsm"
-);
 
 const Telemetry = Services.telemetry;
 

toolkit/modules/ObjectUtils.sys.mjs

@@ -6,15 +6,11 @@
 // Copyright (c) 2009 Thomas Robinson <280north.com>
 // MIT license: http://opensource.org/licenses/MIT
 
-"use strict";
-
-var EXPORTED_SYMBOLS = ["ObjectUtils"];
-
 // Used only to cause test failures.
 
 var pSlice = Array.prototype.slice;
 
-var ObjectUtils = {
+export var ObjectUtils = {
   /**
    * This tests objects & values for deep equality.
    *

toolkit/modules/moz.build

@@ -96,7 +96,7 @@ with Files("NLP.sys.mjs"):
 with Files("NewTabUtils.sys.mjs"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
-with Files("ObjectUtils.jsm"):
+with Files("ObjectUtils.sys.mjs"):
     BUG_COMPONENT = ("Toolkit", "Telemetry")
 
 with Files("PermissionsUtils.sys.mjs"):
@@ -188,7 +188,7 @@ EXTRA_JS_MODULES += [
     "Log.sys.mjs",
     "NewTabUtils.sys.mjs",
     "NLP.sys.mjs",
-    "ObjectUtils.jsm",
+    "ObjectUtils.sys.mjs",
     "OsEnvironment.sys.mjs",
     "OSKeyStore.sys.mjs",
     "PermissionsUtils.sys.mjs",

toolkit/modules/tests/xpcshell/test_ObjectUtils.js

@@ -1,5 +1,5 @@
-const { ObjectUtils } = ChromeUtils.import(
+const { ObjectUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ObjectUtils.jsm"
+  "resource://gre/modules/ObjectUtils.sys.mjs"
 );
 
 add_task(async function test_deepEqual() {

toolkit/modules/tests/xpcshell/test_ObjectUtils_strict.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var { ObjectUtils } = ChromeUtils.import(
+var { ObjectUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/ObjectUtils.jsm"
+  "resource://gre/modules/ObjectUtils.sys.mjs"
 );
 var { PromiseTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/PromiseTestUtils.sys.mjs"