Merging upstream version 125.0.1.

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

3 files changed, 13 insertions, 7 deletions

diff --git a/remote/shared/test/browser/browser_UserContextManager.js b/remote/shared/test/browser/browser_UserContextManager.js
index 2060c2bacd..cfae75dbe2 100644
--- a/remote/shared/test/browser/browser_UserContextManager.js
+++ b/remote/shared/test/browser/browser_UserContextManager.js
@@ -159,8 +159,9 @@ add_task(async function test_several_managers() {
     "manager2 has a valid id for the user context created by manager 1"
   );
 
-  ok(
-    contextId1 != contextId2,
+  Assert.notEqual(
+    contextId1,
+    contextId2,
     "manager1 and manager2 have different ids for the same internal context id"
   );
 
diff --git a/remote/shared/test/xpcshell/test_RecommendedPreferences.js b/remote/shared/test/xpcshell/test_RecommendedPreferences.js
index 20de07a528..88dc717be8 100644
--- a/remote/shared/test/xpcshell/test_RecommendedPreferences.js
+++ b/remote/shared/test/xpcshell/test_RecommendedPreferences.js
@@ -76,6 +76,11 @@ add_task(async function test_disabled() {
 
 add_task(async function test_noCustomPreferences() {
   info("Applying preferences without any custom preference should not throw");
+
+  // First call invokes setting of default preferences
+  RecommendedPreferences.applyPreferences();
+
+  // Second call does nothing
   RecommendedPreferences.applyPreferences();
 
   cleanup();
diff --git a/remote/shared/test/xpcshell/test_Sync.js b/remote/shared/test/xpcshell/test_Sync.js
index de4a4d30fe..a85c47adc2 100644
--- a/remote/shared/test/xpcshell/test_Sync.js
+++ b/remote/shared/test/xpcshell/test_Sync.js
@@ -50,14 +50,14 @@ class MockElement {
     }
   }
 
-  dispatchEvent(event) {
+  dispatchEvent() {
     if (this.wantUntrusted) {
       this.untrusted = true;
     }
     this.click();
   }
 
-  removeEventListener(name, func) {
+  removeEventListener() {
     this.capture = false;
     this.eventName = null;
     this.func = null;
@@ -213,12 +213,12 @@ add_task(async function test_EventPromise_checkFnCallback() {
     { checkFn: null, expected_count: 0 },
     { checkFn: undefined, expected_count: 0 },
     {
-      checkFn: event => {
+      checkFn: () => {
         throw new Error("foo");
       },
       expected_count: 0,
     },
-    { checkFn: event => count++ > 0, expected_count: 2 },
+    { checkFn: () => count++ > 0, expected_count: 2 },
   ];
 
   for (const { checkFn, expected_count } of data) {
@@ -417,7 +417,7 @@ add_task(async function test_PollPromise_resolve() {
   const timeout = 100;
 
   await new PollPromise(
-    (resolve, reject) => {
+    resolve => {
       resolve();
     },
     { timeout, errorMessage }