Backed out changeset 5018856d8fee (bug 1758474) for causing node esli…

…nt failure. CLOSED TREE
iaxat · Mar 10, 2022 · ab5da6c · ab5da6c
1 parent 25efd98
commit ab5da6c
Show file tree

Hide file tree

Showing 82 changed files with 218 additions and 189 deletions.
diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
@@ -885,7 +885,8 @@ var FullScreen = {
 
 XPCOMUtils.defineLazyGetter(FullScreen, "_permissionNotificationIDs", () => {
   let { PermissionUI } = ChromeUtils.import(
-    "resource:///modules/PermissionUI.jsm"
+    "resource:///modules/PermissionUI.jsm",
+    {}
   );
   return (
     Object.values(PermissionUI)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -1645,7 +1645,8 @@ var gBrowserInit = {
       ) {
         let windowFrameColor = new Color(
           ...ChromeUtils.import(
-            "resource:///modules/Windows8WindowFrameColor.jsm"
+            "resource:///modules/Windows8WindowFrameColor.jsm",
+            {}
           ).Windows8WindowFrameColor.get()
         );
         // Default to black for foreground text.
@@ -2338,7 +2339,8 @@ var gBrowserInit = {
         try {
           DownloadsCommon.initializeAllDataLinks();
           ChromeUtils.import(
-            "resource:///modules/DownloadsTaskbar.jsm"
+            "resource:///modules/DownloadsTaskbar.jsm",
+            {}
           ).DownloadsTaskbar.registerIndicator(window);
           if (AppConstants.platform == "macosx") {
             ChromeUtils.import(

diff --git a/browser/base/content/test/general/browser_datachoices_notification.js b/browser/base/content/test/general/browser_datachoices_notification.js
@@ -6,12 +6,14 @@
 
 // Pass an empty scope object to the import to prevent "leaked window property"
 // errors in tests.
-var { Preferences } = ChromeUtils.import(
-  "resource://gre/modules/Preferences.jsm"
-);
-var { TelemetryReportingPolicy } = ChromeUtils.import(
-  "resource://gre/modules/TelemetryReportingPolicy.jsm"
-);
+var Preferences = ChromeUtils.import(
+  "resource://gre/modules/Preferences.jsm",
+  {}
+).Preferences;
+var TelemetryReportingPolicy = ChromeUtils.import(
+  "resource://gre/modules/TelemetryReportingPolicy.jsm",
+  {}
+).TelemetryReportingPolicy;
 
 const PREF_BRANCH = "datareporting.policy.";
 const PREF_FIRST_RUN = "toolkit.telemetry.reportingpolicy.firstRun";

diff --git a/browser/base/content/test/general/browser_remoteTroubleshoot.js b/browser/base/content/test/general/browser_remoteTroubleshoot.js
@@ -82,8 +82,10 @@ add_task(async function() {
 
   let updateChannel = null;
   try {
-    updateChannel = ChromeUtils.import("resource://gre/modules/UpdateUtils.jsm")
-      .UpdateUtils.UpdateChannel;
+    updateChannel = ChromeUtils.import(
+      "resource://gre/modules/UpdateUtils.jsm",
+      {}
+    ).UpdateUtils.UpdateChannel;
   } catch (ex) {}
   if (!updateChannel) {
     Assert.ok(

diff --git a/browser/base/content/test/static/browser_misused_characters_in_strings.js b/browser/base/content/test/static/browser_misused_characters_in_strings.js
@@ -265,7 +265,8 @@ add_task(async function checkAllTheDTDs() {
 add_task(async function checkAllTheFluents() {
   let uris = await getAllTheFiles(".ftl");
   let { FluentParser, Visitor } = ChromeUtils.import(
-    "resource://testing-common/FluentSyntax.jsm"
+    "resource://testing-common/FluentSyntax.jsm",
+    {}
   );
 
   class TextElementVisitor extends Visitor {

diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
@@ -407,9 +407,10 @@ add_task(async function checkAllTheCSS() {
   // Create a clean iframe to load all the files into. This needs to live at a
   // chrome URI so that it's allowed to load and parse any styles.
   let testFile = getRootDirectory(gTestPath) + "dummy_page.html";
-  let { HiddenFrame } = ChromeUtils.import(
-    "resource://gre/modules/HiddenFrame.jsm"
-  );
+  let HiddenFrame = ChromeUtils.import(
+    "resource://gre/modules/HiddenFrame.jsm",
+    {}
+  ).HiddenFrame;
   let hiddenFrame = new HiddenFrame();
   let win = await hiddenFrame.get();
   let iframe = win.document.createElementNS(

diff --git a/browser/base/content/test/sync/browser_fxa_web_channel.js b/browser/base/content/test/sync/browser_fxa_web_channel.js
@@ -3,7 +3,7 @@
  */
 
 XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
-  return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");
+  return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", {});
 });
 
 ChromeUtils.defineModuleGetter(

diff --git a/browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js b/browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js
@@ -3,7 +3,8 @@ const { AddonManagerPrivate } = ChromeUtils.import(
 );
 
 const { AddonTestUtils } = ChromeUtils.import(
-  "resource://testing-common/AddonTestUtils.jsm"
+  "resource://testing-common/AddonTestUtils.jsm",
+  {}
 );
 
 AddonTestUtils.initMochitest(this);

diff --git a/browser/base/content/test/webrtc/head.js b/browser/base/content/test/webrtc/head.js
@@ -104,7 +104,7 @@ function promiseIndicatorWindow() {
 }
 
 async function assertWebRTCIndicatorStatus(expected) {
-  let ui = ChromeUtils.import("resource:///modules/webrtcUI.jsm").webrtcUI;
+  let ui = ChromeUtils.import("resource:///modules/webrtcUI.jsm", {}).webrtcUI;
   let expectedState = expected ? "visible" : "hidden";
   let msg = "WebRTC indicator " + expectedState;
   if (!expected && ui.showGlobalIndicator) {

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
@@ -1642,7 +1642,8 @@ BrowserGlue.prototype = {
       let updateChannel;
       try {
         updateChannel = ChromeUtils.import(
-          "resource://gre/modules/UpdateUtils.jsm"
+          "resource://gre/modules/UpdateUtils.jsm",
+          {}
         ).UpdateUtils.UpdateChannel;
       } catch (ex) {}
       if (updateChannel) {

diff --git a/browser/components/attribution/AttributionCode.jsm b/browser/components/attribution/AttributionCode.jsm
@@ -33,7 +33,8 @@ ChromeUtils.defineModuleGetter(
   "resource:///modules/MacAttribution.jsm"
 );
 XPCOMUtils.defineLazyGetter(this, "log", () => {
-  let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
+  let ConsoleAPI = ChromeUtils.import("resource://gre/modules/Console.jsm", {})
+    .ConsoleAPI;
   let consoleOptions = {
     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
     // messages during development. See LOG_LEVELS in Console.jsm for details.

diff --git a/browser/components/attribution/MacAttribution.jsm b/browser/components/attribution/MacAttribution.jsm
@@ -9,7 +9,8 @@ const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 XPCOMUtils.defineLazyGetter(this, "log", () => {
-  let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
+  let ConsoleAPI = ChromeUtils.import("resource://gre/modules/Console.jsm", {})
+    .ConsoleAPI;
   let consoleOptions = {
     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
     // messages during development. See LOG_LEVELS in Console.jsm for details.

diff --git a/browser/components/customizableui/test/browser_989751_subviewbutton_class.js b/browser/components/customizableui/test/browser_989751_subviewbutton_class.js
@@ -19,9 +19,10 @@ function checkSubviewButtonClass(menuId, buttonId, subviewId) {
   return async function() {
     // Initialize DevTools before starting the test in order to create menuitems in
     // menuWebDeveloperPopup.
-    ChromeUtils.import("resource://devtools/shared/loader/Loader.jsm").require(
-      "devtools/client/framework/devtools-browser"
-    );
+    ChromeUtils.import(
+      "resource://devtools/shared/loader/Loader.jsm",
+      {}
+    ).require("devtools/client/framework/devtools-browser");
 
     info(
       "Checking for items without the subviewbutton class in " +

diff --git a/browser/components/distribution.js b/browser/components/distribution.js
@@ -318,9 +318,10 @@ DistributionCustomizer.prototype = {
       return;
     }
 
-    let { ProfileAge } = ChromeUtils.import(
-      "resource://gre/modules/ProfileAge.jsm"
-    );
+    let ProfileAge = ChromeUtils.import(
+      "resource://gre/modules/ProfileAge.jsm",
+      {}
+    ).ProfileAge;
     let profileAge = await ProfileAge();
     let resetDate = await profileAge.reset;
 

diff --git a/browser/components/migration/ESEDBReader.jsm b/browser/components/migration/ESEDBReader.jsm
@@ -21,7 +21,8 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyGetter(this, "log", () => {
-  let { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm");
+  let ConsoleAPI = ChromeUtils.import("resource://gre/modules/Console.jsm", {})
+    .ConsoleAPI;
   let consoleOptions = {
     maxLogLevelPref: "browser.esedbreader.loglevel",
     prefix: "ESEDBReader",

diff --git a/browser/components/preferences/fxaPairDevice.js b/browser/components/preferences/fxaPairDevice.js
@@ -16,7 +16,8 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   FxAccountsPairingFlow: "resource://gre/modules/FxAccountsPairing.jsm",
 });
 const { require } = ChromeUtils.import(
-  "resource://devtools/shared/loader/Loader.jsm"
+  "resource://devtools/shared/loader/Loader.jsm",
+  {}
 );
 const QR = require("devtools/shared/qrcode/index");
 

diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
@@ -5,7 +5,7 @@
 /* import-globals-from preferences.js */
 
 XPCOMUtils.defineLazyGetter(this, "FxAccountsCommon", function() {
-  return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");
+  return ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js", {});
 });
 
 const FXA_PAGE_LOGGED_OUT = 0;

diff --git a/browser/components/preferences/tests/browser_sync_pairing.js b/browser/components/preferences/tests/browser_sync_pairing.js
@@ -3,9 +3,13 @@
 
 "use strict";
 
-const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
+const { UIState } = ChromeUtils.import(
+  "resource://services-sync/UIState.jsm",
+  {}
+);
 const { FxAccountsPairingFlow } = ChromeUtils.import(
-  "resource://gre/modules/FxAccountsPairing.jsm"
+  "resource://gre/modules/FxAccountsPairing.jsm",
+  {}
 );
 
 // Use sinon for mocking.

diff --git a/...components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js b/...components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js
@@ -41,12 +41,12 @@ function clearHistoryAndWait() {
  */
 
 async function runTest() {
-  let { FileUtils } = ChromeUtils.import(
-    "resource://gre/modules/FileUtils.jsm"
-  );
-  let { DownloadLastDir } = ChromeUtils.import(
-    "resource://gre/modules/DownloadLastDir.jsm"
-  );
+  let FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})
+    .FileUtils;
+  let DownloadLastDir = ChromeUtils.import(
+    "resource://gre/modules/DownloadLastDir.jsm",
+    {}
+  ).DownloadLastDir;
 
   let tmpDir = FileUtils.getDir("TmpD", [], true);
   let dir1 = newDirectory();

diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
@@ -6,12 +6,12 @@
 function test() {
   waitForExplicitFinish();
 
-  let { FileUtils } = ChromeUtils.import(
-    "resource://gre/modules/FileUtils.jsm"
-  );
-  let { DownloadLastDir } = ChromeUtils.import(
-    "resource://gre/modules/DownloadLastDir.jsm"
-  );
+  let FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})
+    .FileUtils;
+  let DownloadLastDir = ChromeUtils.import(
+    "resource://gre/modules/DownloadLastDir.jsm",
+    {}
+  ).DownloadLastDir;
   let MockFilePicker = SpecialPowers.MockFilePicker;
   let launcher = {
     source: Services.io.newURI("http://test1.com/file"),

diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
@@ -6,12 +6,12 @@
 function test() {
   waitForExplicitFinish();
 
-  let { FileUtils } = ChromeUtils.import(
-    "resource://gre/modules/FileUtils.jsm"
-  );
-  let { DownloadLastDir } = ChromeUtils.import(
-    "resource://gre/modules/DownloadLastDir.jsm"
-  );
+  let FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})
+    .FileUtils;
+  let DownloadLastDir = ChromeUtils.import(
+    "resource://gre/modules/DownloadLastDir.jsm",
+    {}
+  ).DownloadLastDir;
   let MockFilePicker = SpecialPowers.MockFilePicker;
 
   MockFilePicker.init(window);

diff --git a/browser/components/privatebrowsing/test/browser/head.js b/browser/components/privatebrowsing/test/browser/head.js
@@ -20,11 +20,6 @@ ChromeUtils.defineModuleGetter(
   "TestUtils",
   "resource://testing-common/TestUtils.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "FileUtils",
-  "resource://gre/modules/FileUtils.jsm"
-);
 
 function whenNewWindowLoaded(aOptions, aCallback) {
   let win = OpenBrowserWindow(aOptions);
@@ -61,6 +56,8 @@ async function openAboutPrivateBrowsing() {
 }
 
 function newDirectory() {
+  let FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})
+    .FileUtils;
   let tmpDir = FileUtils.getDir("TmpD", [], true);
   let dir = tmpDir.clone();
   dir.append("testdir");
@@ -69,6 +66,8 @@ function newDirectory() {
 }
 
 function newFileInDirectory(aDir) {
+  let FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})
+    .FileUtils;
   let file = aDir.clone();
   file.append("testfile");
   file.createUnique(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_FILE);

diff --git a/browser/components/search/content/searchbar.js b/browser/components/search/content/searchbar.js
@@ -102,10 +102,12 @@
       window.addEventListener("unload", this.destroy);
 
       this.FormHistory = ChromeUtils.import(
-        "resource://gre/modules/FormHistory.jsm"
+        "resource://gre/modules/FormHistory.jsm",
+        {}
       ).FormHistory;
       this.SearchSuggestionController = ChromeUtils.import(
-        "resource://gre/modules/SearchSuggestionController.jsm"
+        "resource://gre/modules/SearchSuggestionController.jsm",
+        {}
       ).SearchSuggestionController;
 
       Services.obs.addObserver(this.observer, "browser-search-engine-modified");

diff --git a/browser/components/search/test/browser/browser_healthreport.js b/browser/components/search/test/browser/browser_healthreport.js
@@ -3,9 +3,10 @@
 
 "use strict";
 
-var { Preferences } = ChromeUtils.import(
-  "resource://gre/modules/Preferences.jsm"
-);
+var Preferences = ChromeUtils.import(
+  "resource://gre/modules/Preferences.jsm",
+  {}
+).Preferences;
 
 function test() {
   waitForExplicitFinish();

diff --git a/browser/components/search/test/browser/browser_hiddenOneOffs_cleanup.js b/browser/components/search/test/browser/browser_hiddenOneOffs_cleanup.js
@@ -83,9 +83,10 @@ add_task(async function test_add() {
 
 add_task(async function test_diacritics() {
   const diacritic_engine = "Foo \u2661";
-  let { Preferences } = ChromeUtils.import(
-    "resource://gre/modules/Preferences.jsm"
-  );
+  let Preferences = ChromeUtils.import(
+    "resource://gre/modules/Preferences.jsm",
+    {}
+  ).Preferences;
 
   Preferences.set("browser.search.hiddenOneOffs", diacritic_engine);
   await SearchTestUtils.promiseNewSearchEngine(

diff --git a/browser/components/search/test/browser/browser_hiddenOneOffs_diacritics.js b/browser/components/search/test/browser/browser_hiddenOneOffs_diacritics.js
@@ -7,9 +7,10 @@ const searchPopup = document.getElementById("PopupSearchAutoComplete");
 
 const diacritic_engine = "Foo \u2661";
 
-var { Preferences } = ChromeUtils.import(
-  "resource://gre/modules/Preferences.jsm"
-);
+var Preferences = ChromeUtils.import(
+  "resource://gre/modules/Preferences.jsm",
+  {}
+).Preferences;
 
 let searchIcon;
 

diff --git a/browser/components/sessionstore/test/unit/test_backup_once.js b/browser/components/sessionstore/test/unit/test_backup_once.js
@@ -28,7 +28,8 @@ add_task(async function init() {
   // Make sure that we have a profile before initializing SessionFile
   let profd = do_get_profile();
   SessionFile = ChromeUtils.import(
-    "resource:///modules/sessionstore/SessionFile.jsm"
+    "resource:///modules/sessionstore/SessionFile.jsm",
+    {}
   ).SessionFile;
   Paths = SessionFile.Paths;
 

diff --git a/browser/components/sessionstore/test/unit/test_migration_lz4compression.js b/browser/components/sessionstore/test/unit/test_migration_lz4compression.js
@@ -58,7 +58,8 @@ add_task(async function test_migration() {
   // Make sure that we have a profile before initializing SessionFile.
   let profd = do_get_profile();
   SessionFile = ChromeUtils.import(
-    "resource:///modules/sessionstore/SessionFile.jsm"
+    "resource:///modules/sessionstore/SessionFile.jsm",
+    {}
   ).SessionFile;
   Paths = SessionFile.Paths;
 

diff --git a/browser/components/sessionstore/test/unit/test_startup_invalid_session.js b/browser/components/sessionstore/test/unit/test_startup_invalid_session.js
@@ -4,7 +4,8 @@
 function run_test() {
   let profd = do_get_profile();
   var SessionFile = ChromeUtils.import(
-    "resource:///modules/sessionstore/SessionFile.jsm"
+    "resource:///modules/sessionstore/SessionFile.jsm",
+    {}
   ).SessionFile;
 
   let sourceSession = do_get_file("data/sessionstore_invalid.js");