From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 devtools/shared/transport/packets.js                                  | 2 +-
 devtools/shared/transport/tests/xpcshell/test_bulk_error.js           | 2 +-
 devtools/shared/transport/tests/xpcshell/test_dbgsocket.js            | 4 ++--
 .../shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js | 4 ++--
 devtools/shared/transport/tests/xpcshell/test_queue.js                | 2 +-
 devtools/shared/transport/tests/xpcshell/test_transport_bulk.js       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'devtools/shared/transport')

diff --git a/devtools/shared/transport/packets.js b/devtools/shared/transport/packets.js
index 9f9409a123..e4b8569756 100644
--- a/devtools/shared/transport/packets.js
+++ b/devtools/shared/transport/packets.js
@@ -420,7 +420,7 @@ function RawPacket(transport, data) {
 
 RawPacket.prototype = Object.create(Packet.prototype);
 
-RawPacket.prototype.read = function (stream) {
+RawPacket.prototype.read = function () {
   // This hasn't yet been needed for testing.
   throw Error("Not implmented.");
 };
diff --git a/devtools/shared/transport/tests/xpcshell/test_bulk_error.js b/devtools/shared/transport/tests/xpcshell/test_bulk_error.js
index 52cc826e51..c06f2dc494 100644
--- a/devtools/shared/transport/tests/xpcshell/test_bulk_error.js
+++ b/devtools/shared/transport/tests/xpcshell/test_bulk_error.js
@@ -28,7 +28,7 @@ class TestBulkActor extends Actor {
     };
   }
 
-  jsonReply({ length, reader, reply, done }) {
+  jsonReply({ length }) {
     Assert.equal(length, really_long().length);
 
     return {
diff --git a/devtools/shared/transport/tests/xpcshell/test_dbgsocket.js b/devtools/shared/transport/tests/xpcshell/test_dbgsocket.js
index 535431aa38..c210a80d84 100644
--- a/devtools/shared/transport/tests/xpcshell/test_dbgsocket.js
+++ b/devtools/shared/transport/tests/xpcshell/test_dbgsocket.js
@@ -103,7 +103,7 @@ async function test_socket_conn() {
         });
         Assert.equal(packet.from, "root");
       },
-      onTransportClosed(status) {
+      onTransportClosed() {
         resolve();
       },
     };
@@ -154,7 +154,7 @@ function test_pipe_conn() {
       Assert.equal(packet.from, "root");
       transport.close();
     },
-    onTransportClosed(status) {
+    onTransportClosed() {
       run_next_test();
     },
   };
diff --git a/devtools/shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js b/devtools/shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js
index e08c2380fb..1e847f8012 100644
--- a/devtools/shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js
+++ b/devtools/shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js
@@ -66,7 +66,7 @@ var test_helper = async function (payload) {
   });
   return new Promise(resolve => {
     transport.hooks = {
-      onPacket(packet) {
+      onPacket() {
         this.onPacket = function () {
           do_throw(new Error("This connection should be dropped."));
           transport.close();
@@ -76,7 +76,7 @@ var test_helper = async function (payload) {
         transport._outgoing.push(new RawPacket(transport, payload));
         transport._flushOutgoing();
       },
-      onTransportClosed(status) {
+      onTransportClosed() {
         Assert.ok(true);
         resolve();
       },
diff --git a/devtools/shared/transport/tests/xpcshell/test_queue.js b/devtools/shared/transport/tests/xpcshell/test_queue.js
index 603640e34d..69f109fdac 100644
--- a/devtools/shared/transport/tests/xpcshell/test_queue.js
+++ b/devtools/shared/transport/tests/xpcshell/test_queue.js
@@ -53,7 +53,7 @@ var test_transport = async function (transportFactory) {
         uri: NetUtil.newURI(getTestTempFile("bulk-input")),
         loadUsingSystemPrincipal: true,
       },
-      function (input, status) {
+      function (input) {
         copyFrom(input).then(() => {
           input.close();
         });
diff --git a/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js b/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js
index 137cbd2679..736c6acd7d 100644
--- a/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js
+++ b/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js
@@ -53,7 +53,7 @@ var test_bulk_transfer_transport = async function (transportFactory) {
         uri: NetUtil.newURI(getTestTempFile("bulk-input")),
         loadUsingSystemPrincipal: true,
       },
-      function (input, status) {
+      function (input) {
         copyFrom(input).then(() => {
           input.close();
         });
-- 
cgit v1.2.3