Backed out 12 changesets (bug 1795322) for causing multiple failures …

…e.g. test_deletion_request_ping.py. CLOSED TREE

Backed out changeset aba25cbcda51 (bug 1795322)
Backed out changeset a4a35005ada9 (bug 1795322)
Backed out changeset 8e8d790eb0f4 (bug 1795322)
Backed out changeset db8903454bd3 (bug 1795322)
Backed out changeset 60cc71c61cad (bug 1795322)
Backed out changeset bc6a674994ad (bug 1795322)
Backed out changeset 6ac8a611f8c7 (bug 1795322)
Backed out changeset 9fb873ecfb31 (bug 1795322)
Backed out changeset c8a7a40c2a2f (bug 1795322)
Backed out changeset f2c118b6c6ce (bug 1795322)
Backed out changeset 38df43b4a70f (bug 1795322)
Backed out changeset 89aea8373411 (bug 1795322)

browser/app/profile/firefox.js

@@ -144,7 +144,7 @@ pref("app.update.notifyDuringDownload", false);
 // default value to migrate to the new location that this data is now stored
 // (which is in a file in the update directory). Because of this, this pref
 // should no longer be used directly. Instead, getAppUpdateAutoEnabled and
-// getAppUpdateAutoEnabled from UpdateUtils.sys.mjs should be used.
+// getAppUpdateAutoEnabled from UpdateUtils.jsm should be used.
 #ifndef XP_WIN
   pref("app.update.auto", true);
 #endif
@@ -1649,7 +1649,7 @@ pref("browser.aboutwelcome.templateMR", true);
 pref("browser.messaging-system.whatsNewPanel.enabled", true);
 
 // Experiment Manager
-// See Console.sys.mjs LOG_LEVELS for all possible values
+// See Console.jsm LOG_LEVELS for all possible values
 pref("messaging-system.log", "warn");
 pref("messaging-system.rsexperimentloader.enabled", true);
 pref("messaging-system.rsexperimentloader.collection_id", "nimbus-desktop-experiments");
@@ -1941,7 +1941,7 @@ pref("browser.contentblocking.report.show_mobile_app", true);
 pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,fr,id,pl,pt-BR,ru,zh-TW");
 
 // Avoid advertising in certain regions. Comma separated string of two letter ISO 3166-1 country codes.
-// We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.sys.mjs only exposes the country, not the subdivision.
+// We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.jsm only exposes the country, not the subdivision.
 pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
 
 // Default to enabling VPN promo messages to be shown when specified and allowed

browser/base/content/browser-addons.js

