tor-browser

commit 33b87c423f86d7f456dd884244ae8c6bdae83973
parent 013fbbbcfae6ab9b84e5a779dcca987be6ea0a76
Author: Mark Banner <standard8@mozilla.com>
Date:   Tue,  9 Dec 2025 15:33:54 +0000

Bug 2004684 - Replace promiseTabLoaded functions in head files with BrowserTestUtils equivalent. r=firefox-desktop-core-reviewers ,Gijs

Differential Revision: https://phabricator.services.mozilla.com/D275431

Diffstat:
M
browser/base/content/test/about/browser_aboutSupport_newtab_security_state.js
 | 
2
+-
M
browser/base/content/test/about/head.js
 | 
6
------
M
browser/base/content/test/general/browser_remoteTroubleshoot.js
 | 
2
+-
M
browser/base/content/test/general/browser_unknownContentType_title.js
 | 
4
++--
M
browser/base/content/test/general/head.js
 | 
6
------
M
toolkit/components/contentanalysis/tests/browser/head.js
 | 
6
------

6 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/browser/base/content/test/about/browser_aboutSupport_newtab_security_state.js b/browser/base/content/test/about/browser_aboutSupport_newtab_security_state.js
@@ -12,7 +12,7 @@ add_task(async function checkIdentityOfAboutSupport() {
     triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
   });
 
-  await promiseTabLoaded(tab);
+  await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
   let identityBox = document.getElementById("identity-box");
   is(identityBox.className, "chromeUI", "Should know that we're chrome.");
   gBrowser.removeTab(tab);
diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js
@@ -108,12 +108,6 @@ function whenTabLoaded(aTab, aCallback) {
   promiseTabLoadEvent(aTab).then(aCallback);
 }
 
-function promiseTabLoaded(aTab) {
-  return new Promise(resolve => {
-    whenTabLoaded(aTab, resolve);
-  });
-}
-
 /**
  * Waits for a load (or custom) event to finish in a given tab. If provided
  * load an uri into the tab.
diff --git a/browser/base/content/test/general/browser_remoteTroubleshoot.js b/browser/base/content/test/general/browser_remoteTroubleshoot.js
@@ -21,7 +21,7 @@ async function promiseNewChannelResponse(uri) {
     inBackground: false,
     triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
   });
-  await promiseTabLoaded(tab);
+  await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
   let data = await SpecialPowers.spawn(
     gBrowser.selectedBrowser,
diff --git a/browser/base/content/test/general/browser_unknownContentType_title.js b/browser/base/content/test/general/browser_unknownContentType_title.js
@@ -44,7 +44,7 @@ add_task(async function unknownContentType_title_with_pref_enabled() {
 
   let tab = (gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, url));
   let browser = tab.linkedBrowser;
-  await promiseTabLoaded(gBrowser.selectedTab);
+  await BrowserTestUtils.browserLoaded(browser);
 
   is(gBrowser.contentTitle, "Test Page", "Should have the right title.");
 
@@ -69,7 +69,7 @@ add_task(async function unknownContentType_title_with_pref_disabled() {
 
   let tab = (gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, url));
   let browser = tab.linkedBrowser;
-  await promiseTabLoaded(gBrowser.selectedTab);
+  await BrowserTestUtils.browserLoaded(browser);
 
   is(gBrowser.contentTitle, "Test Page", "Should have the right title.");
 
diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js
@@ -181,12 +181,6 @@ function whenTabLoaded(aTab, aCallback) {
   promiseTabLoadEvent(aTab).then(aCallback);
 }
 
-function promiseTabLoaded(aTab) {
-  return new Promise(resolve => {
-    whenTabLoaded(aTab, resolve);
-  });
-}
-
 /**
  * Waits for a load (or custom) event to finish in a given tab. If provided
  * load an uri into the tab.
diff --git a/toolkit/components/contentanalysis/tests/browser/head.js b/toolkit/components/contentanalysis/tests/browser/head.js
@@ -372,12 +372,6 @@ function whenTabLoaded(aTab, aCallback) {
   promiseTabLoadEvent(aTab).then(aCallback);
 }
 
-function promiseTabLoaded(aTab) {
-  return new Promise(resolve => {
-    whenTabLoaded(aTab, resolve);
-  });
-}
-
 /**
  * Waits for a load (or custom) event to finish in a given tab. If provided
  * load an uri into the tab.