Bug 1814931 - Convert services/sync imports to direct ES imports. r=markh,settings-reviewers,credential-management-reviewers,mconley,dimi

Differential Revision: https://phabricator.services.mozilla.com/D168837
This commit is contained in:
Mark Banner committed 2023-02-13 11:44:29 +00:00
1 parent 1ad4b1b3ef
commit 18898557b3
183 files changed
+866 -616

No files matched your search

+8 -11
View File
@@ -5,7 +5,9 @@
// This file is loaded into the browser window scope.
/* eslint-env mozilla/browser-window */
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
ChromeUtils.defineModuleGetter(
this,
@@ -17,14 +19,9 @@ ChromeUtils.defineModuleGetter(
"EnsureFxAccountsWebChannel",
"resource://gre/modules/FxAccountsWebChannel.jsm"
);
ChromeUtils.defineModuleGetter(
this,
"Weave",
"resource://services-sync/main.js"
);
XPCOMUtils.defineLazyModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
ChromeUtils.defineESModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
});
const MIN_STATUS_ANIMATION_DURATION = 1600;
@@ -1748,8 +1745,8 @@ var gSync = {
},
async _disconnectFxaAndSync(deleteLocalData) {
const { SyncDisconnect } = ChromeUtils.import(
"resource://services-sync/SyncDisconnect.jsm"
const { SyncDisconnect } = ChromeUtils.importESModule(
"resource://services-sync/SyncDisconnect.sys.mjs"
);
// Record telemetry.
await fxAccounts.telemetry.recordDisconnection(null, "ui");
+3 -3
View File
@@ -60,6 +60,7 @@ ChromeUtils.defineESModuleGetters(this, {
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",
});
@@ -97,7 +98,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
Translation: "resource:///modules/translation/TranslationParent.jsm",
UITour: "resource:///modules/UITour.jsm",
Weave: "resource://services-sync/main.js",
WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
webrtcUI: "resource:///modules/webrtcUI.jsm",
ZoomUI: "resource:///modules/ZoomUI.jsm",
@@ -10076,8 +10076,8 @@ var FirefoxViewHandler = {
FirefoxViewNotificationManager.shouldNotificationDotBeShowing()
);
}
XPCOMUtils.defineLazyModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
ChromeUtils.defineESModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
Services.obs.addObserver(this, "firefoxview-notification-dot-update");
},
+3 -1
View File
@@ -1,4 +1,6 @@
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
function promiseSyncReady() {
+1 -1
View File
@@ -46,6 +46,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
TelemetryUtils: "resource://gre/modules/TelemetryUtils.sys.mjs",
UIState: "resource://services-sync/UIState.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
WebChannel: "resource://gre/modules/WebChannel.sys.mjs",
WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
@@ -104,7 +105,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
TabUnloader: "resource:///modules/TabUnloader.jsm",
TRRRacer: "resource:///modules/TRRPerformance.jsm",
UIState: "resource://services-sync/UIState.jsm",
});
if (AppConstants.MOZ_UPDATER) {
@@ -14,6 +14,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
LoginBreaches: "resource:///modules/LoginBreaches.sys.mjs",
OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
UIState: "resource://services-sync/UIState.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -21,7 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginExport: "resource://gre/modules/LoginExport.jsm",
LoginCSVImport: "resource://gre/modules/LoginCSVImport.jsm",
MigrationUtils: "resource:///modules/MigrationUtils.jsm",
UIState: "resource://services-sync/UIState.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
@@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
function mockState(state) {
UIState.get = () => ({
@@ -4,8 +4,12 @@
*/
"use strict";
let { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
let { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
let getState;
let originalSync;
@@ -9,10 +9,12 @@ requestLongerTimeout(2);
const { FxAccounts } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"
);
let { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
let { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
let { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
let { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
ChromeUtils.defineModuleGetter(
this,
@@ -13,9 +13,12 @@ const lazy = {};
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
ChromeUtils.defineESModuleGetters(lazy, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
});
export const FirefoxViewNotificationManager = new (class {
@@ -13,16 +13,14 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Log: "resource://gre/modules/Log.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
UIState: "resource://services-sync/UIState.jsm",
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
Weave: "resource://services-sync/main.js",
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
UIState: "resource://services-sync/UIState.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "syncUtils", () => {
return ChromeUtils.import("resource://services-sync/util.js").Utils;
return ChromeUtils.importESModule("resource://services-sync/util.sys.mjs")
.Utils;
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
@@ -3,11 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"SyncedTabs",
"resource://services-sync/SyncedTabs.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
import {
formatURIForDisplay,
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
XPCOMUtils.defineLazyModuleGetters(globalThis, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
ChromeUtils.defineESModuleGetters(globalThis, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
const SYNCED_URI = syncedTabsData1[0].tabs[1].url;
@@ -5,8 +5,8 @@ const tabsList1 = syncedTabsData1[0].tabs;
const tabsList2 = syncedTabsData1[1].tabs;
const BADGE_TOP_RIGHT = "75% 25%";
const { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
const { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
function setupRecentDeviceListMocks() {
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
XPCOMUtils.defineLazyModuleGetters(globalThis, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
ChromeUtils.defineESModuleGetters(globalThis, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
async function tearDown(sandbox) {
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
XPCOMUtils.defineLazyModuleGetters(globalThis, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
ChromeUtils.defineESModuleGetters(globalThis, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
const twoTabs = [
@@ -16,7 +16,9 @@ const {
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
const { FeatureCalloutMessages } = ChromeUtils.import(
"resource://activity-stream/lib/FeatureCalloutMessages.jsm"
@@ -25,9 +27,12 @@ const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
AboutWelcomeParent: "resource:///actors/AboutWelcomeParent.jsm",
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
});
const MOBILE_PROMO_DISMISSED_PREF =
@@ -16,6 +16,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -23,7 +24,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
CustomizableUI: "resource:///modules/CustomizableUI.jsm",
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
PluralForm: "resource://gre/modules/PluralForm.jsm",
Weave: "resource://services-sync/main.js",
});
XPCOMUtils.defineLazyGetter(lazy, "bundle", function() {
@@ -8,7 +8,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const { FxAccounts } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"
);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
EventEmitter: "resource://gre/modules/EventEmitter.sys.mjs",
@@ -38,7 +38,9 @@ var { PrivateBrowsingUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PrivateBrowsingUtils.sys.mjs"
);
var { Weave } = ChromeUtils.import("resource://services-sync/main.js");
var { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
var { FxAccounts, getFxAccountsSingleton } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"
@@ -71,6 +73,7 @@ ChromeUtils.defineESModuleGetters(this, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
UIState: "resource://services-sync/UIState.sys.mjs",
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderQuickActions:
@@ -93,7 +96,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
SelectionChangedMenulist: "resource:///modules/SelectionChangedMenulist.jsm",
SiteDataManager: "resource:///modules/SiteDataManager.jsm",
TransientPrefs: "resource:///modules/TransientPrefs.jsm",
UIState: "resource://services-sync/UIState.jsm",
});
XPCOMUtils.defineLazyGetter(this, "gSubDialog", function() {
@@ -3,7 +3,9 @@
"use strict";
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
// This obj will be used in both tests
// First test makes sure accepting the preferences matches these values
@@ -3,7 +3,9 @@
"use strict";
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
const { FxAccountsPairingFlow } = ChromeUtils.import(
"resource://gre/modules/FxAccountsPairing.jsm"
);
@@ -26,7 +26,9 @@ const { TabListView } = ChromeUtils.import(
let { getChromeWindow } = ChromeUtils.import(
"resource:///modules/syncedtabs/util.js"
);
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
let log = ChromeUtils.importESModule(
"resource://gre/modules/Log.sys.mjs"
+2 -2
View File
@@ -4,8 +4,8 @@
"use strict";
const { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
const { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
const { SyncedTabsDeckComponent } = ChromeUtils.import(
"resource:///modules/syncedtabs/SyncedTabsDeckComponent.js"
@@ -1,9 +1,11 @@
"use strict";
const { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
const { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const FIXTURE = [
{
@@ -1,7 +1,7 @@
"use strict";
let { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
let { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
let { SyncedTabsDeckComponent } = ChromeUtils.import(
"resource:///modules/syncedtabs/SyncedTabsDeckComponent.js"
@@ -12,7 +12,9 @@ let { SyncedTabsListStore } = ChromeUtils.import(
let { SyncedTabsDeckStore } = ChromeUtils.import(
"resource:///modules/syncedtabs/SyncedTabsDeckStore.js"
);
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
add_task(async function testInitUninit() {
let deckStore = new SyncedTabsDeckStore();
@@ -1,7 +1,7 @@
"use strict";
let { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
let { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
let { SyncedTabsListStore } = ChromeUtils.import(
"resource:///modules/syncedtabs/SyncedTabsListStore.js"
@@ -1,7 +1,7 @@
"use strict";
let { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
let { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
let { TabListComponent } = ChromeUtils.import(
"resource:///modules/syncedtabs/TabListComponent.js"
@@ -3,7 +3,9 @@
"use strict";
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
const { UIState } = ChromeUtils.importESModule(
"resource://services-sync/UIState.sys.mjs"
);
XPCOMUtils.defineLazyGetter(this, "fxAccounts", () => {
return ChromeUtils.import(
@@ -17,15 +17,12 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
});
let _cache = null;
// By default, we add remote tabs that have been used more recently than this
@@ -8,8 +8,8 @@
"use strict";
const { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
const { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
const TEST_URL = `${TEST_BASE_URL}dummy_page.html`;
@@ -8,8 +8,8 @@
"use strict";
XPCOMUtils.defineLazyModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
ChromeUtils.defineESModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
});
add_setup(async function() {
@@ -11,13 +11,10 @@
const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
ChromeUtils.defineESModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
});
function assertSearchTelemetryEmpty(search_hist) {
const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
Assert.ok(
@@ -3,8 +3,8 @@
"use strict";
const { SyncedTabs } = ChromeUtils.import(
"resource://services-sync/SyncedTabs.jsm"
const { SyncedTabs } = ChromeUtils.importESModule(
"resource://services-sync/SyncedTabs.sys.mjs"
);
const TEST_ENGINE_BASENAME = "searchSuggestionEngine.xml";
@@ -3,7 +3,9 @@
*/
"use strict";
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
// A mock "Tabs" engine which autocomplete will use instead of the real
// engine. We pass a constructor that Sync creates.
@@ -9,7 +9,9 @@
"use strict";
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
@@ -9,7 +9,9 @@
"use strict";
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { CreditCardsEngine } = ChromeUtils.import(
"resource://autofill/FormAutofillSync.jsm"
+2 -2
View File
@@ -33,13 +33,13 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Log: "resource://gre/modules/Log.sys.mjs",
Svc: "resource://services-sync/util.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
clearTimeout: "resource://gre/modules/Timer.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Weave: "resource://services-sync/main.js",
Svc: "resource://services-sync/util.js",
FxAccountsClient: "resource://gre/modules/FxAccountsClient.jsm",
FxAccountsConfig: "resource://gre/modules/FxAccountsConfig.jsm",
});
+6 -5
View File
@@ -90,12 +90,13 @@ ChromeUtils.defineModuleGetter(
);
XPCOMUtils.defineLazyGetter(lazy, "mpLocked", () => {
return ChromeUtils.import("resource://services-sync/util.js").Utils.mpLocked;
return ChromeUtils.importESModule("resource://services-sync/util.sys.mjs")
.Utils.mpLocked;
});
XPCOMUtils.defineLazyGetter(lazy, "ensureMPUnlocked", () => {
return ChromeUtils.import("resource://services-sync/util.js").Utils
.ensureMPUnlocked;
return ChromeUtils.importESModule("resource://services-sync/util.sys.mjs")
.Utils.ensureMPUnlocked;
});
ChromeUtils.defineESModuleGetters(lazy, {
@@ -765,8 +766,8 @@ FxAccountsInternal.prototype = {
this.observerPreloads = [
// Sync
() => {
let { Weave } = ChromeUtils.import(
"resource://services-sync/main.js"
let { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
return Weave.Service.promiseInitialized;
},
+3 -3
View File
@@ -23,9 +23,9 @@ const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
XPCOMUtils.defineLazyModuleGetters(lazy, {
BulkKeyBundle: "resource://services-sync/keys.js",
CryptoWrapper: "resource://services-sync/record.js",
ChromeUtils.defineESModuleGetters(lazy, {
BulkKeyBundle: "resource://services-sync/keys.sys.mjs",
CryptoWrapper: "resource://services-sync/record.sys.mjs",
});
XPCOMUtils.defineLazyPreferenceGetter(
+3 -5
View File
@@ -22,11 +22,9 @@ const { setTimeout, clearTimeout } = ChromeUtils.importESModule(
);
ChromeUtils.import("resource://services-common/utils.js");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Weave",
"resource://services-sync/main.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
Weave: "resource://services-sync/main.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"jwcrypto",
+1 -1
View File
@@ -43,7 +43,7 @@ class FxAccountsTelemetry {
// Records an event *in the Fxa/Sync ping*.
recordEvent(object, method, value, extra = undefined) {
// We need to ensure the telemetry module is loaded.
ChromeUtils.import("resource://services-sync/telemetry.js");
ChromeUtils.importESModule("resource://services-sync/telemetry.sys.mjs");
// Now it will be listening for the notifications...
lazy.Observers.notify("fxa:telemetry:event", {
object,
+1 -5
View File
@@ -48,6 +48,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
WebChannel: "resource://gre/modules/WebChannel.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
@@ -60,11 +61,6 @@ ChromeUtils.defineModuleGetter(
"FxAccountsStorageManagerCanStoreField",
"resource://gre/modules/FxAccountsStorage.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"Weave",
"resource://services-sync/main.js"
);
ChromeUtils.defineModuleGetter(
lazy,
"CryptoUtils",
+5 -3
View File
@@ -75,7 +75,9 @@ WeaveService.prototype = {
]),
get Weave() {
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
return Weave;
},
@@ -112,8 +114,8 @@ WeaveService.prototype = {
// accordingly. We could potentially copy code performed by
// this check into this file if our above code is yielding too
// many false positives.
var { Weave } = ChromeUtils.import(
"resource://services-sync/main.js"
var { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
isConfigured =
Weave.Status.checkSetup() != Weave.CLIENT_NOT_CONFIGURED;
@@ -2,11 +2,9 @@
* 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/. */
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { RawCryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { Weave } from "resource://services-sync/main.sys.mjs";
import { RawCryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Utils } from "resource://services-sync/util.sys.mjs";
export function FakeFilesystemService(contents) {
this.fakeContents = contents;
@@ -4,16 +4,13 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { SyncAuthManager } = ChromeUtils.import(
"resource://services-sync/sync_auth.js"
);
import { Weave } from "resource://services-sync/main.sys.mjs";
import { SyncAuthManager } from "resource://services-sync/sync_auth.sys.mjs";
const { TokenServerClient } = ChromeUtils.import(
"resource://services-common/tokenserverclient.js"
);
const { configureFxAccountIdentity } = ChromeUtils.import(
"resource://testing-common/services/sync/utils.js"
);
import { configureFxAccountIdentity } from "resource://testing-common/services/sync/utils.sys.mjs";
// Create a new sync_auth object and initialize it with a
// mocked TokenServerClient which always receives the specified response.
@@ -2,15 +2,14 @@
* 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/. */
const { Store, SyncEngine, LegacyTracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { SerializableSet, Utils } = ChromeUtils.import(
"resource://services-sync/util.js"
);
import {
Store,
SyncEngine,
LegacyTracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { SerializableSet, Utils } from "resource://services-sync/util.sys.mjs";
/*
* A fake engine implementation.
+6 -5
View File
@@ -10,14 +10,13 @@ import { Assert } from "resource://testing-common/Assert.sys.mjs";
const { initTestLogging } = ChromeUtils.import(
"resource://testing-common/services/common/logging.js"
);
const {
import {
FakeCryptoService,
FakeFilesystemService,
FakeGUIDService,
fakeSHA256HMAC,
} = ChromeUtils.import(
"resource://testing-common/services/sync/fakeservices.js"
);
} from "resource://testing-common/services/sync/fakeservices.sys.mjs";
const { FxAccounts } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"
);
@@ -263,7 +262,9 @@ export var configureFxAccountIdentity = function(
export var configureIdentity = async function(identityOverrides, server) {
let config = makeIdentityConfig(identityOverrides, server);
// Must be imported after the identity configuration is set up.
let { Service } = ChromeUtils.import("resource://services-sync/service.js");
let { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
// If a server was specified, ensure FxA has a correct cluster URL available.
if (server && !config.fxaccount.token.endpoint) {
+3 -2
View File
@@ -12,12 +12,12 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
Log: "resource://gre/modules/Log.sys.mjs",
Utils: "resource://services-sync/util.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Sanitizer: "resource:///modules/Sanitizer.jsm",
Utils: "resource://services-sync/util.js",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
@@ -37,7 +37,8 @@ export const SyncDisconnectInternal = {
// mocked by tests.
getWeave() {
return ChromeUtils.import("resource://services-sync/main.js").Weave;
return ChromeUtils.importESModule("resource://services-sync/main.sys.mjs")
.Weave;
},
// Returns a promise that resolves when we are not syncing, waiting until
+1 -1
View File
@@ -5,7 +5,7 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
import { Weave } from "resource://services-sync/main.sys.mjs";
import { Preferences } from "resource://gre/modules/Preferences.sys.mjs";
const lazy = {};
+3 -5
View File
@@ -13,11 +13,9 @@
*/
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Weave",
"resource://services-sync/main.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
Weave: "resource://services-sync/main.sys.mjs",
});
const TOPICS = [
"weave:connected",
@@ -17,7 +17,8 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
+1 -1
View File
@@ -4,7 +4,7 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Svc } = ChromeUtils.import("resource://services-sync/util.js");
import { Svc } from "resource://services-sync/util.sys.mjs";
const lazy = {};
+2 -6
View File
@@ -14,12 +14,8 @@
* for your subclass to wrap, and optionally implement and override the tracker.
*/
const { SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { RawCryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
import { SyncEngine, Tracker } from "resource://services-sync/engines.sys.mjs";
import { RawCryptoWrapper } from "resource://services-sync/record.sys.mjs";
const lazy = {};
+3 -4
View File
@@ -13,10 +13,9 @@ const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Resource } = ChromeUtils.import("resource://services-sync/resource.js");
const { Svc } = ChromeUtils.import("resource://services-sync/util.js");
import { Service } from "resource://services-sync/service.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import { Svc } from "resource://services-sync/util.sys.mjs";
const log = Log.repository.getLogger("Sync.Doctor");
+10 -7
View File
@@ -19,13 +19,16 @@ const {
ENGINE_UPLOAD_FAIL,
VERSION_OUT_OF_DATE,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { Collection, CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Resource } = ChromeUtils.import("resource://services-sync/resource.js");
const { SerializableSet, Svc, Utils } = ChromeUtils.import(
"resource://services-sync/util.js"
);
import {
Collection,
CryptoWrapper,
} from "resource://services-sync/record.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import {
SerializableSet,
Svc,
Utils,
} from "resource://services-sync/util.sys.mjs";
const lazy = {};
+11 -16
View File
@@ -37,25 +37,20 @@
import { Preferences } from "resource://gre/modules/Preferences.sys.mjs";
const { AddonUtils } = ChromeUtils.import(
"resource://services-sync/addonutils.js"
);
const { AddonsReconciler } = ChromeUtils.import(
"resource://services-sync/addonsreconciler.js"
);
const { Store, SyncEngine, LegacyTracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { AddonUtils } from "resource://services-sync/addonutils.sys.mjs";
import { AddonsReconciler } from "resource://services-sync/addonsreconciler.sys.mjs";
import {
Store,
SyncEngine,
LegacyTracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
const { CollectionValidator } = ChromeUtils.import(
"resource://services-sync/collection_validator.js"
);
import { CollectionValidator } from "resource://services-sync/collection_validator.sys.mjs";
const lazy = {};
@@ -8,13 +8,14 @@ const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
const { Changeset, Store, SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import {
Changeset,
Store,
SyncEngine,
Tracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const lazy = {};
@@ -23,12 +24,12 @@ ChromeUtils.defineESModuleGetters(lazy, {
PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
Resource: "resource://services-sync/resource.sys.mjs",
SyncedBookmarksMirror: "resource://gre/modules/SyncedBookmarksMirror.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Observers: "resource://services-common/observers.js",
Resource: "resource://services-sync/resource.js",
});
const PLACES_MAINTENANCE_INTERVAL_SECONDS = 4 * 60 * 60; // 4 hours.
@@ -27,14 +27,14 @@ const {
SINGLE_USER_THRESHOLD,
SYNC_API_VERSION,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { Store, SyncEngine, LegacyTracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Resource } = ChromeUtils.import("resource://services-sync/resource.js");
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import {
Store,
SyncEngine,
LegacyTracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -4,22 +4,24 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { BridgedEngine, BridgeWrapperXPCOM, LogAdapter } = ChromeUtils.import(
"resource://services-sync/bridged_engine.js"
);
const { SyncEngine } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { Tracker } = ChromeUtils.import("resource://services-sync/engines.js");
import {
BridgedEngine,
BridgeWrapperXPCOM,
LogAdapter,
} from "resource://services-sync/bridged_engine.sys.mjs";
import { SyncEngine, Tracker } from "resource://services-sync/engines.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Svc: "resource://services-sync/util.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm",
extensionStorageSyncKinto:
"resource://gre/modules/ExtensionStorageSyncKinto.jsm",
Observers: "resource://services-common/observers.js",
Svc: "resource://services-sync/util.js",
SCORE_INCREMENT_MEDIUM: "resource://services-sync/constants.js",
MULTI_DEVICE_THRESHOLD: "resource://services-sync/constants.js",
});
+14 -10
View File
@@ -2,19 +2,23 @@
* 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/. */
const { Store, SyncEngine, LegacyTracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import {
Store,
SyncEngine,
LegacyTracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { SCORE_INCREMENT_MEDIUM } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
const { CollectionProblemData, CollectionValidator } = ChromeUtils.import(
"resource://services-sync/collection_validator.js"
);
import {
CollectionProblemData,
CollectionValidator,
} from "resource://services-sync/collection_validator.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Log } from "resource://gre/modules/Log.sys.mjs";
@@ -15,13 +15,13 @@ const {
SCORE_INCREMENT_SMALL,
SCORE_INCREMENT_XLARGE,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { Store, SyncEngine, LegacyTracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Utils } = ChromeUtils.import("resource://services-sync/util.js");
import {
Store,
SyncEngine,
LegacyTracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Utils } from "resource://services-sync/util.sys.mjs";
const lazy = {};
+13 -10
View File
@@ -2,19 +2,22 @@
* 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/. */
const { Collection, CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
import {
Collection,
CryptoWrapper,
} from "resource://services-sync/record.sys.mjs";
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
const { CollectionValidator } = ChromeUtils.import(
"resource://services-sync/collection_validator.js"
);
const { Store, SyncEngine, LegacyTracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { CollectionValidator } from "resource://services-sync/collection_validator.sys.mjs";
import {
Store,
SyncEngine,
LegacyTracker,
} from "resource://services-sync/engines.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const SYNCABLE_LOGIN_FIELDS = [
+8 -7
View File
@@ -28,13 +28,14 @@ const PREF_SYNC_SEEN_PREFIX = "services.sync.prefs.sync-seen.";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { Preferences } from "resource://gre/modules/Preferences.sys.mjs";
const { Store, SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import {
Store,
SyncEngine,
Tracker,
} from "resource://services-sync/engines.sys.mjs";
import { CryptoWrapper } from "resource://services-sync/record.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
+8 -11
View File
@@ -6,10 +6,9 @@ const STORAGE_VERSION = 1; // This needs to be kept in-sync with the rust storag
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { SyncEngine, Tracker } from "resource://services-sync/engines.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { SCORE_INCREMENT_SMALL, STATUS_OK, URI_LENGTH_MAX } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
@@ -18,13 +17,11 @@ const { CommonUtils } = ChromeUtils.import(
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { SyncRecord, SyncTelemetry } = ChromeUtils.import(
"resource://services-sync/telemetry.js"
);
const { BridgedEngine } = ChromeUtils.import(
"resource://services-sync/bridged_engine.js"
);
import {
SyncRecord,
SyncTelemetry,
} from "resource://services-sync/telemetry.sys.mjs";
import { BridgedEngine } from "resource://services-sync/bridged_engine.sys.mjs";
const FAR_FUTURE = 4102405200000; // 2100/01/01
+1 -1
View File
@@ -7,7 +7,7 @@ const { CommonUtils } = ChromeUtils.import(
);
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
import { Weave } from "resource://services-sync/main.sys.mjs";
/**
* Represents a pair of keys.
+11 -6
View File
@@ -4,13 +4,18 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
export var Weave = ChromeUtils.import("resource://services-sync/constants.js");
export const Weave = ChromeUtils.import(
"resource://services-sync/constants.js"
);
XPCOMUtils.defineLazyModuleGetters(Weave, {
Service: "resource://services-sync/service.js",
Status: "resource://services-sync/status.js",
Utils: "resource://services-sync/util.js",
Svc: "resource://services-sync/util.js",
// We want these to be lazily loaded, which helps performance and also tests
// to not have these loaded before they are ready.
// eslint-disable-next-line mozilla/lazy-getter-object-name
ChromeUtils.defineESModuleGetters(Weave, {
Service: "resource://services-sync/service.sys.mjs",
Status: "resource://services-sync/status.sys.mjs",
Svc: "resource://services-sync/util.sys.mjs",
Utils: "resource://services-sync/util.sys.mjs",
});
XPCOMUtils.defineLazyGetter(Weave, "Crypto", function() {
+5 -6
View File
@@ -34,7 +34,8 @@ const {
kSyncBackoffNotMet,
kSyncMasterPasswordLocked,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { logManager } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);
@@ -45,11 +46,9 @@ const { CommonUtils } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Status",
"resource://services-sync/status.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
Status: "resource://services-sync/status.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"AddonManager",
+5 -6
View File
@@ -11,12 +11,11 @@ const {
DEFAULT_DOWNLOAD_BATCH_SIZE,
DEFAULT_KEYBUNDLE_NAME,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { BulkKeyBundle } = ChromeUtils.import(
"resource://services-sync/keys.js"
);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Resource } = ChromeUtils.import("resource://services-sync/resource.js");
const { Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { BulkKeyBundle } from "resource://services-sync/keys.sys.mjs";
import { Weave } from "resource://services-sync/main.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import { Utils } from "resource://services-sync/util.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
+1 -1
View File
@@ -12,7 +12,7 @@ const { Observers } = ChromeUtils.import(
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
const { Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { Utils } from "resource://services-sync/util.sys.mjs";
import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";
/* global AbortController */
+17 -22
View File
@@ -41,32 +41,27 @@ const {
kSyncNotConfigured,
kSyncWeaveDisabled,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { EngineManager } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
const { ClientEngine } = ChromeUtils.import(
"resource://services-sync/engines/clients.js"
);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { ErrorHandler, SyncScheduler } = ChromeUtils.import(
"resource://services-sync/policies.js"
);
const {
import { EngineManager } from "resource://services-sync/engines.sys.mjs";
import { ClientEngine } from "resource://services-sync/engines/clients.sys.mjs";
import { Weave } from "resource://services-sync/main.sys.mjs";
import {
ErrorHandler,
SyncScheduler,
} from "resource://services-sync/policies.sys.mjs";
import {
CollectionKeyManager,
CryptoWrapper,
RecordManager,
WBORecord,
} = ChromeUtils.import("resource://services-sync/record.js");
const { Resource } = ChromeUtils.import("resource://services-sync/resource.js");
const { EngineSynchronizer } = ChromeUtils.import(
"resource://services-sync/stages/enginesync.js"
);
const { DeclinedEngines } = ChromeUtils.import(
"resource://services-sync/stages/declined.js"
);
const { Status } = ChromeUtils.import("resource://services-sync/status.js");
ChromeUtils.import("resource://services-sync/telemetry.js");
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
} from "resource://services-sync/record.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import { EngineSynchronizer } from "resource://services-sync/stages/enginesync.sys.mjs";
import { DeclinedEngines } from "resource://services-sync/stages/declined.sys.mjs";
import { Status } from "resource://services-sync/status.sys.mjs";
ChromeUtils.importESModule("resource://services-sync/telemetry.sys.mjs");
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { getFxAccountsSingleton } = ChromeUtils.import(
"resource://gre/modules/FxAccounts.jsm"
);
@@ -18,14 +18,13 @@ const {
WEAVE_VERSION,
kSyncNetworkOffline,
} = ChromeUtils.import("resource://services-sync/constants.js");
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Doctor",
"resource://services-sync/doctor.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
Doctor: "resource://services-sync/doctor.sys.mjs",
});
/**
* Perform synchronization of engines.
+1 -3
View File
@@ -16,9 +16,7 @@ const {
} = ChromeUtils.import("resource://services-sync/constants.js");
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { SyncAuthManager } = ChromeUtils.import(
"resource://services-sync/sync_auth.js"
);
import { SyncAuthManager } from "resource://services-sync/sync_auth.sys.mjs";
export var Status = {
_log: Log.repository.getLogger("Sync.Status"),
+6 -12
View File
@@ -12,7 +12,8 @@ const { TokenServerClient } = ChromeUtils.import(
const { CryptoUtils } = ChromeUtils.import(
"resource://services-crypto/utils.js"
);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const {
LOGIN_FAILED_LOGIN_REJECTED,
LOGIN_FAILED_NETWORK_ERROR,
@@ -25,17 +26,10 @@ const {
const lazy = {};
// Lazy imports to prevent unnecessary load on startup.
ChromeUtils.defineModuleGetter(
lazy,
"Weave",
"resource://services-sync/main.js"
);
ChromeUtils.defineModuleGetter(
lazy,
"BulkKeyBundle",
"resource://services-sync/keys.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
BulkKeyBundle: "resource://services-sync/keys.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
return ChromeUtils.import(
+5 -5
View File
@@ -19,21 +19,21 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AuthenticationError: "resource://services-sync/sync_auth.sys.mjs",
Resource: "resource://services-sync/resource.sys.mjs",
Status: "resource://services-sync/status.sys.mjs",
Svc: "resource://services-sync/util.sys.mjs",
TelemetryController: "resource://gre/modules/TelemetryController.sys.mjs",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
TelemetryUtils: "resource://gre/modules/TelemetryUtils.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Async: "resource://services-common/async.js",
AuthenticationError: "resource://services-sync/sync_auth.js",
FxAccounts: "resource://gre/modules/FxAccounts.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
Observers: "resource://services-common/observers.js",
Resource: "resource://services-sync/resource.js",
Status: "resource://services-sync/status.js",
Svc: "resource://services-sync/util.js",
Weave: "resource://services-sync/main.js",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
@@ -17,7 +17,7 @@ var {
SyncEngine,
Tracker,
LegacyTracker,
} = ChromeUtils.import("resource://services-sync/engines.js");
} = ChromeUtils.importESModule("resource://services-sync/engines.sys.mjs");
var {
ABORT_SYNC_COMMAND,
CLIENT_NOT_CONFIGURED,
@@ -83,8 +83,8 @@ var {
kSyncNotConfigured,
kSyncWeaveDisabled,
} = ChromeUtils.import("resource://services-sync/constants.js");
var { BulkKeyBundle, SyncKeyBundle } = ChromeUtils.import(
"resource://services-sync/keys.js"
var { BulkKeyBundle, SyncKeyBundle } = ChromeUtils.importESModule(
"resource://services-sync/keys.sys.mjs"
);
// Common code for test_errorhandler_{1,2}.js -- pulled out to make it less
+18 -11
View File
@@ -19,9 +19,12 @@ var { PlacesTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PlacesTestUtils.sys.mjs"
);
var { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
var { SerializableSet, Svc, Utils, getChromeWindow } = ChromeUtils.import(
"resource://services-sync/util.js"
);
var {
SerializableSet,
Svc,
Utils,
getChromeWindow,
} = ChromeUtils.importESModule("resource://services-sync/util.sys.mjs");
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
@@ -49,7 +52,9 @@ var {
sumHistogram,
syncTestLogging,
waitForZeroTimer,
} = ChromeUtils.import("resource://testing-common/services/sync/utils.js");
} = ChromeUtils.importESModule(
"resource://testing-common/services/sync/utils.sys.mjs"
);
ChromeUtils.defineModuleGetter(
this,
"AddonManager",
@@ -259,8 +264,8 @@ function mockGetWindowEnumerator(urls) {
// Helper function to get the sync telemetry and add the typically used test
// engine names to its list of allowed engines.
function get_sync_test_telemetry() {
let { SyncTelemetry } = ChromeUtils.import(
"resource://services-sync/telemetry.js"
let { SyncTelemetry } = ChromeUtils.importESModule(
"resource://services-sync/telemetry.sys.mjs"
);
SyncTelemetry.tryRefreshDevices = function() {};
let testEngines = ["rotary", "steam", "sterling", "catapult", "nineties"];
@@ -430,7 +435,9 @@ async function sync_engine_and_validate_telem(
let caughtError = null;
// Clear out status, so failures from previous syncs won't show up in the
// telemetry ping.
let { Status } = ChromeUtils.import("resource://services-sync/status.js");
let { Status } = ChromeUtils.importESModule(
"resource://services-sync/status.sys.mjs"
);
Status._engines = {};
Status.partial = false;
// Ideally we'd clear these out like we do with engines, (probably via
@@ -533,8 +540,8 @@ function promiseOneObserver(topic, callback) {
}
async function registerRotaryEngine() {
let { RotaryEngine } = ChromeUtils.import(
"resource://testing-common/services/sync/rotaryengine.js"
let { RotaryEngine } = ChromeUtils.importESModule(
"resource://testing-common/services/sync/rotaryengine.sys.mjs"
);
await Service.engineManager.clear();
@@ -680,8 +687,8 @@ async function assertBookmarksTreeMatches(rootGuid, expected, message) {
}
function add_bookmark_test(task) {
const { BookmarksEngine } = ChromeUtils.import(
"resource://services-sync/engines/bookmarks.js"
const { BookmarksEngine } = ChromeUtils.importESModule(
"resource://services-sync/engines/bookmarks.sys.mjs"
);
add_task(async function() {
+3 -1
View File
@@ -25,7 +25,9 @@ var {
sumHistogram,
syncTestLogging,
waitForZeroTimer,
} = ChromeUtils.import("resource://testing-common/services/sync/utils.js");
} = ChromeUtils.importESModule(
"resource://testing-common/services/sync/utils.sys.mjs"
);
const SYNC_HTTP_LOGGER = "Sync.Test.Server";
+5 -3
View File
@@ -1,9 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { RotaryEngine } = ChromeUtils.import(
"resource://testing-common/services/sync/rotaryengine.js"
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { RotaryEngine } = ChromeUtils.importESModule(
"resource://testing-common/services/sync/rotaryengine.sys.mjs"
);
add_task(async function test_412_not_treated_as_failure() {
+2 -2
View File
@@ -6,8 +6,8 @@
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
const { AddonUtils } = ChromeUtils.import(
"resource://services-sync/addonutils.js"
const { AddonUtils } = ChromeUtils.importESModule(
"resource://services-sync/addonutils.sys.mjs"
);
const HTTP_PORT = 8888;
@@ -6,13 +6,15 @@
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
const { CHANGE_INSTALLED } = ChromeUtils.import(
"resource://services-sync/addonsreconciler.js"
const { CHANGE_INSTALLED } = ChromeUtils.importESModule(
"resource://services-sync/addonsreconciler.sys.mjs"
);
const { AddonsEngine } = ChromeUtils.import(
"resource://services-sync/engines/addons.js"
const { AddonsEngine } = ChromeUtils.importESModule(
"resource://services-sync/engines/addons.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
@@ -7,11 +7,15 @@ const {
AddonsReconciler,
CHANGE_INSTALLED,
CHANGE_UNINSTALLED,
} = ChromeUtils.import("resource://services-sync/addonsreconciler.js");
const { AddonsEngine } = ChromeUtils.import(
"resource://services-sync/engines/addons.js"
} = ChromeUtils.importESModule(
"resource://services-sync/addonsreconciler.sys.mjs"
);
const { AddonsEngine } = ChromeUtils.importESModule(
"resource://services-sync/engines/addons.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
AddonTestUtils.init(this);
AddonTestUtils.createAppInfo(
@@ -6,10 +6,12 @@
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);
const { AddonsEngine } = ChromeUtils.import(
"resource://services-sync/engines/addons.js"
const { AddonsEngine } = ChromeUtils.importESModule(
"resource://services-sync/engines/addons.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
@@ -3,10 +3,12 @@
"use strict";
const { AddonsEngine } = ChromeUtils.import(
"resource://services-sync/engines/addons.js"
const { AddonsEngine } = ChromeUtils.importESModule(
"resource://services-sync/engines/addons.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
AddonTestUtils.init(this);
AddonTestUtils.createAppInfo(
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { AddonValidator } = ChromeUtils.import(
"resource://services-sync/engines/addons.js"
const { AddonValidator } = ChromeUtils.importESModule(
"resource://services-sync/engines/addons.sys.mjs"
);
function getDummyServerAndClient() {
@@ -4,7 +4,9 @@
_("Making sure a failing sync reports a useful error");
// `Service` is used as a global in head_helpers.js.
// eslint-disable-next-line no-unused-vars
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
add_bookmark_test(async function run_test(engine) {
await engine.initialize();
@@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
// A stored reference to the collection won't be valid after disabling.
function getBookmarkWBO(server, guid) {
@@ -12,8 +12,12 @@ const {
BookmarkFolder,
BookmarksEngine,
Livemark,
} = ChromeUtils.import("resource://services-sync/engines/bookmarks.js");
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
} = ChromeUtils.importESModule(
"resource://services-sync/engines/bookmarks.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
var recordedEvents = [];
@@ -4,11 +4,15 @@
_(
"Making sure after processing incoming bookmarks, they show up in the right order"
);
const { Bookmark, BookmarkFolder } = ChromeUtils.import(
"resource://services-sync/engines/bookmarks.js"
const { Bookmark, BookmarkFolder } = ChromeUtils.importESModule(
"resource://services-sync/engines/bookmarks.sys.mjs"
);
const { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
async function serverForFoo(engine) {
await generateNewKeys(Service.collectionKeys);
@@ -2,12 +2,14 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
_("Rewrite place: URIs.");
const { BookmarkQuery, BookmarkFolder } = ChromeUtils.import(
"resource://services-sync/engines/bookmarks.js"
const { BookmarkQuery, BookmarkFolder } = ChromeUtils.importESModule(
"resource://services-sync/engines/bookmarks.sys.mjs"
);
// `Service` is used as a global in head_helpers.js.
// eslint-disable-next-line no-unused-vars
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
function makeTagRecord(id, uri) {
let tagRecord = new BookmarkQuery("bookmarks", id);
@@ -1,10 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Bookmark, BookmarkQuery, PlacesItem } = ChromeUtils.import(
"resource://services-sync/engines/bookmarks.js"
const { Bookmark, BookmarkQuery, PlacesItem } = ChromeUtils.importESModule(
"resource://services-sync/engines/bookmarks.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
function prepareBookmarkItem(collection, id) {
let b = new Bookmark(collection, id);
@@ -6,10 +6,14 @@ const {
BookmarkFolder,
BookmarkQuery,
PlacesItem,
} = ChromeUtils.import("resource://services-sync/engines/bookmarks.js");
} = ChromeUtils.importESModule(
"resource://services-sync/engines/bookmarks.sys.mjs"
);
// `Service` is used as a global in head_helpers.js.
// eslint-disable-next-line no-unused-vars
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const BookmarksToolbarTitle = "toolbar";
@@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { PlacesTransactions } = ChromeUtils.importESModule(
"resource://gre/modules/PlacesTransactions.sys.mjs"
);
@@ -1,10 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { BridgedEngine, BridgeWrapperXPCOM } = ChromeUtils.import(
"resource://services-sync/bridged_engine.js"
const { BridgedEngine, BridgeWrapperXPCOM } = ChromeUtils.importESModule(
"resource://services-sync/bridged_engine.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
// Wraps an `object` in a proxy so that its methods are bound to it. This
// simulates how XPCOM class instances have all their methods bound.
@@ -1,13 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { ClientEngine, ClientsRec } = ChromeUtils.import(
"resource://services-sync/engines/clients.js"
const { ClientEngine, ClientsRec } = ChromeUtils.importESModule(
"resource://services-sync/engines/clients.sys.mjs"
);
const { CryptoWrapper } = ChromeUtils.import(
"resource://services-sync/record.js"
const { CryptoWrapper } = ChromeUtils.importESModule(
"resource://services-sync/record.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const MORE_THAN_CLIENTS_TTL_REFRESH = 691200; // 8 days
const LESS_THAN_CLIENTS_TTL_REFRESH = 86400; // 1 day
@@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
add_task(async function test_clients_escape() {
_("Set up test fixtures.");
@@ -1,10 +1,12 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { Collection, WBORecord } = ChromeUtils.import(
"resource://services-sync/record.js"
const { Collection, WBORecord } = ChromeUtils.importESModule(
"resource://services-sync/record.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
function recordRange(lim, offset, total) {
let res = [];
@@ -2,7 +2,9 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
// Verify that we wipe the server if we have to regenerate keys.
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
add_task(async function test_missing_crypto_collection() {
enableValidationPrefs();
+10 -6
View File
@@ -1,14 +1,18 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { HistoryEngine } = ChromeUtils.import(
"resource://services-sync/engines/history.js"
const { Weave } = ChromeUtils.importESModule(
"resource://services-sync/main.sys.mjs"
);
const { CryptoWrapper, WBORecord } = ChromeUtils.import(
"resource://services-sync/record.js"
const { HistoryEngine } = ChromeUtils.importESModule(
"resource://services-sync/engines/history.sys.mjs"
);
const { CryptoWrapper, WBORecord } = ChromeUtils.importESModule(
"resource://services-sync/record.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
add_task(async function test_locally_changed_keys() {
enableValidationPrefs();
+7 -5
View File
@@ -1,13 +1,15 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const { DeclinedEngines } = ChromeUtils.import(
"resource://services-sync/stages/declined.js"
const { DeclinedEngines } = ChromeUtils.importESModule(
"resource://services-sync/stages/declined.sys.mjs"
);
const { EngineSynchronizer } = ChromeUtils.import(
"resource://services-sync/stages/enginesync.js"
const { EngineSynchronizer } = ChromeUtils.importESModule(
"resource://services-sync/stages/enginesync.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
@@ -3,8 +3,8 @@
"use strict";
const { SyncDisconnect, SyncDisconnectInternal } = ChromeUtils.import(
"resource://services-sync/SyncDisconnect.jsm"
const { SyncDisconnect, SyncDisconnectInternal } = ChromeUtils.importESModule(
"resource://services-sync/SyncDisconnect.sys.mjs"
);
const { AsyncShutdown } = ChromeUtils.importESModule(
"resource://gre/modules/AsyncShutdown.sys.mjs"
Loaded 100 of 183 files, more files were not shown because too many files have changed in this diff. Show more