Merging upstream version 125.0.1.

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

4 files changed, 6 insertions, 12 deletions

diff --git a/remote/cdp/domains/Domain.sys.mjs b/remote/cdp/domains/Domain.sys.mjs
index d9b36c62b8..d753c35863 100644
--- a/remote/cdp/domains/Domain.sys.mjs
+++ b/remote/cdp/domains/Domain.sys.mjs
@@ -29,8 +29,8 @@ export class Domain {
 
   /**
    * Execute the provided method in the child domain that has the same domain
-   * name. eg. calling this.executeInChild from domains/parent/Input.jsm will
-   * attempt to execute the method in domains/content/Input.jsm.
+   * name. eg. calling this.executeInChild from domains/parent/Input.sys.mjs will
+   * attempt to execute the method in domains/content/Input.sys.mjs.
    *
    * This can only be called from parent domains managed by a TabSession.
    *
diff --git a/remote/cdp/domains/content/Runtime.sys.mjs b/remote/cdp/domains/content/Runtime.sys.mjs
index 35e0f16710..44c36914d4 100644
--- a/remote/cdp/domains/content/Runtime.sys.mjs
+++ b/remote/cdp/domains/content/Runtime.sys.mjs
@@ -613,7 +613,7 @@ export class Runtime extends ContentProcessDomain {
    * @param {nsIConsoleMessage} subject
    *     Console message.
    */
-  observe(subject, topic, data) {
+  observe(subject) {
     if (subject instanceof Ci.nsIScriptError && subject.hasException) {
       let entry = fromScriptError(subject);
       this._emitExceptionThrown(entry);
diff --git a/remote/cdp/domains/parent/Network.sys.mjs b/remote/cdp/domains/parent/Network.sys.mjs
index 4d36cf994e..18ce65e0c3 100644
--- a/remote/cdp/domains/parent/Network.sys.mjs
+++ b/remote/cdp/domains/parent/Network.sys.mjs
@@ -146,12 +146,10 @@ export class Network extends Domain {
    *
    * Depending on the backend support, will return detailed cookie information in the cookies field.
    *
-   * @param {object} options
-   *
    * @returns {Array<Cookie>}
    *     Array of cookie objects.
    */
-  async getAllCookies(options = {}) {
+  async getAllCookies() {
     const cookies = [];
     for (const cookie of Services.cookies.cookies) {
       cookies.push(_buildCookie(cookie));
diff --git a/remote/cdp/domains/parent/Page.sys.mjs b/remote/cdp/domains/parent/Page.sys.mjs
index d050277aff..420f99af39 100644
--- a/remote/cdp/domains/parent/Page.sys.mjs
+++ b/remote/cdp/domains/parent/Page.sys.mjs
@@ -672,12 +672,8 @@ export class Page extends Domain {
    * When file chooser interception is enabled,
    * the native file chooser dialog is not shown.
    * Instead, a protocol event Page.fileChooserOpened is emitted.
-   *
-   * @param {object} options
-   * @param {boolean=} options.enabled
-   *     Enabled state of file chooser interception.
    */
-  setInterceptFileChooserDialog(options = {}) {}
+  setInterceptFileChooserDialog() {}
 
   _getCurrentHistoryIndex() {
     const { window } = this.session.target;
@@ -719,7 +715,7 @@ export class Page extends Domain {
    */
   _onDialogLoaded(e, data) {
     const { message, type } = data;
-    // XXX: We rely on the common-dialog-loaded event (see DialogHandler.jsm)
+    // XXX: We rely on the common-dialog-loaded event (see DialogHandler.sys.mjs)
     // which is inconsistent with the name "javascriptDialogOpening".
     // For correctness we should rely on an event fired _before_ the prompt is
     // visible, such as DOMWillOpenModalDialog. However the payload of this