nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1803158 - convert session restore consumers to reference the sys.mjs files instead, r=webdriver-reviewers,perftest-reviewers,extension-reviewers,credential-management-reviewers,Standard8,sgalich,whimboo,sparky,willdurand

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D163350
This commit is contained in:
Gijs Kruitbosch 2022-12-06 16:02:03 +00:00
parent ad73d26a8a
commit 38d4b2f917
40 changed files with 90 additions and 139 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
browser/actors/AboutTabCrashedParent.sys.mjs
View file

@ -5,8 +5,12 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {}; const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm", TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
}); });

9
browser/base/content/browser-places.js
View file

@ -610,11 +610,10 @@ var PlacesCommandHook = {
}, },
}; };
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(this, {
this, RecentlyClosedTabsAndWindowsMenuUtils:
"RecentlyClosedTabsAndWindowsMenuUtils", "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs",
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm" });
);
// View for the history menu. // View for the history menu.
function HistoryMenu(aPopupShowingEvent) { function HistoryMenu(aPopupShowingEvent) {

4
browser/base/content/browser.js
View file

@ -39,6 +39,8 @@ ChromeUtils.defineESModuleGetters(this, {
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
Sanitizer: "resource:///modules/Sanitizer.sys.mjs", Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
SubDialog: "resource://gre/modules/SubDialog.sys.mjs", SubDialog: "resource://gre/modules/SubDialog.sys.mjs",
SubDialogManager: "resource://gre/modules/SubDialog.sys.mjs", SubDialogManager: "resource://gre/modules/SubDialog.sys.mjs",
@ -89,8 +91,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
RFPHelper: "resource://gre/modules/RFPHelper.jsm", RFPHelper: "resource://gre/modules/RFPHelper.jsm",
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm", SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
SiteDataManager: "resource:///modules/SiteDataManager.jsm", SiteDataManager: "resource:///modules/SiteDataManager.jsm",
SitePermissions: "resource:///modules/SitePermissions.jsm", SitePermissions: "resource:///modules/SitePermissions.jsm",
TabModalPrompt: "chrome://global/content/tabprompts.jsm", TabModalPrompt: "chrome://global/content/tabprompts.jsm",

4
browser/base/content/test/about/browser_aboutCertError.js
View file

@ -11,8 +11,8 @@ const BAD_CERT = "https://expired.example.com/";
const UNKNOWN_ISSUER = "https://self-signed.example.com "; const UNKNOWN_ISSUER = "https://self-signed.example.com ";
const BAD_STS_CERT = const BAD_STS_CERT =
"https://badchain.include-subdomains.pinning.example.com:443"; "https://badchain.include-subdomains.pinning.example.com:443";
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
add_task(async function checkReturnToAboutHome() { add_task(async function checkReturnToAboutHome() {

4
browser/base/content/test/general/browser_bug724239.js
View file

@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain. /* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */ * http://creativecommons.org/publicdomain/zero/1.0/ */
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
add_task(async function test_blank() { add_task(async function test_blank() {

4
browser/base/content/test/general/browser_restore_isAppTab.js
View file

@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain. /* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */ * http://creativecommons.org/publicdomain/zero/1.0/ */
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
const DUMMY = const DUMMY =

4
browser/base/content/test/general/browser_tab_detach_restore.js
View file

@ -1,7 +1,7 @@
"use strict"; "use strict";
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
add_task(async function() { add_task(async function() {

4
browser/base/content/test/tabcrashed/browser_autoSubmitRequest.js
View file

@ -4,8 +4,8 @@ const PAGE =
"data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page."; "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
const AUTOSUBMIT_PREF = "browser.crashReports.unsubmittedCheck.autoSubmit2"; const AUTOSUBMIT_PREF = "browser.crashReports.unsubmittedCheck.autoSubmit2";
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
// On debug builds, crashing tabs results in much thinking, which // On debug builds, crashing tabs results in much thinking, which

4
browser/base/content/test/tabs/browser_bug_1387976_restore_lazy_tab_browser_muted_state.js
View file

@ -3,8 +3,8 @@
"use strict"; "use strict";
const { TabState } = ChromeUtils.import( const { TabState } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabState.jsm" "resource:///modules/sessionstore/TabState.sys.mjs"
); );
/** /**

12
browser/base/content/test/tabs/browser_new_tab_insert_position.js
View file

@ -2,18 +2,10 @@
http://creativecommons.org/publicdomain/zero/1.0/ */ http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict"; "use strict";
ChromeUtils.defineModuleGetter(
this,
"SessionStore",
"resource:///modules/sessionstore/SessionStore.jsm"
);
ChromeUtils.defineModuleGetter(
this,
"TabStateFlusher",
"resource:///modules/sessionstore/TabStateFlusher.jsm"
);
ChromeUtils.defineESModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
}); });
const triggeringPrincipal_base64 = E10SUtils.SERIALIZED_SYSTEMPRINCIPAL; const triggeringPrincipal_base64 = E10SUtils.SERIALIZED_SYSTEMPRINCIPAL;

4
browser/base/content/test/tabs/browser_tab_move_to_new_window_reload.js
View file

@ -3,8 +3,8 @@
"use strict"; "use strict";
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
// Move a tab to a new window the reload it. In Bug 1691135 it would not // Move a tab to a new window the reload it. In Bug 1691135 it would not

2
browser/components/BrowserContentHandler.jsm
View file

@ -19,6 +19,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs", FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
@ -27,7 +28,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
HomePage: "resource:///modules/HomePage.jsm", HomePage: "resource:///modules/HomePage.jsm",
LaterRun: "resource:///modules/LaterRun.jsm", LaterRun: "resource:///modules/LaterRun.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm", NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
ShellService: "resource:///modules/ShellService.jsm", ShellService: "resource:///modules/ShellService.jsm",
UpdatePing: "resource://gre/modules/UpdatePing.jsm", UpdatePing: "resource://gre/modules/UpdatePing.jsm",
}); });

4
browser/components/BrowserGlue.jsm
View file

@ -44,6 +44,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs", QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs", ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
SnapshotMonitor: "resource:///modules/SnapshotMonitor.sys.mjs", SnapshotMonitor: "resource:///modules/SnapshotMonitor.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
@ -94,8 +96,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm",
SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm", SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
ShellService: "resource:///modules/ShellService.jsm", ShellService: "resource:///modules/ShellService.jsm",
SpecialMessageActions: SpecialMessageActions:
"resource://messaging-system/lib/SpecialMessageActions.jsm", "resource://messaging-system/lib/SpecialMessageActions.jsm",

4
browser/components/aboutlogins/tests/browser/browser_sessionRestore.js
View file

@ -3,10 +3,6 @@
"use strict"; "use strict";
const { TabState } = ChromeUtils.import(
"resource:///modules/sessionstore/TabState.jsm"
);
async function checkLoginDisplayed(browser, testGuid) { async function checkLoginDisplayed(browser, testGuid) {
await SpecialPowers.spawn(browser, [testGuid], async function(guid) { await SpecialPowers.spawn(browser, [testGuid], async function(guid) {
let loginList = Cu.waiveXrays(content.document.querySelector("login-list")); let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));

6
browser/components/customizableui/CustomizableWidgets.jsm
View file

@ -22,14 +22,14 @@ const { PrivateBrowsingUtils } = ChromeUtils.importESModule(
const lazy = {}; const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
RecentlyClosedTabsAndWindowsMenuUtils:
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
RecentlyClosedTabsAndWindowsMenuUtils:
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
}); });
ChromeUtils.defineModuleGetter( ChromeUtils.defineModuleGetter(

8
browser/components/customizableui/CustomizeMode.jsm
View file

@ -54,11 +54,9 @@ ChromeUtils.defineModuleGetter(
"BrowserUsageTelemetry", "BrowserUsageTelemetry",
"resource:///modules/BrowserUsageTelemetry.jsm" "resource:///modules/BrowserUsageTelemetry.jsm"
); );
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(lazy, {
lazy, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", });
"resource:///modules/sessionstore/SessionStore.jsm"
);
XPCOMUtils.defineLazyGetter(lazy, "gWidgetsBundle", function() { XPCOMUtils.defineLazyGetter(lazy, "gWidgetsBundle", function() {
const kUrl = const kUrl =
"chrome://browser/locale/customizableui/customizableWidgets.properties"; "chrome://browser/locale/customizableui/customizableWidgets.properties";

4
browser/components/customizableui/test/browser_history_restore_session.js
View file

@ -34,8 +34,8 @@ add_task(async function testRestoreSession() {
win = await BrowserTestUtils.openNewBrowserWindow(); win = await BrowserTestUtils.openNewBrowserWindow();
let lastSession = ChromeUtils.import( let lastSession = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionStore.jsm" "resource:///modules/sessionstore/SessionStore.sys.mjs"
)._LastSession; )._LastSession;
lastSession.setState(true); lastSession.setState(true);

8
browser/components/extensions/parent/ext-sessions.js
View file

@ -13,11 +13,9 @@ ChromeUtils.defineModuleGetter(
"AddonManagerPrivate", "AddonManagerPrivate",
"resource://gre/modules/AddonManager.jsm" "resource://gre/modules/AddonManager.jsm"
); );
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(this, {
this, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", });
"resource:///modules/sessionstore/SessionStore.jsm"
);
const SS_ON_CLOSED_OBJECTS_CHANGED = "sessionstore-closed-objects-changed"; const SS_ON_CLOSED_OBJECTS_CHANGED = "sessionstore-closed-objects-changed";

6
browser/components/extensions/parent/ext-tabs.js
View file

@ -15,17 +15,13 @@ ChromeUtils.defineESModuleGetters(this, {
DownloadPaths: "resource://gre/modules/DownloadPaths.sys.mjs", DownloadPaths: "resource://gre/modules/DownloadPaths.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
}); });
ChromeUtils.defineModuleGetter( ChromeUtils.defineModuleGetter(
this, this,
"ExtensionControlledPopup", "ExtensionControlledPopup",
"resource:///modules/ExtensionControlledPopup.jsm" "resource:///modules/ExtensionControlledPopup.jsm"
); );
ChromeUtils.defineModuleGetter(
this,
"SessionStore",
"resource:///modules/sessionstore/SessionStore.jsm"
);
XPCOMUtils.defineLazyGetter(this, "strBundle", function() { XPCOMUtils.defineLazyGetter(this, "strBundle", function() {
return Services.strings.createBundle( return Services.strings.createBundle(

14
browser/components/extensions/test/browser/browser_ext_sessions_restore.js
View file

@ -4,16 +4,10 @@
SimpleTest.requestCompleteLog(); SimpleTest.requestCompleteLog();
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(this, {
this, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
"resource:///modules/sessionstore/SessionStore.jsm" });
);
ChromeUtils.defineModuleGetter(
this,
"TabStateFlusher",
"resource:///modules/sessionstore/TabStateFlusher.jsm"
);
add_task(async function test_sessions_restore() { add_task(async function test_sessions_restore() {
function background() { function background() {

8
browser/components/extensions/test/browser/browser_ext_sessions_restoreTab.js
View file

@ -2,11 +2,9 @@
/* vim: set sts=2 sw=2 et tw=80: */ /* vim: set sts=2 sw=2 et tw=80: */
"use strict"; "use strict";
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(this, {
this, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", });
"resource:///modules/sessionstore/SessionStore.jsm"
);
/** /**
This test checks that after closing an extension made tab it restores correctly. This test checks that after closing an extension made tab it restores correctly.

14
browser/components/extensions/test/browser/browser_ext_tabs_hide.js
View file

@ -1,15 +1,9 @@
"use strict"; "use strict";
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(this, {
this, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
"resource:///modules/sessionstore/SessionStore.jsm" });
);
ChromeUtils.defineModuleGetter(
this,
"TabStateFlusher",
"resource:///modules/sessionstore/TabStateFlusher.jsm"
);
ChromeUtils.defineModuleGetter( ChromeUtils.defineModuleGetter(
this, this,
"ExtensionControlledPopup", "ExtensionControlledPopup",

14
browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
View file

@ -2,16 +2,10 @@
/* vim: set sts=2 sw=2 et tw=80: */ /* vim: set sts=2 sw=2 et tw=80: */
"use strict"; "use strict";
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(this, {
this, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
"resource:///modules/sessionstore/SessionStore.jsm" });
);
ChromeUtils.defineModuleGetter(
this,
"TabStateFlusher",
"resource:///modules/sessionstore/TabStateFlusher.jsm"
);
async function testTabsUpdateURL( async function testTabsUpdateURL(
existentTabURL, existentTabURL,

8
browser/components/firefoxview/recently-closed-tabs.mjs
View file

@ -3,11 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const lazy = {}; const lazy = {};
ChromeUtils.defineModuleGetter( ChromeUtils.defineESModuleGetters(lazy, {
lazy, SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
"SessionStore", });
"resource:///modules/sessionstore/SessionStore.jsm"
);
import { import {
formatURIForDisplay, formatURIForDisplay,

4
browser/components/firefoxview/tests/browser/browser_recently_closed_tabs.js
View file

@ -14,8 +14,8 @@
* associated with the correct window where the tests are run. * associated with the correct window where the tests are run.
*/ */
XPCOMUtils.defineLazyModuleGetters(globalThis, { ChromeUtils.defineESModuleGetters(globalThis, {
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
}); });
const { TabsSetupFlowManager } = ChromeUtils.importESModule( const { TabsSetupFlowManager } = ChromeUtils.importESModule(

6
browser/components/migration/FirefoxProfileMigrator.sys.mjs
View file

@ -22,12 +22,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
FileUtils: "resource://gre/modules/FileUtils.sys.mjs", FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs", PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs", ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
SessionMigration: "resource:///modules/sessionstore/SessionMigration.sys.mjs",
}); });
ChromeUtils.defineModuleGetter(
lazy,
"SessionMigration",
"resource:///modules/sessionstore/SessionMigration.jsm"
);
export function FirefoxProfileMigrator() { export function FirefoxProfileMigrator() {
this.wrappedJSObject = this; // for testing... this.wrappedJSObject = this; // for testing...

2
browser/components/migration/tests/marionette/test_refresh_firefox.py
View file

@ -180,7 +180,7 @@ class TestFirefoxRefresh(MarionetteTestCase):
const COMPLETE_STATE = Ci.nsIWebProgressListener.STATE_STOP + const COMPLETE_STATE = Ci.nsIWebProgressListener.STATE_STOP +
Ci.nsIWebProgressListener.STATE_IS_NETWORK; Ci.nsIWebProgressListener.STATE_IS_NETWORK;
let { TabStateFlusher } = ChromeUtils.import( let { TabStateFlusher } = ChromeUtils.import(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
let expectedURLs = Array.from(arguments[0]) let expectedURLs = Array.from(arguments[0])
gBrowser.addTabsProgressListener({ gBrowser.addTabsProgressListener({

8
browser/components/urlbar/tests/browser/browser_aboutHomeLoading.js
View file

@ -7,11 +7,11 @@
"use strict"; "use strict";
const { SessionSaver } = ChromeUtils.import( const { SessionSaver } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionSaver.jsm" "resource:///modules/sessionstore/SessionSaver.sys.mjs"
); );
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
add_task(function addHomeButton() { add_task(function addHomeButton() {

6
browser/components/urlbar/tests/browser/browser_searchMode_sessionStore.js
View file

@ -9,9 +9,9 @@
"use strict"; "use strict";
XPCOMUtils.defineLazyModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.jsm", TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
}); });
// This test takes a long time on the OS X 10.14 machines, so request a longer // This test takes a long time on the OS X 10.14 machines, so request a longer

2
browser/modules/ContentCrashHandlers.jsm
View file

@ -17,6 +17,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
clearTimeout: "resource://gre/modules/Timer.sys.mjs", clearTimeout: "resource://gre/modules/Timer.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs", setTimeout: "resource://gre/modules/Timer.sys.mjs",
}); });
@ -24,7 +25,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
CrashSubmit: "resource://gre/modules/CrashSubmit.jsm", CrashSubmit: "resource://gre/modules/CrashSubmit.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
}); });
// We don't process crash reports older than 28 days, so don't bother // We don't process crash reports older than 28 days, so don't bother

4
browser/modules/test/browser/browser_UsageTelemetry.js
View file

@ -22,8 +22,8 @@ ChromeUtils.defineModuleGetter(
"resource:///modules/BrowserUsageTelemetry.jsm" "resource:///modules/BrowserUsageTelemetry.jsm"
); );
const { SessionStore } = ChromeUtils.import( const { SessionStore } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionStore.jsm" "resource:///modules/sessionstore/SessionStore.sys.mjs"
); );
// Reset internal URI counter in case URIs were opened by other tests. // Reset internal URI counter in case URIs were opened by other tests.

4
browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
View file

@ -120,8 +120,8 @@ add_task(async function test_sessionRestore() {
}; };
// Save the current session. // Save the current session.
let { SessionStore } = ChromeUtils.import( let { SessionStore } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionStore.jsm" "resource:///modules/sessionstore/SessionStore.sys.mjs"
); );
// Load the custom state and wait for SSTabRestored, as we want to make sure // Load the custom state and wait for SSTabRestored, as we want to make sure

2
remote/cdp/domains/parent/Page.sys.mjs
View file

@ -10,6 +10,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
clearInterval: "resource://gre/modules/Timer.sys.mjs", clearInterval: "resource://gre/modules/Timer.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
setInterval: "resource://gre/modules/Timer.sys.mjs", setInterval: "resource://gre/modules/Timer.sys.mjs",
DialogHandler: DialogHandler:
@ -23,7 +24,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
OS: "resource://gre/modules/osfile.jsm", OS: "resource://gre/modules/osfile.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
}); });
const MAX_CANVAS_DIMENSION = 32767; const MAX_CANVAS_DIMENSION = 32767;

9
services/sync/tps/extensions/tps/resource/tps.jsm
View file

@ -40,6 +40,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs", JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
Log: "resource://gre/modules/Log.sys.mjs", Log: "resource://gre/modules/Log.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
@ -50,35 +51,27 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
CommonUtils: "resource://services-common/utils.js", CommonUtils: "resource://services-common/utils.js",
extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm", extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm",
Logger: "resource://tps/logger.jsm", Logger: "resource://tps/logger.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
Svc: "resource://services-sync/util.js", Svc: "resource://services-sync/util.js",
SyncTelemetry: "resource://services-sync/telemetry.js", SyncTelemetry: "resource://services-sync/telemetry.js",
Weave: "resource://services-sync/main.js", Weave: "resource://services-sync/main.js",
WEAVE_VERSION: "resource://services-sync/constants.js", WEAVE_VERSION: "resource://services-sync/constants.js",
Addon: "resource://tps/modules/addons.jsm", Addon: "resource://tps/modules/addons.jsm",
AddonValidator: "resource://services-sync/engines/addons.js", AddonValidator: "resource://services-sync/engines/addons.js",
FormData: "resource://tps/modules/forms.jsm", FormData: "resource://tps/modules/forms.jsm",
FormValidator: "resource://services-sync/engines/forms.js", FormValidator: "resource://services-sync/engines/forms.js",
Bookmark: "resource://tps/modules/bookmarks.jsm", Bookmark: "resource://tps/modules/bookmarks.jsm",
DumpBookmarks: "resource://tps/modules/bookmarks.jsm", DumpBookmarks: "resource://tps/modules/bookmarks.jsm",
BookmarkFolder: "resource://tps/modules/bookmarks.jsm", BookmarkFolder: "resource://tps/modules/bookmarks.jsm",
Livemark: "resource://tps/modules/bookmarks.jsm", Livemark: "resource://tps/modules/bookmarks.jsm",
Separator: "resource://tps/modules/bookmarks.jsm", Separator: "resource://tps/modules/bookmarks.jsm",
BookmarkValidator: "resource://tps/modules/bookmarkValidator.jsm", BookmarkValidator: "resource://tps/modules/bookmarkValidator.jsm",
Address: "resource://tps/modules/formautofill.jsm", Address: "resource://tps/modules/formautofill.jsm",
DumpAddresses: "resource://tps/modules/formautofill.jsm", DumpAddresses: "resource://tps/modules/formautofill.jsm",
CreditCard: "resource://tps/modules/formautofill.jsm", CreditCard: "resource://tps/modules/formautofill.jsm",
DumpCreditCards: "resource://tps/modules/formautofill.jsm", DumpCreditCards: "resource://tps/modules/formautofill.jsm",
DumpHistory: "resource://tps/modules/history.jsm", DumpHistory: "resource://tps/modules/history.jsm",
HistoryEntry: "resource://tps/modules/history.jsm", HistoryEntry: "resource://tps/modules/history.jsm",
Preference: "resource://tps/modules/prefs.jsm", Preference: "resource://tps/modules/prefs.jsm",
DumpPasswords: "resource://tps/modules/passwords.jsm", DumpPasswords: "resource://tps/modules/passwords.jsm",
Password: "resource://tps/modules/passwords.jsm", Password: "resource://tps/modules/passwords.jsm",
PasswordValidator: "resource://services-sync/engines/passwords.js", PasswordValidator: "resource://services-sync/engines/passwords.js",

5
testing/talos/talos/startup_test/sessionrestore/addon/api.js
View file

@ -10,13 +10,14 @@
ChromeUtils.defineESModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
StartupPerformance:
"resource:///modules/sessionstore/StartupPerformance.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs", setTimeout: "resource://gre/modules/Timer.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
StartupPerformance: "resource:///modules/sessionstore/StartupPerformance.jsm",
}); });
/* globals ExtensionAPI */ /* globals ExtensionAPI */

2
testing/talos/talos/talos-powers/api.js
View file

@ -9,6 +9,7 @@ const { ComponentUtils } = ChromeUtils.import(
); );
ChromeUtils.defineESModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs", setTimeout: "resource://gre/modules/Timer.sys.mjs",
}); });
@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm", AboutNewTab: "resource:///modules/AboutNewTab.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
PerTestCoverageUtils: "resource://testing-common/PerTestCoverageUtils.jsm", PerTestCoverageUtils: "resource://testing-common/PerTestCoverageUtils.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
}); });
XPCOMUtils.defineLazyServiceGetter( XPCOMUtils.defineLazyServiceGetter(

4
toolkit/components/httpsonlyerror/tests/browser/browser_errorpage.js
View file

@ -9,8 +9,8 @@ const GOOD_PAGE = "http://example.com/";
const BAD_CERT = "http://expired.example.com/"; const BAD_CERT = "http://expired.example.com/";
const UNKNOWN_ISSUER = "http://self-signed.example.com/"; const UNKNOWN_ISSUER = "http://self-signed.example.com/";
const { TabStateFlusher } = ChromeUtils.import( const { TabStateFlusher } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/TabStateFlusher.jsm" "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
); );
add_task(async function() { add_task(async function() {

4
toolkit/components/sessionstore/SessionStoreFunctions.jsm
View file

@ -2,8 +2,8 @@
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { SessionStore } = ChromeUtils.import( const { SessionStore } = ChromeUtils.importESModule(
"resource:///modules/sessionstore/SessionStore.jsm" "resource:///modules/sessionstore/SessionStore.sys.mjs"
); );
function UpdateSessionStore( function UpdateSessionStore(

2
toolkit/components/thumbnails/test/head.js
View file

@ -5,13 +5,13 @@ ChromeUtils.defineESModuleGetters(this, {
FileUtils: "resource://gre/modules/FileUtils.sys.mjs", FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, {
BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm", BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm",
PageThumbs: "resource://gre/modules/PageThumbs.jsm", PageThumbs: "resource://gre/modules/PageThumbs.jsm",
PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm", PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
}); });
XPCOMUtils.defineLazyServiceGetter( XPCOMUtils.defineLazyServiceGetter(

6
toolkit/content/widgets/browser-custom-element.js
View file

@ -59,9 +59,9 @@
Object.defineProperty(lazy, "SessionStore", { Object.defineProperty(lazy, "SessionStore", {
configurable: true, configurable: true,
get() { get() {
const kURL = "resource:///modules/sessionstore/SessionStore.jsm"; const kURL = "resource:///modules/sessionstore/SessionStore.sys.mjs";
if (Cu.isModuleLoaded(kURL)) { if (Cu.isESModuleLoaded(kURL)) {
let { SessionStore } = ChromeUtils.import(kURL); let { SessionStore } = ChromeUtils.importESModule(kURL);
// eslint-disable-next-line mozilla/valid-lazy // eslint-disable-next-line mozilla/valid-lazy
Object.defineProperty(lazy, "SessionStore", { Object.defineProperty(lazy, "SessionStore", {
value: SessionStore, value: SessionStore,