From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 services/sync/modules/engines/bookmarks.sys.mjs         | 8 ++++----
 services/sync/modules/engines/clients.sys.mjs           | 2 +-
 services/sync/modules/engines/extension-storage.sys.mjs | 4 ++--
 services/sync/modules/engines/forms.sys.mjs             | 2 +-
 services/sync/modules/engines/prefs.sys.mjs             | 6 +++---
 services/sync/modules/engines/tabs.sys.mjs              | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'services/sync/modules/engines')

diff --git a/services/sync/modules/engines/bookmarks.sys.mjs b/services/sync/modules/engines/bookmarks.sys.mjs
index 3c1396f67d..4995da6899 100644
--- a/services/sync/modules/engines/bookmarks.sys.mjs
+++ b/services/sync/modules/engines/bookmarks.sys.mjs
@@ -513,7 +513,7 @@ BookmarksEngine.prototype = {
     await this._apply();
   },
 
-  async _reconcile(item) {
+  async _reconcile() {
     return true;
   },
 
@@ -752,7 +752,7 @@ BookmarksStore.prototype = {
     });
   },
 
-  async applyIncomingBatch(records, countTelemetry) {
+  async applyIncomingBatch(records) {
     let buf = await this.ensureOpenMirror();
     for (let chunk of lazy.PlacesUtils.chunkArray(
       records,
@@ -921,11 +921,11 @@ Object.setPrototypeOf(BookmarksTracker.prototype, Tracker.prototype);
 class BookmarksChangeset extends Changeset {
   // Only `_reconcile` calls `getModifiedTimestamp` and `has`, and the engine
   // does its own reconciliation.
-  getModifiedTimestamp(id) {
+  getModifiedTimestamp() {
     throw new Error("Don't use timestamps to resolve bookmark conflicts");
   }
 
-  has(id) {
+  has() {
     throw new Error("Don't use the changeset to resolve bookmark conflicts");
   }
 
diff --git a/services/sync/modules/engines/clients.sys.mjs b/services/sync/modules/engines/clients.sys.mjs
index eda92bd75b..cb391982e0 100644
--- a/services/sync/modules/engines/clients.sys.mjs
+++ b/services/sync/modules/engines/clients.sys.mjs
@@ -1107,7 +1107,7 @@ ClientsTracker.prototype = {
     Svc.Obs.remove("fxaccounts:new_device_id", this.asyncObserver);
   },
 
-  async observe(subject, topic, data) {
+  async observe(subject, topic) {
     switch (topic) {
       case "nsPref:changed":
         this._log.debug("client.name preference changed");
diff --git a/services/sync/modules/engines/extension-storage.sys.mjs b/services/sync/modules/engines/extension-storage.sys.mjs
index d2671978c8..693d94f647 100644
--- a/services/sync/modules/engines/extension-storage.sys.mjs
+++ b/services/sync/modules/engines/extension-storage.sys.mjs
@@ -124,7 +124,7 @@ ExtensionStorageEngineBridge.prototype = {
   },
 
   _takeMigrationInfo() {
-    return new Promise((resolve, reject) => {
+    return new Promise(resolve => {
       this.component
         .QueryInterface(Ci.mozIExtensionStorageArea)
         .takeMigrationInfo({
@@ -291,7 +291,7 @@ ExtensionStorageTracker.prototype = {
     lazy.Svc.Obs.remove("ext.storage.sync-changed", this.asyncObserver);
   },
 
-  async observe(subject, topic, data) {
+  async observe(subject, topic) {
     if (this.ignoreAll) {
       return;
     }
diff --git a/services/sync/modules/engines/forms.sys.mjs b/services/sync/modules/engines/forms.sys.mjs
index 3516327659..0d63eb96d1 100644
--- a/services/sync/modules/engines/forms.sys.mjs
+++ b/services/sync/modules/engines/forms.sys.mjs
@@ -189,7 +189,7 @@ FormStore.prototype = {
     await this._processChange(change);
   },
 
-  async update(record) {
+  async update() {
     this._log.trace("Ignoring form record update request!");
   },
 
diff --git a/services/sync/modules/engines/prefs.sys.mjs b/services/sync/modules/engines/prefs.sys.mjs
index f29a9e7b59..cb494ec70e 100644
--- a/services/sync/modules/engines/prefs.sys.mjs
+++ b/services/sync/modules/engines/prefs.sys.mjs
@@ -386,7 +386,7 @@ PrefStore.prototype = {
     return allprefs;
   },
 
-  async changeItemID(oldID, newID) {
+  async changeItemID() {
     this._log.trace("PrefStore GUID is constant!");
   },
 
@@ -406,11 +406,11 @@ PrefStore.prototype = {
     return record;
   },
 
-  async create(record) {
+  async create() {
     this._log.trace("Ignoring create request");
   },
 
-  async remove(record) {
+  async remove() {
     this._log.trace("Ignoring remove request");
   },
 
diff --git a/services/sync/modules/engines/tabs.sys.mjs b/services/sync/modules/engines/tabs.sys.mjs
index 861e051d1a..93747665f2 100644
--- a/services/sync/modules/engines/tabs.sys.mjs
+++ b/services/sync/modules/engines/tabs.sys.mjs
@@ -430,7 +430,7 @@ export const TabProvider = {
         .then(iconData => {
           thisTab.icon = iconData.uri.spec;
         })
-        .catch(ex => {
+        .catch(() => {
           log.trace(
             `Failed to fetch favicon for ${url}`,
             thisTab.urlHistory[0]
@@ -503,7 +503,7 @@ TabTracker.prototype = {
     }
   },
 
-  async observe(subject, topic, data) {
+  async observe(subject, topic) {
     switch (topic) {
       case "domwindowopened":
         let onLoad = () => {
-- 
cgit v1.2.3