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>
---
 toolkit/components/printing/tests/browser_preview_navigation.js | 2 +-
 toolkit/components/printing/tests/head.js                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'toolkit/components/printing/tests')

diff --git a/toolkit/components/printing/tests/browser_preview_navigation.js b/toolkit/components/printing/tests/browser_preview_navigation.js
index b4c0920185..53e54eddb0 100644
--- a/toolkit/components/printing/tests/browser_preview_navigation.js
+++ b/toolkit/components/printing/tests/browser_preview_navigation.js
@@ -412,7 +412,7 @@ add_task(async function testPaginatorAfterSettingsUpdate() {
 });
 
 add_task(async function testTooltips() {
-  await SpecialPowers.pushPrefEnv({ set: [["ui.tooltipDelay", 0]] });
+  await SpecialPowers.pushPrefEnv({ set: [["ui.tooltip.delay_ms", 0]] });
   const mockPrinterName = "Fake Printer";
   await PrintHelper.withTestPage(async helper => {
     helper.addMockPrinter(mockPrinterName);
diff --git a/toolkit/components/printing/tests/head.js b/toolkit/components/printing/tests/head.js
index a69faa436e..4c8c0b26b6 100644
--- a/toolkit/components/printing/tests/head.js
+++ b/toolkit/components/printing/tests/head.js
@@ -521,7 +521,7 @@ class PrintHelper {
   mockFilePickerCancel() {
     if (!pickerMocked) {
       pickerMocked = true;
-      MockFilePicker.init(window);
+      MockFilePicker.init(window.browsingContext);
       registerCleanupFunction(() => MockFilePicker.cleanup());
     }
     MockFilePicker.returnValue = MockFilePicker.returnCancel;
@@ -530,7 +530,7 @@ class PrintHelper {
   mockFilePicker(filename) {
     if (!pickerMocked) {
       pickerMocked = true;
-      MockFilePicker.init(window);
+      MockFilePicker.init(window.browsingContext);
       registerCleanupFunction(() => MockFilePicker.cleanup());
     }
     MockFilePicker.returnValue = MockFilePicker.returnOK;
-- 
cgit v1.2.3