Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/toolkit/components/extensions/ExtensionStorageSyncKinto.sys.mjs b/toolkit/components/extensions/ExtensionStorageSyncKinto.sys.mjs
index d10b140f7e..ace6e16c2c 100644
--- a/toolkit/components/extensions/ExtensionStorageSyncKinto.sys.mjs
+++ b/toolkit/components/extensions/ExtensionStorageSyncKinto.sys.mjs
@@ -42,6 +42,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   CryptoUtils: "resource://services-crypto/utils.sys.mjs",
   ExtensionCommon: "resource://gre/modules/ExtensionCommon.sys.mjs",
   FirefoxAdapter: "resource://services-common/kinto-storage-adapter.sys.mjs",
+  Kinto: "resource://services-common/kinto-offline-client.sys.mjs",
   KintoHttpClient: "resource://services-common/kinto-http-client.sys.mjs",
   Observers: "resource://services-common/observers.sys.mjs",
   Utils: "resource://services-sync/util.sys.mjs",
@@ -54,9 +55,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
  * @typedef {any} KeyBundle
  * @typedef {any} SyncResultObject
  */
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  Kinto: "resource://services-common/kinto-offline-client.js",
-});
 
 ChromeUtils.defineLazyGetter(lazy, "fxAccounts", () => {
   return ChromeUtils.importESModule(
@@ -434,7 +432,7 @@ const cryptoCollectionIdSchema = {
     throw new Error("cannot generate IDs for system collection");
   },
 
-  validate(id) {
+  validate() {
     return true;
   },
 };