Merging upstream version 125.0.1.

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

3 files changed, 23 insertions, 16 deletions

diff --git a/remote/cdp/test/browser/network/browser_responseReceived.js b/remote/cdp/test/browser/network/browser_responseReceived.js
index 41e854de8a..5319f0eb65 100644
--- a/remote/cdp/test/browser/network/browser_responseReceived.js
+++ b/remote/cdp/test/browser/network/browser_responseReceived.js
@@ -74,8 +74,9 @@ add_task(async function documentNavigationWithResource({ client }) {
       "127.0.0.1",
       "Document response has the expected IP address"
     );
-    ok(
-      typeof docResponse.response.remotePort == "number",
+    Assert.equal(
+      typeof docResponse.response.remotePort,
+      "number",
       "Document response has a remotePort"
     );
   }
@@ -112,8 +113,9 @@ add_task(async function documentNavigationWithResource({ client }) {
       docResponse.response.remoteIPAddress,
       "Script response has same IP address as document response"
     );
-    ok(
-      typeof scriptResponse.response.remotePort == "number",
+    Assert.equal(
+      typeof scriptResponse.response.remotePort,
+      "number",
       "Script response has a remotePort"
     );
   }
@@ -166,8 +168,9 @@ add_task(async function documentNavigationWithResource({ client }) {
       "127.0.0.1",
       "Subdocument response has the expected IP address"
     );
-    ok(
-      typeof frameDocResponse.response.remotePort == "number",
+    Assert.equal(
+      typeof frameDocResponse.response.remotePort,
+      "number",
       "Subdocument response has a remotePort"
     );
   }
@@ -207,8 +210,9 @@ add_task(async function documentNavigationWithResource({ client }) {
       docResponse.response.remoteIPAddress,
       "Script response has same IP address as document response"
     );
-    ok(
-      typeof frameScriptResponse.response.remotePort == "number",
+    Assert.equal(
+      typeof frameScriptResponse.response.remotePort,
+      "number",
       "Script response has a remotePort"
     );
   }
diff --git a/remote/cdp/test/browser/network/browser_setCacheDisabled.js b/remote/cdp/test/browser/network/browser_setCacheDisabled.js
index 4af9f0fc07..a7272bfc54 100644
--- a/remote/cdp/test/browser/network/browser_setCacheDisabled.js
+++ b/remote/cdp/test/browser/network/browser_setCacheDisabled.js
@@ -18,7 +18,7 @@ add_task(async function cacheEnabledAfterDisabled({ client }) {
   await waitForLoadFlags();
 });
 
-add_task(async function cacheEnabledByDefault({ Network }) {
+add_task(async function cacheEnabledByDefault() {
   await watchLoadFlags(LOAD_NORMAL, TEST_PAGE);
   await loadURL(TEST_PAGE);
   await waitForLoadFlags();
@@ -67,7 +67,7 @@ function watchLoadFlags(flags, url) {
             );
         },
 
-        onStateChange(webProgress, request, flags, status) {
+        onStateChange(webProgress, request, flags) {
           // We are checking requests - if there isn't one, ignore it.
           if (!request) {
             return;
@@ -99,8 +99,9 @@ function watchLoadFlags(flags, url) {
 
           if (request.name == this.url && (flags & stopFlags) == stopFlags) {
             this.docShell.removeProgressListener(this);
-            ok(
-              this.requestCount > 1,
+            Assert.greater(
+              this.requestCount,
+              1,
               this.url + " saw " + this.requestCount + " requests"
             );
             this.callback();
diff --git a/remote/cdp/test/browser/network/head.js b/remote/cdp/test/browser/network/head.js
index 3347e79e0f..2910f1c080 100644
--- a/remote/cdp/test/browser/network/head.js
+++ b/remote/cdp/test/browser/network/head.js
@@ -47,14 +47,16 @@ function assertEventOrder(first, second, options = {}) {
   const firstDescription = getDescriptionForEvent(first);
   const secondDescription = getDescriptionForEvent(second);
 
-  ok(
-    first.index < second.index,
+  Assert.less(
+    first.index,
+    second.index,
     `${firstDescription} received before ${secondDescription})`
   );
 
   if (!ignoreTimestamps) {
-    ok(
-      first.payload.timestamp <= second.payload.timestamp,
+    Assert.lessOrEqual(
+      first.payload.timestamp,
+      second.payload.timestamp,
       `Timestamp of ${firstDescription}) is earlier than ${secondDescription})`
     );
   }