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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../browser/browser_firstPartyIsolation_saveAs.js     |  3 ++-
 .../originattributes/test/browser/browser_httpauth.js | 19 +++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'browser/components/originattributes')

diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js
index b51ac12849..c54bb1aec1 100644
--- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js
+++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation_saveAs.js
@@ -27,7 +27,7 @@ const TEST_PATH_PAGE = `${TEST_BASE_PATH}file_favicon.png`;
 const TEST_PATH_FRAME = `${TEST_BASE_PATH}file_favicon.png`;
 
 let MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(window.browsingContext);
 const tempDir = createTemporarySaveDirectory();
 MockFilePicker.displayDirectory = tempDir;
 
@@ -38,6 +38,7 @@ add_setup(async function () {
     set: [
       ["privacy.firstparty.isolate", true],
       ["dom.security.https_first", false],
+      ["dom.block_download_insecure", false],
     ],
   });
 
diff --git a/browser/components/originattributes/test/browser/browser_httpauth.js b/browser/components/originattributes/test/browser/browser_httpauth.js
index 085d493c1b..b2e95e13ac 100644
--- a/browser/components/originattributes/test/browser/browser_httpauth.js
+++ b/browser/components/originattributes/test/browser/browser_httpauth.js
@@ -6,11 +6,6 @@ let authPromptModalType = Services.prefs.getIntPref(
   "prompts.modalType.httpAuth"
 );
 
-let commonDialogEnabled =
-  authPromptModalType === Services.prompt.MODAL_TYPE_WINDOW ||
-  (authPromptModalType === Services.prompt.MODAL_TYPE_TAB &&
-    Services.prefs.getBoolPref("prompts.tabChromePromptSubDialog"));
-
 let server = new HttpServer();
 server.registerPathHandler("/file.html", fileHandler);
 server.start(-1);
@@ -38,23 +33,15 @@ function fileHandler(metadata, response) {
 }
 
 function onCommonDialogLoaded(subject) {
-  let dialog;
-  if (commonDialogEnabled) {
-    dialog = subject.Dialog;
-  } else {
-    let promptBox =
-      subject.ownerGlobal.gBrowser.selectedBrowser.tabModalPromptBox;
-    dialog = promptBox.getPrompt(subject).Dialog;
-  }
+  let dialog = subject.Dialog;
+
   // Submit random account and password
   dialog.ui.loginTextbox.setAttribute("value", Math.random());
   dialog.ui.password1Textbox.setAttribute("value", Math.random());
   dialog.ui.button0.click();
 }
 
-let authPromptTopic = commonDialogEnabled
-  ? "common-dialog-loaded"
-  : "tabmodal-dialog-loaded";
+let authPromptTopic = "common-dialog-loaded";
 Services.obs.addObserver(onCommonDialogLoaded, authPromptTopic);
 
 registerCleanupFunction(() => {
-- 
cgit v1.2.3