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>
---
 netwerk/test/unit_ipc/child_veto_in_parent.js             | 2 +-
 netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js | 2 +-
 netwerk/test/unit_ipc/test_channel_id.js                  | 2 +-
 netwerk/test/unit_ipc/test_gio_protocol_wrap.js           | 2 +-
 netwerk/test/unit_ipc/test_httpcancel_wrap.js             | 2 +-
 netwerk/test/unit_ipc/xpcshell.toml                       | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'netwerk/test/unit_ipc')

diff --git a/netwerk/test/unit_ipc/child_veto_in_parent.js b/netwerk/test/unit_ipc/child_veto_in_parent.js
index 8f922a254e..f1bc0a4f50 100644
--- a/netwerk/test/unit_ipc/child_veto_in_parent.js
+++ b/netwerk/test/unit_ipc/child_veto_in_parent.js
@@ -18,7 +18,7 @@ ChromeUtils.defineLazyGetter(this, "randomURI", function () {
   return URL + randomPath;
 });
 
-function make_channel(url, callback, ctx) {
+function make_channel(url) {
   return NetUtil.newChannel({ uri: url, loadUsingSystemPrincipal: true });
 }
 
diff --git a/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js b/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
index 336b9e3129..07c3e8398a 100644
--- a/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
+++ b/netwerk/test/unit_ipc/test_alt-data_cross_process_wrap.js
@@ -41,7 +41,7 @@ function load_channel(channelUrl) {
   chan.asyncOpen(new ChannelListener(readTextData, null));
 }
 
-function make_channel(channelUrl, callback, ctx) {
+function make_channel(channelUrl) {
   return NetUtil.newChannel({
     uri: channelUrl,
     loadUsingSystemPrincipal: true,
diff --git a/netwerk/test/unit_ipc/test_channel_id.js b/netwerk/test/unit_ipc/test_channel_id.js
index fc37651249..1031dba4e2 100644
--- a/netwerk/test/unit_ipc/test_channel_id.js
+++ b/netwerk/test/unit_ipc/test_channel_id.js
@@ -47,7 +47,7 @@ let parentChannelsDone = new Promise(resolve => {
   };
 });
 
-function observer(subject, topic, data) {
+function observer(subject) {
   let channel = subject.QueryInterface(Ci.nsIHttpChannel);
 
   let uri = channel.URI.spec;
diff --git a/netwerk/test/unit_ipc/test_gio_protocol_wrap.js b/netwerk/test/unit_ipc/test_gio_protocol_wrap.js
index f6aa6b83e8..e6e2c42bc2 100644
--- a/netwerk/test/unit_ipc/test_gio_protocol_wrap.js
+++ b/netwerk/test/unit_ipc/test_gio_protocol_wrap.js
@@ -9,7 +9,7 @@ function run_test() {
     "localtest:,recent:"
   );
 
-  do_await_remote_message("gio-allow-test-protocols").then(port => {
+  do_await_remote_message("gio-allow-test-protocols").then(() => {
     do_send_remote_message("gio-allow-test-protocols-done");
   });
 
diff --git a/netwerk/test/unit_ipc/test_httpcancel_wrap.js b/netwerk/test/unit_ipc/test_httpcancel_wrap.js
index f56d0e198b..3e54171ede 100644
--- a/netwerk/test/unit_ipc/test_httpcancel_wrap.js
+++ b/netwerk/test/unit_ipc/test_httpcancel_wrap.js
@@ -13,7 +13,7 @@ function run_test() {
     observer = {
       QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
 
-      observe(subject, topic, data) {
+      observe(subject) {
         subject = subject.QueryInterface(Ci.nsIRequest);
         subject.cancel(Cr.NS_BINDING_ABORTED);
 
diff --git a/netwerk/test/unit_ipc/xpcshell.toml b/netwerk/test/unit_ipc/xpcshell.toml
index 569bcda751..24c84d745d 100644
--- a/netwerk/test/unit_ipc/xpcshell.toml
+++ b/netwerk/test/unit_ipc/xpcshell.toml
@@ -153,6 +153,7 @@ run-sequentially = "http3server"
 skip-if = [
   "os == 'android'",
   "os == 'win' && msix",
+  "true", # Will be reenabled in bug 1865394
 ] # https://bugzilla.mozilla.org/show_bug.cgi?id=1807925
 run-sequentially = "http3server"
 
-- 
cgit v1.2.3