@@ -1453,7 +1453,7 @@ var gUnifiedExtensions = {
       if (!aBrowser[attr]) {
         // A hacky way of setting the popup anchor outside the usual url bar
         // icon box, similar to how it was done for CFR.
-        // See: https://searchfox.org/mozilla-central/rev/c5c002f81f08a73e04868e0c2bf0eb113f200b03/toolkit/modules/PopupNotifications.sys.mjs#40
+        // See: https://searchfox.org/mozilla-central/rev/847b64cc28b74b44c379f9bff4f415b97da1c6d7/toolkit/modules/PopupNotifications.jsm#42
         aBrowser[attr] = aWindow.document.getElementById(
           anchorID
           // Anchor on the toolbar icon to position the popup right below the

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

@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
  * we are sure that an attempt to display a notification will not fail.
  */
 async function waitForWindowReadyForPopupNotifications(win) {
-  // These are the same checks that PopupNotifications.sys.mjs makes before it
+  // These are the same checks that PopupNotifications.jsm makes before it
   // allows a notification to open.
   await TestUtils.waitForCondition(
     () => win.gBrowser.selectedBrowser.docShellIsActive,

browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js

@@ -10,9 +10,9 @@ function getFirefoxExecutableFile() {
   return file;
 }
 
-// This is copied from WindowsRegistry.sys.mjs, but extended to support
+// This is copied from WindowsRegistry.jsm, but extended to support
 // TYPE_BINARY, as that is how we represent doubles in the registry for
-// the skeleton UI. However, we didn't extend WindowsRegistry.sys.mjs itself,
+// the skeleton UI. However, we didn't extend WindowsRegistry.jsm itself,
 // because TYPE_BINARY is kind of a footgun for javascript callers - our
 // use case is just trivial (checking that the value is non-zero).
 function readRegKeyExtended(aRoot, aPath, aKey, aRegistryNode = 0) {

browser/components/BrowserGlue.jsm

@@ -3268,7 +3268,7 @@ BrowserGlue.prototype = {
       false
     ); // Do not export.
     if (autoExportHTML) {
-      // Sqlite.sys.mjs and Places shutdown happen at profile-before-change, thus,
+      // Sqlite.jsm and Places shutdown happen at profile-before-change, thus,
       // to be on the safe side, this should run earlier.
       lazy.AsyncShutdown.profileChangeTeardown.addBlocker(
         "Places: export bookmarks.html",
@@ -5150,7 +5150,7 @@ var ContentBlockingCategoriesPrefs = {
  * While there are some built-in permission prompts, createPermissionPrompt
  * can also be overridden by system add-ons or tests to provide new ones.
  *
- * This override ability is provided by Integration.sys.mjs. See
+ * This override ability is provided by Integration.jsm. See
  * PermissionUI.jsm for an example of how to provide a new prompt
  * from an add-on.
  */

browser/components/aboutlogins/tests/browser/head.js

@@ -103,7 +103,7 @@ add_setup(async function setup_head() {
     }
 
     if (msg.errorMessage.includes('Unknown event: ["jsonfile", "load"')) {
-      // Ignore telemetry errors from JSONFile.sys.mjs.
+      // Ignore telemetry errors from JSONFile.jsm.
       return;
     }
 

browser/components/attribution/AttributionCode.jsm

@@ -32,8 +32,8 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   );
   let consoleOptions = {
     // tip: set maxLogLevel to "debug" and use lazy.log.debug() to create
-    // detailed messages during development. See LOG_LEVELS in Console.sys.mjs
-    // for details.
+    // detailed messages during development. See LOG_LEVELS in Console.jsm for
+    // details.
     maxLogLevel: "error",
     maxLogLevelPref: "browser.attribution.loglevel",
     prefix: "AttributionCode",

browser/components/attribution/MacAttribution.jsm

@@ -15,8 +15,8 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   );
   let consoleOptions = {
     // tip: set maxLogLevel to "debug" and use lazy.log.debug() to create
-    // detailed messages during development. See LOG_LEVELS in Console.sys.mjs
-    // for details.
+    // detailed messages during development. See LOG_LEVELS in Console.jsm for
+    // details.
     maxLogLevel: "error",
     maxLogLevelPref: "browser.attribution.mac.loglevel",
     prefix: "MacAttribution",

browser/components/doh/DoHConfig.jsm

@@ -167,7 +167,7 @@ const DoHConfigController = {
   // consumer use.
   currentConfig: makeBaseConfigObject(),
 
-  // Loads the client's region via Region.sys.mjs. This might mean waiting
+  // Loads the client's region via Region.jsm. This might mean waiting
   // until the region is available.
   async loadRegion() {
     await new Promise(resolve => {

browser/components/enterprisepolicies/Policies.sys.mjs

@@ -50,7 +50,7 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   return new ConsoleAPI({
     prefix: "Policies.jsm",
     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
-    // messages during development. See LOG_LEVELS in Console.sys.mjs for details.
+    // messages during development. See LOG_LEVELS in Console.jsm for details.
     maxLogLevel: "error",
     maxLogLevelPref: PREF_LOGLEVEL,
   });

browser/components/enterprisepolicies/helpers/ProxyPolicies.sys.mjs

@@ -15,7 +15,7 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   return new ConsoleAPI({
     prefix: "ProxyPolicies.jsm",
     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
-    // messages during development. See LOG_LEVELS in Console.sys.mjs for details.
+    // messages during development. See LOG_LEVELS in Console.jsm for details.
     maxLogLevel: "error",
     maxLogLevelPref: PREF_LOGLEVEL,
   });

browser/components/enterprisepolicies/helpers/WebsiteFilter.sys.mjs

@@ -39,7 +39,7 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   return new ConsoleAPI({
     prefix: "WebsiteFilter Policy",
     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
-    // messages during development. See LOG_LEVELS in Console.sys.mjs for details.
+    // messages during development. See LOG_LEVELS in Console.jsm for details.
     maxLogLevel: "error",
     maxLogLevelPref: PREF_LOGLEVEL,
   });

browser/components/migration/tests/marionette/test_refresh_firefox.py

@@ -534,8 +534,8 @@ def setUpScriptData(self):
           window.global = {};
           global.LoginInfo = Components.Constructor("@mozilla.org/login-manager/loginInfo;1", "nsILoginInfo", "init");
           global.profSvc = Cc["@mozilla.org/toolkit/profile-service;1"].getService(Ci.nsIToolkitProfileService);
-          global.Preferences = ChromeUtils.importESModules(
-            "resource://gre/modules/Preferences.sys.mjs"
+          global.Preferences = ChromeUtils.import(
+            "resource://gre/modules/Preferences.jsm"
           ).Preferences;
           global.FormHistory = ChromeUtils.import(
             "resource://gre/modules/FormHistory.jsm"

browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md

@@ -527,7 +527,7 @@ declare const totalBlockedCount: number;
 
 ### `recentBookmarks`
 
-An array of GUIDs of recent bookmarks as provided by [`NewTabUtils.getRecentBookmarks`](https://searchfox.org/mozilla-central/rev/c5c002f81f08a73e04868e0c2bf0eb113f200b03/toolkit/modules/NewTabUtils.sys.mjs#1059)
+An array of GUIDs of recent bookmarks as provided by [`NewTabUtils.getRecentBookmarks`](https://searchfox.org/mozilla-central/rev/e0b0c38ee83f99d3cf868bad525ace4a395039f1/toolkit/modules/NewTabUtils.jsm#1087)
 
 #### Definition
 
@@ -589,7 +589,7 @@ declare const attachedFxAOAuthClients: Promise<OAuthClient[]>
 
 ### `platformName`
 
-[Platform information](https://searchfox.org/mozilla-central/rev/c5c002f81f08a73e04868e0c2bf0eb113f200b03/toolkit/modules/AppConstants.sys.mjs#153).
+[Platform information](https://searchfox.org/mozilla-central/rev/05a22d864814cb1e4352faa4004e1f975c7d2eb9/toolkit/modules/AppConstants.jsm#156).
 
 #### Definition
 

browser/components/newtab/lib/CFRPageActions.jsm

@@ -806,7 +806,7 @@ class PageAction {
     const { content } = message;
 
     // A hacky way of setting the popup anchor outside the usual url bar icon box
-    // See https://searchfox.org/mozilla-central/rev/c5c002f81f08a73e04868e0c2bf0eb113f200b03/toolkit/modules/PopupNotifications.sys.mjs#40
+    // See https://searchfox.org/mozilla-central/rev/847b64cc28b74b44c379f9bff4f415b97da1c6d7/toolkit/modules/PopupNotifications.jsm#42
     browser.cfrpopupnotificationanchor =
       this.window.document.getElementById(content.anchor_id) || this.container;
 
@@ -819,7 +819,7 @@ class PageAction {
     const { content } = message;
 
     // A hacky way of setting the popup anchor outside the usual url bar icon box
-    // See https://searchfox.org/mozilla-central/rev/c5c002f81f08a73e04868e0c2bf0eb113f200b03/toolkit/modules/PopupNotifications.sys.mjs#40
+    // See https://searchfox.org/mozilla-central/rev/847b64cc28b74b44c379f9bff4f415b97da1c6d7/toolkit/modules/PopupNotifications.jsm#42
     browser.cfrpopupnotificationanchor =
       this.window.document.getElementById(content.anchor_id) || this.container;
 

browser/components/newtab/test/unit/utils.js

@@ -116,7 +116,7 @@ export class FakensIPrefBranch {
 FakensIPrefBranch.prototype.prefs = {};
 
 /**
- * Very simple fake for the most basic semantics of Preferences.sys.mjs.
+ * Very simple fake for the most basic semantics of Preferences.jsm.
  * Extends FakensIPrefBranch.
  */
 export class FakePrefs extends FakensIPrefBranch {
@@ -136,7 +136,7 @@ export class FakePrefs extends FakensIPrefBranch {
 }
 
 /**
- * Slimmed down version of toolkit/modules/EventEmitter.sys.mjs
+ * Slimmed down version of toolkit/modules/EventEmitter.jsm
  */
 export function EventEmitter() {}
 EventEmitter.decorate = function(objectToDecorate) {

browser/components/preferences/tests/browser_contentblocking.js

@@ -1,7 +1,9 @@
 /* eslint-env webextensions */
 
-const { Preferences } = ChromeUtils.importESModule(
-  "resource://gre/modules/Preferences.sys.mjs"
+ChromeUtils.defineModuleGetter(
+  this,
+  "Preferences",
+  "resource://gre/modules/Preferences.jsm"
 );
 
 const TP_PREF = "privacy.trackingprotection.enabled";

browser/components/shell/ShellService.jsm

@@ -37,7 +37,7 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () => {
   );
   let consoleOptions = {
     // tip: set maxLogLevel to "debug" and use log.debug() to create detailed
-    // messages during development. See LOG_LEVELS in Console.sys.mjs for details.
+    // messages during development. See LOG_LEVELS in Console.jsm for details.
     maxLogLevel: "debug",
     maxLogLevelPref: "browser.shell.loglevel",
     prefix: "ShellService",

browser/components/uitour/UITour.jsm

@@ -36,8 +36,7 @@ XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
   ).getFxAccountsSingleton();
 });
 
-// See LOG_LEVELS in Console.sys.mjs. Common examples: "All", "Info", "Warn", &
-// "Error".
+// See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
 const PREF_LOG_LEVEL = "browser.uitour.loglevel";
 
 const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([

browser/components/urlbar/UrlbarProviderPlaces.sys.mjs

@@ -1425,7 +1425,7 @@ class ProviderPlaces extends UrlbarProvider {
    * Gets a Sqlite database handle.
    *
    * @returns {Promise<OpenedConnection>}
-   *   A connection to the Sqlite database handle (according to {@link Sqlite.sys.mjs}).
+   *   A connection to the Sqlite database handle (according to {@link Sqlite.jsm}).
    * @throws A javascript exception
    */
   getDatabaseHandle() {

browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs

@@ -302,8 +302,8 @@ class ProviderSearchTips extends UrlbarProvider {
       }
 
       // Second, wait 500ms.  ts_paint waits at most 500ms after MozAfterPaint
-      // before ending.  We use XPCOM directly instead of Timer.sys.mjs to avoid the
-      // perf impact of loading Timer.sys.mjs, in case it's not already loaded.
+      // before ending.  We use XPCOM directly instead of Timer.jsm to avoid the
+      // perf impact of loading Timer.jsm, in case it's not already loaded.
       await new Promise(resolve => {
         let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
         timer.initWithCallback(resolve, 500, Ci.nsITimer.TYPE_ONE_SHOT);

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

@@ -3808,8 +3808,8 @@ async function doTimedCallbacks(callbacksBySecond) {
 // timeout internal to macOS is being hit. This problem does not seem to happen
 // when running the full browser, only during xpcshell tests. In fact the
 // problem can be reproduced in an xpcshell test that simply creates an interval
-// timer whose period is 1s (e.g., using `setInterval()` from Timer.sys.mjs).
-// After ~33 ticks, the timer's period jumps to ~10s.
+// timer whose period is 1s (e.g., using `setInterval()` from Timer.jsm). After
+// ~33 ticks, the timer's period jumps to ~10s.
 async function doTimedCallbacks(callbacksBySecond) {
   await Promise.all(
     Object.entries(callbacksBySecond).map(

browser/modules/PermissionUI.jsm

@@ -20,8 +20,8 @@ var EXPORTED_SYMBOLS = ["PermissionUI"];
  * permission request is coming up from content by way of the
  * nsContentPermissionHelper. The system add-on could then do the following:
  *
- * const { Integration } = ChromeUtils.importESModule(
- *   "resource://gre/modules/Integration.sys.mjs"
+ * const { Integration } = ChromeUtils.import(
+ *   "resource://gre/modules/Integration.jsm"
  * );
  * const { PermissionUI } = ChromeUtils.import(
  *   "resource:///modules/PermissionUI.jsm"
@@ -188,7 +188,7 @@ var PermissionPromptPrototype = {
   /**
    * These are the options that will be passed to the PopupNotification when it
    * is shown. See the documentation of `PopupNotifications_show` in
-   * PopupNotifications.sys.mjs for details.
+   * PopupNotifications.jsm for details.
    *
    * Note that prompt() will automatically set displayURI to
    * be the URI of the requesting pricipal, unless the displayURI is exactly
@@ -229,7 +229,7 @@ var PermissionPromptPrototype = {
    * then you need to make sure its ID has the "-notification" suffix,
    * and then return the prefix here.
    *
-   * See PopupNotifications.sys.mjs for more details.
+   * See PopupNotifications.jsm for more details.
    *
    * @return {string}
    *         The unique ID that will be used to as the
@@ -251,7 +251,7 @@ var PermissionPromptPrototype = {
 
   /**
    * The message to show to the user in the PopupNotification, see
-   * `PopupNotifications_show` in PopupNotifications.sys.mjs.
+   * `PopupNotifications_show` in PopupNotifications.jsm.
    *
    * Subclasses must override this.
    *

browser/themes/shared/preferences/preferences.css

@@ -287,7 +287,7 @@ checkbox {
 #FontsDialog menulist:empty {
   /* When there's no menupopup, while the font builder is running,
    * the height of the menulist would otherwise shrink. This throws
-   * off the height determination SubDialog.sys.mjs does, which then
+   * off the height determination SubDialog.jsm does, which then
    * leads to content being cut off. Fix by enforcing a minimum height
    * when there's no content: */
   min-height: max(32px, calc(1.4em + 16px));

browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm

@@ -14,8 +14,7 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 );
 
 // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
-// See LOG_LEVELS in Console.sys.mjs. Common examples: "All", "Info", "Warn", &
-// "Error".
+// See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
 const PREF_LOG_LEVEL = "[email protected]";
 const lazy = {};
 XPCOMUtils.defineLazyGetter(lazy, "log", () => {

browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm

@@ -263,7 +263,7 @@ var TestRunner = {
    * Calculate the bounding box based on CSS selector from config for cropping
    *
    * @param {String[]} selectors - array of CSS selectors for relevant DOM element
-   * @return {Geometry.sys.mjs Rect} Rect holding relevant x, y, width, height with padding
+   * @return {Geometry.jsm Rect} Rect holding relevant x, y, width, height with padding
    **/
   _findBoundingBox(selectors, windowType) {
     if (!selectors.length) {

devtools/client/performance-new/@types/gecko.d.ts

@@ -216,6 +216,8 @@ declare namespace MockedExports {
     principal: PrincipalStub;
   }
 
+  const WebChannelJSM: any;
+
   // TS-TODO
   const CustomizableUIJSM: any;
   const CustomizableWidgetsJSM: any;
@@ -336,6 +338,10 @@ declare module "resource://gre/modules/AppConstants.sys.mjs" {
   export = MockedExports.AppConstantsSYSMJS;
 }
 
+declare module "resource://gre/modules/WebChannel.jsm" {
+  export = MockedExports.WebChannelJSM;
+}
+
 declare module "resource://devtools/client/performance-new/popup/background.jsm.js" {
   import * as Background from "devtools/client/performance-new/popup/background.jsm.js";
   export = Background;

devtools/client/performance-new/@types/perf.d.ts

@@ -548,7 +548,7 @@ type QuerySymbolicationApiResponse = string;
 
 /**
  * This represents an event channel that can talk to a content page on the web.
- * This interface is a manually typed version of toolkit/modules/WebChannel.sys.mjs
+ * This interface is a manually typed version of toolkit/modules/WebChannel.jsm
  * and is opinionated about the types of messages we can send with it.
  *
  * The definition is here rather than gecko.d.ts because it was simpler than getting

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

@@ -52,7 +52,7 @@ async function testMessages() {
   ok(!hud, "browser console is not open");
 
   // The test harness does override the global's console property to replace it with
-  // a Console.sys.mjs instance (https://searchfox.org/mozilla-central/rev/c5c002f81f08a73e04868e0c2bf0eb113f200b03/testing/mochitest/api.js#75-78)
+  // a Console.jsm instance (https://searchfox.org/mozilla-central/rev/618f9970972adc5a21194d39d690ec0865f26024/testing/mochitest/api.js#75-80)
   // So here we reset the console property with the native console (which is luckily
   // stored in `nativeConsole`).
   const overriddenConsole = globalThis.console;
@@ -185,15 +185,15 @@ async function testMessages() {
   );
   Services.console.logMessage(scriptErrorMessage);
 
-  // Check messages logged in content with Log.sys.mjs
+  // Check messages logged in content with Log.jsm
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
     const { Log } = ChromeUtils.importESModule(
       "resource://gre/modules/Log.sys.mjs"
     );
     const logger = Log.repository.getLogger("TEST_LOGGER_" + Date.now());
     logger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
     logger.level = Log.Level.Info;
-    logger.info("Log.sys.mjs content process messsage");
+    logger.info("Log.jsm content process messsage");
   });
 
   // Check CSS warnings in parent process
@@ -241,7 +241,7 @@ async function testMessages() {
   await checkUniqueMessageExists(hud, "test-image.png", ".network");
   await checkUniqueMessageExists(
     hud,
-    "Log.sys.mjs content process messsage",
+    "Log.jsm content process messsage",
     ".console-api"
   );
   await checkUniqueMessageExists(