Merging upstream version 125.0.1.

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

4 files changed, 5 insertions, 5 deletions

diff --git a/devtools/startup/AboutDebuggingRegistration.sys.mjs b/devtools/startup/AboutDebuggingRegistration.sys.mjs
index 8ae4f380b9..fcda1e8367 100644
--- a/devtools/startup/AboutDebuggingRegistration.sys.mjs
+++ b/devtools/startup/AboutDebuggingRegistration.sys.mjs
@@ -25,7 +25,7 @@ AboutDebugging.prototype = {
     return chan;
   },
 
-  getURIFlags(uri) {
+  getURIFlags() {
     return nsIAboutModule.ALLOW_SCRIPT | nsIAboutModule.IS_SECURE_CHROME_UI;
   },
 
diff --git a/devtools/startup/AboutDevToolsToolboxRegistration.sys.mjs b/devtools/startup/AboutDevToolsToolboxRegistration.sys.mjs
index f94b866bd2..44c78fd759 100644
--- a/devtools/startup/AboutDevToolsToolboxRegistration.sys.mjs
+++ b/devtools/startup/AboutDevToolsToolboxRegistration.sys.mjs
@@ -23,7 +23,7 @@ AboutDevtoolsToolbox.prototype = {
     return chan;
   },
 
-  getURIFlags(uri) {
+  getURIFlags() {
     return (
       nsIAboutModule.ALLOW_SCRIPT |
       nsIAboutModule.ENABLE_INDEXED_DB |
diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
index dd6be71337..e9e24af41e 100644
--- a/devtools/startup/DevToolsStartup.sys.mjs
+++ b/devtools/startup/DevToolsStartup.sys.mjs
@@ -1010,7 +1010,7 @@ DevToolsStartup.prototype = {
     let devtoolsThreadResumed = false;
     const pauseOnStartup = cmdLine.handleFlag("wait-for-jsdebugger", false);
     if (pauseOnStartup) {
-      const observe = function (subject, topic, data) {
+      const observe = function () {
         devtoolsThreadResumed = true;
         Services.obs.removeObserver(observe, "devtools-thread-ready");
       };
@@ -1399,7 +1399,7 @@ const JsonView = {
             Services.scriptSecurityManager.getSystemPrincipal()
           );
         },
-        onError(status) {
+        onError() {
           throw new Error("JSON Viewer's onSave failed in startPersistence");
         },
       });
diff --git a/devtools/startup/tests/browser/browser_shim_disable_devtools.js b/devtools/startup/tests/browser/browser_shim_disable_devtools.js
index 1a16902099..c3a4725a4b 100644
--- a/devtools/startup/tests/browser/browser_shim_disable_devtools.js
+++ b/devtools/startup/tests/browser/browser_shim_disable_devtools.js
@@ -140,7 +140,7 @@ add_task(async function () {
 
 function waitForDelayedStartupFinished(win) {
   return new Promise(resolve => {
-    Services.obs.addObserver(function observer(subject, topic) {
+    Services.obs.addObserver(function observer(subject) {
       if (win == subject) {
         Services.obs.removeObserver(
           observer,