Adding upstream version 125.0.1.upstream/125.0.1

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

1 files changed, 0 insertions, 27 deletions

diff --git a/browser/base/content/test/general/browser_beforeunload_duplicate_dialogs.js b/browser/base/content/test/general/browser_beforeunload_duplicate_dialogs.js
index 8a77f01ce4..8eb07a863a 100644
--- a/browser/base/content/test/general/browser_beforeunload_duplicate_dialogs.js
+++ b/browser/base/content/test/general/browser_beforeunload_duplicate_dialogs.js
@@ -1,36 +1,11 @@
 const TEST_PAGE =
   "http://mochi.test:8888/browser/browser/base/content/test/general/file_double_close_tab.html";
 
-const CONTENT_PROMPT_SUBDIALOG = Services.prefs.getBoolPref(
-  "prompts.contentPromptSubDialog",
-  false
-);
-
 var expectingDialog = false;
 var wantToClose = true;
 var resolveDialogPromise;
 
-function onTabModalDialogLoaded(node) {
-  ok(
-    !CONTENT_PROMPT_SUBDIALOG,
-    "Should not be using content prompt subdialogs."
-  );
-  ok(expectingDialog, "Should be expecting this dialog.");
-  expectingDialog = false;
-  if (wantToClose) {
-    // This accepts the dialog, closing it
-    node.querySelector(".tabmodalprompt-button0").click();
-  } else {
-    // This keeps the page open
-    node.querySelector(".tabmodalprompt-button1").click();
-  }
-  if (resolveDialogPromise) {
-    resolveDialogPromise();
-  }
-}
-
 function onCommonDialogLoaded(promptWindow) {
-  ok(CONTENT_PROMPT_SUBDIALOG, "Should be using content prompt subdialogs.");
   ok(expectingDialog, "Should be expecting this dialog.");
   expectingDialog = false;
   let dialog = promptWindow.Dialog;
@@ -51,11 +26,9 @@ SpecialPowers.pushPrefEnv({
 });
 
 // Listen for the dialog being created
-Services.obs.addObserver(onTabModalDialogLoaded, "tabmodal-dialog-loaded");
 Services.obs.addObserver(onCommonDialogLoaded, "common-dialog-loaded");
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("browser.tabs.warnOnClose");
-  Services.obs.removeObserver(onTabModalDialogLoaded, "tabmodal-dialog-loaded");
   Services.obs.removeObserver(onCommonDialogLoaded, "common-dialog-loaded");
 });