Adding upstream version 125.0.1.upstream/125.0.1

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

2 files changed, 11 insertions, 8 deletions

diff --git a/gfx/tests/browser/browser_native_font_cache_macos.js b/gfx/tests/browser/browser_native_font_cache_macos.js
index 919a5c7a72..e71ccbf5a6 100644
--- a/gfx/tests/browser/browser_native_font_cache_macos.js
+++ b/gfx/tests/browser/browser_native_font_cache_macos.js
@@ -87,8 +87,9 @@ add_task(async () => {
       const nfrm_match = nfrm_line.exec(copiedText);
       if (nfrm_match) {
         const nfrm_mb = nfrm_match[1];
-        ok(
-          nfrm_mb < MB_EXCLUSIVE_MAX,
+        Assert.less(
+          nfrm_mb,
+          MB_EXCLUSIVE_MAX,
           `native-font-resource-mac ${nfrm_mb} MB should be less than ${MB_EXCLUSIVE_MAX} MB.`
         );
       } else {
@@ -102,8 +103,9 @@ add_task(async () => {
         const gfx_match = gfx_line.exec(copiedText);
         if (gfx_match && gfx_match.index < om_match.index) {
           const gfx_mb = gfx_match[1];
-          ok(
-            gfx_mb < MB_EXCLUSIVE_MAX,
+          Assert.less(
+            gfx_mb,
+            MB_EXCLUSIVE_MAX,
             `Explicit Allocations gfx ${gfx_mb} MB should be less than ${MB_EXCLUSIVE_MAX} MB.`
           );
         } else {
diff --git a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
index 44fc50e2f8..2ccae78a6e 100644
--- a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
+++ b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
@@ -1,10 +1,10 @@
 add_task(async function test_windowlessBrowserTroubleshootCrash() {
   let webNav = Services.appShell.createWindowlessBrowser(false);
 
-  let onLoaded = new Promise((resolve, reject) => {
+  let onLoaded = new Promise(resolve => {
     let docShell = webNav.docShell;
     let listener = {
-      observe(contentWindow, topic, data) {
+      observe(contentWindow) {
         let observedDocShell =
           contentWindow.docShell.sameTypeRootTreeItem.QueryInterface(
             Ci.nsIDocShell
@@ -45,8 +45,9 @@ add_task(async function test_windowlessBrowserTroubleshootCrash() {
   );
   var data = await Troubleshoot.snapshot();
 
-  ok(
-    data.graphics.windowLayerManagerType !== "None",
+  Assert.notStrictEqual(
+    data.graphics.windowLayerManagerType,
+    "None",
     "windowless browser window should not set windowLayerManagerType to 'None'"
   );