Bug 1816991 - ESMified installerprefs JSM. r=kpatenio

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

browser/components/installerprefs/InstallerPrefs.sys.mjs

@@ -32,17 +32,13 @@ const INSTALLER_PREFS_BRANCH = "installer.";
 // any others will be ignored.
 const INSTALLER_PREFS_LIST = ["installer.taskbarpin.win10.enabled"];
 
-const { AppConstants } = ChromeUtils.importESModule(
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
-  "resource://gre/modules/AppConstants.sys.mjs"
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-);
-const { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
 
 // This constructor can take a list of prefs to override the default one,
 // but this is really only intended for tests to use. Normal usage should be
 // to leave the parameter omitted/undefined.
-function InstallerPrefs(prefsList) {
+export function InstallerPrefs(prefsList) {
   this.prefsList = prefsList || INSTALLER_PREFS_LIST;
 
   // Each pref to be reflected will get a value created under this key, in HKCU.
@@ -144,5 +140,3 @@ InstallerPrefs.prototype = {
     return key;
   },
 };
-
-var EXPORTED_SYMBOLS = ["InstallerPrefs"];

browser/components/installerprefs/components.conf

@@ -8,7 +8,7 @@ Classes = [
     {
         'cid': '{cd8a6995-1f19-4cdd-9ed1-d6263302f594}',
         'contract_ids': ['@mozilla.org/installerprefs;1'],
-        'jsm': 'resource:///modules/InstallerPrefs.jsm',
+        'esModule': 'resource:///modules/InstallerPrefs.sys.mjs',
         'constructor': 'InstallerPrefs',
         'categories': {'profile-after-change': 'InstallerPrefs'},
         'processes': ProcessSelector.MAIN_PROCESS_ONLY,

browser/components/installerprefs/moz.build

@@ -10,7 +10,7 @@ with Files("**"):
 XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
 
 EXTRA_JS_MODULES += [
-    "InstallerPrefs.jsm",
+    "InstallerPrefs.sys.mjs",
 ]
 
 XPCOM_MANIFESTS += [

browser/components/installerprefs/test/unit/head.js

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