Merging upstream version 125.0.1.

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

2 files changed, 8 insertions, 5 deletions

diff --git a/remote/marionette/test/xpcshell/test_cookie.js b/remote/marionette/test/xpcshell/test_cookie.js
index b5ce5e9008..496aafd68b 100644
--- a/remote/marionette/test/xpcshell/test_cookie.js
+++ b/remote/marionette/test/xpcshell/test_cookie.js
@@ -239,7 +239,10 @@ add_task(function test_add() {
   equal("value", cookie.manager.cookies[0].value);
   equal(".domain", cookie.manager.cookies[0].host);
   equal("/", cookie.manager.cookies[0].path);
-  ok(cookie.manager.cookies[0].expiry > new Date(Date.now()).getTime() / 1000);
+  Assert.greater(
+    cookie.manager.cookies[0].expiry,
+    new Date(Date.now()).getTime() / 1000
+  );
 
   cookie.add({
     name: "name2",
diff --git a/remote/marionette/test/xpcshell/test_sync.js b/remote/marionette/test/xpcshell/test_sync.js
index 87ec44e960..19969f4473 100644
--- a/remote/marionette/test/xpcshell/test_sync.js
+++ b/remote/marionette/test/xpcshell/test_sync.js
@@ -28,7 +28,7 @@ class MessageManager {
     this.message = message;
   }
 
-  removeMessageListener(message) {
+  removeMessageListener() {
     this.func = null;
     this.message = null;
   }
@@ -55,7 +55,7 @@ class MockTimer {
     this.cancelled = false;
   }
 
-  initWithCallback(cb, timeout, type) {
+  initWithCallback(cb) {
     this.ticks++;
     if (this.ticks >= this.goal) {
       cb();
@@ -216,7 +216,7 @@ add_task(function test_TimedPromise_timeoutTypes() {
 
 add_task(async function test_TimedPromise_errorMessage() {
   try {
-    await new TimedPromise(resolve => {}, { timeout: 0 });
+    await new TimedPromise(() => {}, { timeout: 0 });
     ok(false, "Expected Timeout error not raised");
   } catch (e) {
     ok(
@@ -226,7 +226,7 @@ add_task(async function test_TimedPromise_errorMessage() {
   }
 
   try {
-    await new TimedPromise(resolve => {}, {
+    await new TimedPromise(() => {}, {
       errorMessage: "Not found",
       timeout: 0,
     });