Skip to content

Commit 8cd6ed7

Browse files
arai-aarai-a
committed
Bug 1777486 - Part 2: Migrate XPCOMUtils.jsm consumers with automatic migration. r=webdriver-reviewers,geckoview-reviewers,preferences-reviewers,application-update-reviewers,pip-reviewers,kmag,owlish,whimboo
Differential Revision: https://phabricator.services.mozilla.com/D151214
1 parent df82844 commit 8cd6ed7

File tree

780 files changed

+1552
-1554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

780 files changed

+1552
-1554
lines changed

‎accessible/tests/mochitest/pivot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* import-globals-from states.js */
55
/* import-globals-from text.js */
66

7-
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
7+
ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
88

99
// //////////////////////////////////////////////////////////////////////////////
1010
// Constants

‎browser/actors/AboutNewTabChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
var EXPORTED_SYMBOLS = ["AboutNewTabChild"];
88

9-
const { XPCOMUtils } = ChromeUtils.import(
10-
"resource://gre/modules/XPCOMUtils.jsm"
9+
const { XPCOMUtils } = ChromeUtils.importESModule(
10+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1111
);
1212
const { AppConstants } = ChromeUtils.import(
1313
"resource://gre/modules/AppConstants.jsm"

‎browser/actors/AboutNewTabParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
var EXPORTED_SYMBOLS = ["AboutNewTabParent"];
88

9-
const { XPCOMUtils } = ChromeUtils.import(
10-
"resource://gre/modules/XPCOMUtils.jsm"
9+
const { XPCOMUtils } = ChromeUtils.importESModule(
10+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1111
);
1212

1313
const lazy = {};

‎browser/actors/AboutPrivateBrowsingChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingChild"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const { RemotePageChild } = ChromeUtils.import(

‎browser/actors/AboutPrivateBrowsingParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const { ASRouter } = ChromeUtils.import(
1212
const { BrowserUtils } = ChromeUtils.import(
1313
"resource://gre/modules/BrowserUtils.jsm"
1414
);
15-
const { XPCOMUtils } = ChromeUtils.import(
16-
"resource://gre/modules/XPCOMUtils.jsm"
15+
const { XPCOMUtils } = ChromeUtils.importESModule(
16+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1717
);
1818

1919
const SHOWN_PREF = "browser.search.separatePrivateDefault.ui.banner.shown";

‎browser/actors/AboutProtectionsParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"use strict";
66

77
var EXPORTED_SYMBOLS = ["AboutProtectionsParent"];
8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const lazy = {};

‎browser/actors/AboutTabCrashedParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
var EXPORTED_SYMBOLS = ["AboutTabCrashedParent"];
88

9-
const { XPCOMUtils } = ChromeUtils.import(
10-
"resource://gre/modules/XPCOMUtils.jsm"
9+
const { XPCOMUtils } = ChromeUtils.importESModule(
10+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1111
);
1212
const lazy = {};
1313
XPCOMUtils.defineLazyModuleGetters(lazy, {

‎browser/actors/ClickHandlerChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["ClickHandlerChild", "MiddleMousePasteHandlerChild"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const lazy = {};

‎browser/actors/ContentSearchParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["ContentSearchParent", "ContentSearch"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const lazy = {};

‎browser/actors/ContextMenuChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
var EXPORTED_SYMBOLS = ["ContextMenuChild"];
1010

11-
const { XPCOMUtils } = ChromeUtils.import(
12-
"resource://gre/modules/XPCOMUtils.jsm"
11+
const { XPCOMUtils } = ChromeUtils.importESModule(
12+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1313
);
1414

1515
const lazy = {};

‎browser/actors/DecoderDoctorParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ var EXPORTED_SYMBOLS = ["DecoderDoctorParent"];
1111
const { AppConstants } = ChromeUtils.import(
1212
"resource://gre/modules/AppConstants.jsm"
1313
);
14-
const { XPCOMUtils } = ChromeUtils.import(
15-
"resource://gre/modules/XPCOMUtils.jsm"
14+
const { XPCOMUtils } = ChromeUtils.importESModule(
15+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1616
);
1717

1818
const lazy = {};

‎browser/actors/EncryptedMediaParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
var EXPORTED_SYMBOLS = ["EncryptedMediaParent"];
99

10-
const { XPCOMUtils } = ChromeUtils.import(
11-
"resource://gre/modules/XPCOMUtils.jsm"
10+
const { XPCOMUtils } = ChromeUtils.importESModule(
11+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1212
);
1313

1414
const lazy = {};

‎browser/actors/NetErrorChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["NetErrorChild"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111
const { RemotePageChild } = ChromeUtils.import(
1212
"resource://gre/actors/RemotePageChild.jsm"

‎browser/actors/NetErrorParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["NetErrorParent"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111
const { PrivateBrowsingUtils } = ChromeUtils.import(
1212
"resource://gre/modules/PrivateBrowsingUtils.jsm"

‎browser/actors/PageInfoChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
var EXPORTED_SYMBOLS = ["PageInfoChild"];
66

7-
const { XPCOMUtils } = ChromeUtils.import(
8-
"resource://gre/modules/XPCOMUtils.jsm"
7+
const { XPCOMUtils } = ChromeUtils.importESModule(
8+
"resource://gre/modules/XPCOMUtils.sys.mjs"
99
);
1010

1111
const lazy = {};

‎browser/actors/PluginParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ var EXPORTED_SYMBOLS = ["PluginParent", "PluginManager"];
1010
const { AppConstants } = ChromeUtils.import(
1111
"resource://gre/modules/AppConstants.jsm"
1212
);
13-
const { XPCOMUtils } = ChromeUtils.import(
14-
"resource://gre/modules/XPCOMUtils.jsm"
13+
const { XPCOMUtils } = ChromeUtils.importESModule(
14+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1515
);
1616

1717
const lazy = {};

‎browser/actors/PromptParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ChromeUtils.defineModuleGetter(
1414
"PromptUtils",
1515
"resource://gre/modules/SharedPromptUtils.jsm"
1616
);
17-
const { XPCOMUtils } = ChromeUtils.import(
18-
"resource://gre/modules/XPCOMUtils.jsm"
17+
const { XPCOMUtils } = ChromeUtils.importESModule(
18+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1919
);
2020

2121
XPCOMUtils.defineLazyPreferenceGetter(

‎browser/actors/RFPHelperChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["RFPHelperChild"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing";

‎browser/actors/RFPHelperParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["RFPHelperParent"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing";

‎browser/actors/ScreenshotsComponentChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
var EXPORTED_SYMBOLS = ["ScreenshotsComponentChild"];
99

10-
const { XPCOMUtils } = ChromeUtils.import(
11-
"resource://gre/modules/XPCOMUtils.jsm"
10+
const { XPCOMUtils } = ChromeUtils.importESModule(
11+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1212
);
1313

1414
const lazy = {};

‎browser/actors/SearchSERPTelemetryChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
var EXPORTED_SYMBOLS = ["SearchSERPTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];
77

8-
const { XPCOMUtils } = ChromeUtils.import(
9-
"resource://gre/modules/XPCOMUtils.jsm"
8+
const { XPCOMUtils } = ChromeUtils.importESModule(
9+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1010
);
1111

1212
const lazy = {};

‎browser/actors/WebRTCChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
var EXPORTED_SYMBOLS = ["WebRTCChild"];
88

9-
const { XPCOMUtils } = ChromeUtils.import(
10-
"resource://gre/modules/XPCOMUtils.jsm"
9+
const { XPCOMUtils } = ChromeUtils.importESModule(
10+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1111
);
1212
const { AppConstants } = ChromeUtils.import(
1313
"resource://gre/modules/AppConstants.jsm"

‎browser/actors/WebRTCParent.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
var EXPORTED_SYMBOLS = ["WebRTCParent"];
88

9-
const { XPCOMUtils } = ChromeUtils.import(
10-
"resource://gre/modules/XPCOMUtils.jsm"
9+
const { XPCOMUtils } = ChromeUtils.importESModule(
10+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1111
);
1212

1313
const lazy = {};

‎browser/base/content/aboutDialog-appUpdater.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
/* import-globals-from aboutDialog.js */
99

10-
var { XPCOMUtils } = ChromeUtils.import(
11-
"resource://gre/modules/XPCOMUtils.jsm"
10+
var { XPCOMUtils } = ChromeUtils.importESModule(
11+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1212
);
1313
XPCOMUtils.defineLazyModuleGetters(this, {
1414
AppUpdater: "resource:///modules/AppUpdater.jsm",

‎browser/base/content/browser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
var { XPCOMUtils } = ChromeUtils.import(
7-
"resource://gre/modules/XPCOMUtils.jsm"
6+
var { XPCOMUtils } = ChromeUtils.importESModule(
7+
"resource://gre/modules/XPCOMUtils.sys.mjs"
88
);
99
var { AppConstants } = ChromeUtils.import(
1010
"resource://gre/modules/AppConstants.jsm"

‎browser/base/content/test/favicons/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* Any copyright is dedicated to the Public Domain.
22
* http://creativecommons.org/publicdomain/zero/1.0/ */
33

4-
var { XPCOMUtils } = ChromeUtils.import(
5-
"resource://gre/modules/XPCOMUtils.jsm"
4+
var { XPCOMUtils } = ChromeUtils.importESModule(
5+
"resource://gre/modules/XPCOMUtils.sys.mjs"
66
);
77

88
XPCOMUtils.defineLazyModuleGetters(this, {

‎browser/base/content/test/general/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
const { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
ChromeUtils.defineModuleGetter(

‎browser/base/content/test/metaTags/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
var { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
ChromeUtils.defineModuleGetter(

‎browser/base/content/test/plugins/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
var { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
ChromeUtils.defineModuleGetter(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
var { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
ChromeUtils.defineModuleGetter(

‎browser/base/content/test/referrer/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
var { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
const REFERRER_URL_BASE = "/browser/browser/base/content/test/referrer/";

‎browser/base/content/test/sanitize/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
var { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
XPCOMUtils.defineLazyModuleGetters(this, {

‎browser/base/content/test/siteIdentity/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var { XPCOMUtils } = ChromeUtils.import(
2-
"resource://gre/modules/XPCOMUtils.jsm"
1+
var { XPCOMUtils } = ChromeUtils.importESModule(
2+
"resource://gre/modules/XPCOMUtils.sys.mjs"
33
);
44

55
function openIdentityPopup() {

‎browser/base/content/test/webrtc/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ const { AppConstants } = ChromeUtils.import(
22
"resource://gre/modules/AppConstants.jsm"
33
);
44

5-
var { XPCOMUtils } = ChromeUtils.import(
6-
"resource://gre/modules/XPCOMUtils.jsm"
5+
var { XPCOMUtils } = ChromeUtils.importESModule(
6+
"resource://gre/modules/XPCOMUtils.sys.mjs"
77
);
88
var { SitePermissions } = ChromeUtils.import(
99
"resource:///modules/SitePermissions.jsm"

‎browser/base/content/utilityOverlay.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
var { AppConstants } = ChromeUtils.import(
88
"resource://gre/modules/AppConstants.jsm"
99
);
10-
var { XPCOMUtils } = ChromeUtils.import(
11-
"resource://gre/modules/XPCOMUtils.jsm"
10+
var { XPCOMUtils } = ChromeUtils.importESModule(
11+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1212
);
1313

1414
XPCOMUtils.defineLazyModuleGetters(this, {

‎browser/base/content/webrtcIndicator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
const { XPCOMUtils } = ChromeUtils.import(
6-
"resource://gre/modules/XPCOMUtils.jsm"
5+
const { XPCOMUtils } = ChromeUtils.importESModule(
6+
"resource://gre/modules/XPCOMUtils.sys.mjs"
77
);
88
const { AppConstants } = ChromeUtils.import(
99
"resource://gre/modules/AppConstants.jsm"

‎browser/components/BrowserContentHandler.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ var EXPORTED_SYMBOLS = [
77
"nsDefaultCommandLineHandler",
88
];
99

10-
const { XPCOMUtils } = ChromeUtils.import(
11-
"resource://gre/modules/XPCOMUtils.jsm"
10+
const { XPCOMUtils } = ChromeUtils.importESModule(
11+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1212
);
1313
const { AppConstants } = ChromeUtils.import(
1414
"resource://gre/modules/AppConstants.jsm"

‎browser/components/BrowserGlue.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ var EXPORTED_SYMBOLS = [
99
"DefaultBrowserCheck",
1010
];
1111

12-
const { XPCOMUtils } = ChromeUtils.import(
13-
"resource://gre/modules/XPCOMUtils.jsm"
12+
const { XPCOMUtils } = ChromeUtils.importESModule(
13+
"resource://gre/modules/XPCOMUtils.sys.mjs"
1414
);
1515
const { AppConstants } = ChromeUtils.import(
1616
"resource://gre/modules/AppConstants.jsm"

0 commit comments

Comments
 (0)