Merging upstream version 125.0.1.

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

3 files changed, 26 insertions, 29 deletions

diff --git a/testing/modules/MockRegistry.sys.mjs b/testing/modules/MockRegistry.sys.mjs
index e9351e576d..b64d1ce2a8 100644
--- a/testing/modules/MockRegistry.sys.mjs
+++ b/testing/modules/MockRegistry.sys.mjs
@@ -34,7 +34,7 @@ export class MockRegistry {
       QueryInterface: ChromeUtils.generateQI(["nsIWindowsRegKey"]),
 
       // --- Overridden nsIWindowsRegKey interface functions ---
-      open(root, path, mode) {
+      open(root, path) {
         let rootKey = registry.getRoot(root);
         if (!rootKey.has(path)) {
           rootKey.set(path, new Map());
@@ -60,7 +60,7 @@ export class MockRegistry {
         return this.values.has(name);
       },
 
-      getValueType(name) {
+      getValueType() {
         return Ci.nsIWindowsRegKey.TYPE_STRING;
       },
 
diff --git a/testing/modules/TestUtils.sys.mjs b/testing/modules/TestUtils.sys.mjs
index 51030f5fbc..cbf6b2d439 100644
--- a/testing/modules/TestUtils.sys.mjs
+++ b/testing/modules/TestUtils.sys.mjs
@@ -207,33 +207,30 @@ export var TestUtils = {
    */
   waitForPrefChange(prefName, checkFn) {
     return new Promise((resolve, reject) => {
-      Services.prefs.addObserver(
-        prefName,
-        function observer(subject, topic, data) {
-          try {
-            let prefValue = null;
-            switch (Services.prefs.getPrefType(prefName)) {
-              case Services.prefs.PREF_STRING:
-                prefValue = Services.prefs.getStringPref(prefName);
-                break;
-              case Services.prefs.PREF_INT:
-                prefValue = Services.prefs.getIntPref(prefName);
-                break;
-              case Services.prefs.PREF_BOOL:
-                prefValue = Services.prefs.getBoolPref(prefName);
-                break;
-            }
-            if (checkFn && !checkFn(prefValue)) {
-              return;
-            }
-            Services.prefs.removeObserver(prefName, observer);
-            resolve(prefValue);
-          } catch (ex) {
-            Services.prefs.removeObserver(prefName, observer);
-            reject(ex);
+      Services.prefs.addObserver(prefName, function observer() {
+        try {
+          let prefValue = null;
+          switch (Services.prefs.getPrefType(prefName)) {
+            case Services.prefs.PREF_STRING:
+              prefValue = Services.prefs.getStringPref(prefName);
+              break;
+            case Services.prefs.PREF_INT:
+              prefValue = Services.prefs.getIntPref(prefName);
+              break;
+            case Services.prefs.PREF_BOOL:
+              prefValue = Services.prefs.getBoolPref(prefName);
+              break;
+          }
+          if (checkFn && !checkFn(prefValue)) {
+            return;
           }
+          Services.prefs.removeObserver(prefName, observer);
+          resolve(prefValue);
+        } catch (ex) {
+          Services.prefs.removeObserver(prefName, observer);
+          reject(ex);
         }
-      );
+      });
     });
   },
 
diff --git a/testing/modules/XPCShellContentUtils.sys.mjs b/testing/modules/XPCShellContentUtils.sys.mjs
index 21ac5dbae4..118c3fc5c7 100644
--- a/testing/modules/XPCShellContentUtils.sys.mjs
+++ b/testing/modules/XPCShellContentUtils.sys.mjs
@@ -68,7 +68,7 @@ function promiseBrowserLoaded(browser, url, redirectUrl) {
         "nsIWebProgressListener",
       ]),
 
-      onStateChange(webProgress, request, stateFlags, statusCode) {
+      onStateChange(webProgress, request, stateFlags) {
         request.QueryInterface(Ci.nsIChannel);
 
         let requestURI =
@@ -233,7 +233,7 @@ class ContentPage {
     this.browser.messageManager.loadFrameScript(frameScript, false, true);
   }
 
-  didChangeBrowserRemoteness(event) {
+  didChangeBrowserRemoteness() {
     // XXX: Tests can load their own additional frame scripts, so we may need to
     // track all scripts that have been loaded, and reload them here?
     this.loadFrameScript(frameScript);