Merging upstream version 125.0.1.

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

3 files changed, 7 insertions, 7 deletions

diff --git a/services/common/tests/unit/head_helpers.js b/services/common/tests/unit/head_helpers.js
index bd994ee71a..6b831eef01 100644
--- a/services/common/tests/unit/head_helpers.js
+++ b/services/common/tests/unit/head_helpers.js
@@ -91,7 +91,7 @@ function do_check_throws_message(aFunc, aResult) {
  * @usage _("Hello World") -> prints "Hello World"
  * @usage _(1, 2, 3) -> prints "1 2 3"
  */
-var _ = function (some, debug, text, to) {
+var _ = function () {
   print(Array.from(arguments).join(" "));
 };
 
@@ -192,7 +192,7 @@ var PACSystemSettings = {
   // each test gets a completely fresh setup.
   mainThreadOnly: true,
   PACURI: null,
-  getProxyForURI: function getProxyForURI(aURI) {
+  getProxyForURI: function getProxyForURI() {
     throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
   },
 };
@@ -221,7 +221,7 @@ function getUptakeTelemetrySnapshot(component, source) {
   return (
     parentEvents
       // Transform raw event data to objects.
-      .map(([i, category, method, object, value, extras]) => {
+      .map(([, category, method, object, value, extras]) => {
         return { category, method, object, value, extras };
       })
       // Keep only for the specified component and source.
diff --git a/services/common/tests/unit/test_kinto.js b/services/common/tests/unit/test_kinto.js
index 4b5e8471b1..154976d701 100644
--- a/services/common/tests/unit/test_kinto.js
+++ b/services/common/tests/unit/test_kinto.js
@@ -1,8 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const { Kinto } = ChromeUtils.import(
-  "resource://services-common/kinto-offline-client.js"
+const { Kinto } = ChromeUtils.importESModule(
+  "resource://services-common/kinto-offline-client.sys.mjs"
 );
 const { FirefoxAdapter } = ChromeUtils.importESModule(
   "resource://services-common/kinto-storage-adapter.sys.mjs"
diff --git a/services/common/tests/unit/test_utils_namedTimer.js b/services/common/tests/unit/test_utils_namedTimer.js
index 47ac0b9dc1..d7e6768da8 100644
--- a/services/common/tests/unit/test_utils_namedTimer.js
+++ b/services/common/tests/unit/test_utils_namedTimer.js
@@ -40,7 +40,7 @@ add_test(function test_delay() {
   const delay = 100;
   let that = {};
   let t0 = Date.now();
-  function callback(timer) {
+  function callback() {
     // Difference should be ~2*delay, but hard to predict on all platforms,
     // particularly Windows XP.
     Assert.ok(Date.now() - t0 > delay);
@@ -57,7 +57,7 @@ add_test(function test_clear() {
   const delay = 0;
   let that = {};
   CommonUtils.namedTimer(
-    function callback(timer) {
+    function callback() {
       do_throw("Shouldn't fire!");
     },
     delay,