Bug 1804661 - Convert browser/components/StartupRecorder.jsm to an ES module. r=Gijs

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

Author: Standard8

browser/base/content/test/performance/browser.ini

@@ -1,9 +1,9 @@
 [DEFAULT]
-# to avoid overhead when running the browser normally, StartupRecorder.jsm will
+# to avoid overhead when running the browser normally, StartupRecorder.sys.mjs will
 # do almost nothing unless browser.startup.record is true.
 # gfx.canvas.willReadFrequently.enable is just an optimization, but needs to be
 # set during early startup to have an impact as a canvas will be used by
-# StartupRecorder.jsm
+# StartupRecorder.sys.mjs
 prefs =
   # Skip migration work in BG__migrateUI for browser_startup.js since it isn't
   # representative of common startup.
@@ -51,7 +51,7 @@ support-files =
 [browser_startup_flicker.js]
 run-if =
   debug
-  nightly_build # Requires StartupRecorder.jsm, which isn't shipped everywhere by default
+  nightly_build # Requires StartupRecorder.sys.mjs, which isn't shipped everywhere by default
 [browser_startup_hiddenwindow.js]
 skip-if =
   os == "mac"

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

@@ -29,7 +29,7 @@ const startupPhases = {
     allowlist: {
       modules: new Set([
         "resource:///modules/BrowserGlue.sys.mjs",
-        "resource:///modules/StartupRecorder.jsm",
+        "resource:///modules/StartupRecorder.sys.mjs",
         "resource://gre/modules/AppConstants.sys.mjs",
         "resource://gre/modules/ActorManagerParent.sys.mjs",
         "resource://gre/modules/CustomElementsListener.jsm",

browser/base/content/test/performance/io/browser.ini

@@ -6,11 +6,11 @@ skip-if =
   debug
   tsan
   asan
-# to avoid overhead when running the browser normally, StartupRecorder.jsm will
+# to avoid overhead when running the browser normally, StartupRecorder.sys.mjs will
 # do almost nothing unless browser.startup.record is true.
 # gfx.canvas.willReadFrequently.enable is just an optimization, but needs to be
 # set during early startup to have an impact as a canvas will be used by
-# StartupRecorder.jsm
+# StartupRecorder.sys.mjs
 prefs =
   browser.startup.record=true
   gfx.canvas.willReadFrequently.enable=true

browser/components/StartupRecorder.jsm renamed to browser/components/StartupRecorder.sys.mjs

@@ -2,14 +2,10 @@
  * 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/. */
 
-var EXPORTED_SYMBOLS = ["StartupRecorder"];
-
 const Cm = Components.manager;
 Cm.QueryInterface(Ci.nsIServiceManager);
 
-const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 
 let firstPaintNotification = "widget-first-paint";
 // widget-first-paint fires much later than expected on Linux.
@@ -59,7 +55,7 @@ let afterPaintListener = () => {
  * This component only exists in nightly and debug builds, it doesn't ship in
  * our release builds.
  */
-function StartupRecorder() {
+export function StartupRecorder() {
   this.wrappedJSObject = this;
   this.data = {
     images: {
@@ -74,6 +70,7 @@ function StartupRecorder() {
     this._resolve = resolve;
   });
 }
+
 StartupRecorder.prototype = {
   QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
 

browser/components/components.conf

@@ -71,7 +71,7 @@ if (buildconfig.substs.get('MOZ_DEBUG') or
         {
             'cid': '{11c095b2-e42e-4bdf-9dd0-aed87595f6a4}',
             'contract_ids': ['@mozilla.org/test/startuprecorder;1'],
-            'jsm': 'resource:///modules/StartupRecorder.jsm',
+            'esModule': 'resource:///modules/StartupRecorder.sys.mjs',
             'constructor': 'StartupRecorder',
         },
     ]

browser/components/moz.build

@@ -94,7 +94,7 @@ EXTRA_JS_MODULES += [
 
 if CONFIG["MOZ_DEBUG"] or CONFIG["MOZ_DEV_EDITION"] or CONFIG["NIGHTLY_BUILD"]:
     EXTRA_JS_MODULES += [
-        "StartupRecorder.jsm",
+        "StartupRecorder.sys.mjs",
     ]
 
 BROWSER_CHROME_MANIFESTS += [