Bug 1753696 - Automatic rewrite: replace add_task(setup with add_setup in browser mochitest, r=Standard8,webcompat-reviewers,twisniewski

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

browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbarEmpty.js

@@ -18,7 +18,7 @@ const bookmarksInfo = [
   },
 ];
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     // Ensure we can wait for about:newtab to load.
     set: [["browser.newtab.preload", false]],

browser/base/content/test/alerts/browser_notification_do_not_disturb.js

@@ -20,7 +20,7 @@ const PAGE =
 // to show up before we decide that it's not coming.
 const NOTIFICATION_TIMEOUT_SECS = 2000;
 
-add_task(async function setup() {
+add_setup(async function() {
   await addNotificationPermission(PAGE);
 });
 

browser/base/content/test/captivePortal/browser_captivePortalTabReference.js

@@ -40,7 +40,7 @@ async function checkCaptivePortalTabReference(evt, currState) {
   gBrowser.removeTab(errorTab);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["captivedetect.canonicalURL", CANONICAL_URL],

browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["captivedetect.canonicalURL", CANONICAL_URL],

browser/base/content/test/captivePortal/browser_captivePortal_https_only.js

@@ -12,7 +12,7 @@ const testPath = getRootDirectory(gTestPath).replace(
 const CANONICAL_URI = Services.io.newURI(testPath);
 const PERMISSION_NAME = "https-only-load-insecure";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     // That changes the canoncicalURL from "http://{server}/captive-detect/success.txt"
     // to http://example.com

browser/base/content/test/captivePortal/browser_closeCapPortalTabCanonicalURL.js

@@ -35,7 +35,7 @@ function unlockHandler(request, response) {
   response.setHeader("Location", CANONICAL_SUCCESS_URL);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // Set up a mock server for handling captive portal redirect.
   server = new HttpServer();
   server.registerPathHandler("/success", redirectHandler);

browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js

@@ -135,7 +135,7 @@ async function openInNewTabAndReturnContent(selector) {
   return blobDataFromContent;
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.partition.bloburl_per_agent_cluster", false]],
   });

browser/base/content/test/contextMenu/browser_contextmenu_touch.js

@@ -35,7 +35,7 @@ async function openAndCheckContextMenu(contextMenu, target) {
 }
 
 // Ensure that we can run touch events properly for windows [10]
-add_task(async function setup() {
+add_setup(async function() {
   let isWindows = AppConstants.isPlatformAndVersionAtLeast("win", "10.0");
   await SpecialPowers.pushPrefEnv({
     set: [["apz.test.fails_with_native_injection", isWindows]],

browser/base/content/test/favicons/browser_preferred_icons.js

@@ -28,7 +28,7 @@ function createLinks(linkInfos) {
   });
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   const URL = ROOT + "discovery.html";
   let iconPromise = waitIcon("http://mochi.test:8888/favicon.ico");
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);

browser/base/content/test/forms/browser_selectpopup.js

@@ -321,7 +321,7 @@ async function doSelectTests(contentType, content) {
   BrowserTestUtils.removeTab(tab);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["dom.forms.select.customstyling", true]],
   });

browser/base/content/test/forms/browser_selectpopup_colors.js

@@ -459,7 +459,7 @@ async function testSelectColors(selectID, itemCount, options) {
 // System colors may be different in content pages and chrome pages.
 let kDefaultSelectStyles = {};
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["dom.forms.select.customstyling", true]],
   });

browser/base/content/test/forms/browser_selectpopup_searchfocus.js

@@ -6,7 +6,7 @@ SELECT +=
   '  <option selected="true">{"end": "true"}</option>' +
   "</select></body></html>";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["dom.forms.selectSearch", true]],
   });

browser/base/content/test/fullscreen/browser_fullscreen_window_focus.js

@@ -76,7 +76,7 @@ async function testWindowElementFocus(isPopup) {
   BrowserTestUtils.removeTab(tab);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["dom.disable_open_during_load", false], // Allow window.focus calls without user interaction

browser/base/content/test/fullscreen/browser_fullscreen_window_open.js

@@ -28,7 +28,7 @@ async function testWindowOpen(iframeID) {
   BrowserTestUtils.removeTab(tab);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["dom.disable_open_during_load", false], // Allow window.open calls without user interaction

browser/base/content/test/general/browser_datachoices_notification.js

@@ -113,7 +113,7 @@ var checkInfobarButton = async function(aNotification) {
   await promiseNextTick();
 };
 
-add_task(async function setup() {
+add_setup(async function() {
   const isFirstRun = Preferences.get(PREF_FIRST_RUN, true);
   const bypassNotification = Preferences.get(PREF_BYPASS_NOTIFICATION, true);
   const currentPolicyVersion = Preferences.get(PREF_CURRENT_POLICY_VERSION, 1);

browser/base/content/test/general/browser_storagePressure_notification.js

@@ -27,7 +27,7 @@ function openAboutPrefPromise(win) {
   ];
   return Promise.all(promises);
 }
-add_task(async function setup() {
+add_setup(async function() {
   let win = await BrowserTestUtils.openNewBrowserWindow();
   // Open a new tab to keep the window open.
   await BrowserTestUtils.openNewForegroundTab(

browser/base/content/test/general/browser_unknownContentType_title.js

@@ -16,7 +16,7 @@ function waitForNewWindow() {
   });
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   let tmpDir = PathUtils.join(
     PathUtils.tempDir,
     "testsavedir" + Math.floor(Math.random() * 2 ** 32)

browser/base/content/test/keyboard/browser_toolbarKeyNav.js

@@ -94,7 +94,7 @@ function withNewBlankTab(taskFn) {
 
 const BOOKMARKS_COUNT = 100;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.toolbars.keyboard_navigation", true],

browser/base/content/test/permissions/browser_autoplay_blocked.js

@@ -73,7 +73,7 @@ function testPermListHasEntries(expectEntries) {
   ok(!listEntryCount, "List of permissions is empty");
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   registerCleanupFunction(() => {
     Services.perms.removeAll();
     Services.prefs.clearUserPref(AUTOPLAY_PREF);

browser/base/content/test/permissions/browser_permission_delegate_geo.js

@@ -112,7 +112,7 @@ async function checkGeolocation(browser, frameId, expect) {
   }
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await new Promise(r => {
     SpecialPowers.pushPrefEnv(
       {

browser/base/content/test/popupNotifications/browser_displayURI.js

@@ -84,7 +84,7 @@ async function check(contentTask, options = {}) {
   }
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["media.navigator.permission.fake", true],

browser/base/content/test/popups/browser_popup_blocker.js

@@ -15,7 +15,7 @@ function clearAllPermissionsByPrefix(aPrefix) {
   }
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // Enable the popup blocker.
   await SpecialPowers.pushPrefEnv({
     set: [["dom.disable_open_during_load", true]],

browser/base/content/test/protectionsUI/browser_protectionsUI.js

@@ -18,7 +18,7 @@ const { CustomizableUITestUtils } = ChromeUtils.import(
   "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // Set the auto hide timing to 100ms for blocking the test less.

browser/base/content/test/protectionsUI/browser_protectionsUI_cookies_subview.js

@@ -12,7 +12,7 @@ const CONTAINER_PAGE =
 
 const TPC_PREF = "network.cookie.cookieBehavior";
 
-add_task(async function setup() {
+add_setup(async function() {
   await UrlClassifierTestUtils.addTestTrackers();
 
   registerCleanupFunction(() => {

browser/base/content/test/protectionsUI/browser_protectionsUI_cryptominers.js

@@ -8,7 +8,7 @@ const TRACKING_PAGE =
 const CM_PROTECTION_PREF = "privacy.trackingprotection.cryptomining.enabled";
 let cmHistogram;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [

browser/base/content/test/protectionsUI/browser_protectionsUI_fingerprinters.js

@@ -8,7 +8,7 @@ const TRACKING_PAGE =
 const FP_PROTECTION_PREF = "privacy.trackingprotection.fingerprinting.enabled";
 let fpHistogram;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [

browser/base/content/test/protectionsUI/browser_protectionsUI_milestones.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // Hide protections cards so as not to trigger more async messaging

browser/base/content/test/protectionsUI/browser_protectionsUI_open_preferences.js

@@ -40,7 +40,7 @@ async function waitAndAssertPreferencesShown(_spotlight) {
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await UrlClassifierTestUtils.addTestTrackers();
   let oldCanRecord = Services.telemetry.canRecordExtended;
   Services.telemetry.canRecordExtended = true;

browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js

@@ -23,7 +23,7 @@ let { Preferences } = ChromeUtils.import(
   "resource://gre/modules/Preferences.jsm"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   await UrlClassifierTestUtils.addTestTrackers();
 
   registerCleanupFunction(() => {

browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js

@@ -74,7 +74,7 @@ const TEST_CASES = [
   },
 ];
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // By default, proxies don't apply to 127.0.0.1. We need them to for this test, though:

browser/base/content/test/protectionsUI/browser_protectionsUI_socialtracking.js

@@ -9,7 +9,7 @@ const TRACKING_PAGE =
 const ST_PROTECTION_PREF = "privacy.trackingprotection.socialtracking.enabled";
 const ST_BLOCK_COOKIES_PREF = "privacy.socialtracking.block_cookies.enabled";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [ST_BLOCK_COOKIES_PREF, true],

browser/base/content/test/protectionsUI/browser_protectionsUI_subview_shim.js

@@ -14,7 +14,7 @@
 const TRACKING_PAGE =
   "http://example.net/browser/browser/base/content/test/protectionsUI/trackingPage.html";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["privacy.trackingprotection.enabled", true],

browser/base/content/test/protectionsUI/browser_protectionsUI_telemetry.js

@@ -29,7 +29,7 @@ function getShieldCounts() {
   return getShieldHistogram().snapshot().values;
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await UrlClassifierTestUtils.addTestTrackers();
   Services.prefs.setBoolPref(DTSCBN_PREF, true);
 

browser/base/content/test/protectionsUI/browser_protectionsUI_trackers_subview.js

@@ -13,7 +13,7 @@ const TRACKING_PAGE =
 
 const TP_PREF = "privacy.trackingprotection.enabled";
 
-add_task(async function setup() {
+add_setup(async function() {
   await UrlClassifierTestUtils.addTestTrackers();
 
   registerCleanupFunction(() => {

browser/base/content/test/sidebar/browser_sidebar_adopt.js

@@ -12,7 +12,7 @@ function failIfSidebarFocusedFires() {
   ok(false, "This event shouldn't have fired");
 }
 
-add_task(function setup() {
+add_setup(function() {
   CustomizableUI.addWidgetToArea("sidebar-button", "nav-bar");
   registerCleanupFunction(() =>
     CustomizableUI.removeWidgetFromArea("sidebar-button")

browser/base/content/test/siteIdentity/browser_bug902156.js

@@ -34,7 +34,7 @@ const HTTPS_TEST_ROOT_2 = getRootDirectory(gTestPath).replace(
   "https://test2.example.com"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({ set: [[PREF_ACTIVE, true]] });
 });
 

browser/base/content/test/sync/browser_contextmenu_sendpage.js

@@ -27,7 +27,7 @@ const fxaDevices = [
   { id: 4, name: "Homer" }, // Incompatible target.
 ];
 
-add_task(async function setup() {
+add_setup(async function() {
   await promiseSyncReady();
   await Services.search.init();
   // gSync.init() is called in a requestIdleCallback. Force its initialization.

browser/base/content/test/sync/browser_contextmenu_sendtab.js

@@ -50,7 +50,7 @@ function updateTabContextMenu(tab = gBrowser.selectedTab) {
   menu.hidePopup();
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await promiseSyncReady();
   await Services.search.init();
   // gSync.init() is called in a requestIdleCallback. Force its initialization.

browser/base/content/test/sync/browser_sync.js

@@ -9,7 +9,7 @@ const { CustomizableUITestUtils } = ChromeUtils.import(
 
 let gCUITestUtils = new CustomizableUITestUtils(window);
 
-add_task(async function setup() {
+add_setup(async function() {
   // gSync.init() is called in a requestIdleCallback. Force its initialization.
   gSync.init();
   // This preference gets set the very first time that the FxA menu gets opened,

browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js

@@ -36,7 +36,7 @@ function getTestDirectory() {
   return tmpDir.path;
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // Allow using our MockFilePicker in the content process.

browser/base/content/test/tabPrompts/browser_contentOrigins.js

@@ -125,7 +125,7 @@ async function checkDialog(
   });
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["prompts.contentPromptSubDialog", true],

browser/base/content/test/tabcrashed/browser_noPermanentKey.js

@@ -3,7 +3,7 @@
 const PAGE =
   "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
 
-add_task(async function setup() {
+add_setup(async function() {
   await setupLocalCrashReportServer();
 });
 

browser/base/content/test/tabcrashed/browser_shown.js

@@ -7,7 +7,7 @@ const COMMENTS = "Here's my test comment!";
 // Avoid timeouts, as in bug 1325530
 requestLongerTimeout(2);
 
-add_task(async function setup() {
+add_setup(async function() {
   await setupLocalCrashReportServer();
 });
 

browser/base/content/test/tabcrashed/browser_withoutDump.js

@@ -3,7 +3,7 @@
 const PAGE =
   "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
 
-add_task(async function setup() {
+add_setup(async function() {
   prepareNoDump();
 });
 

browser/base/content/test/tabdialogs/browser_tabdialogbox_content_prompts.js

@@ -41,7 +41,7 @@ var commonDialogsBundle = Services.strings.createBundle(
 );
 
 // Setup.
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [[CONTENT_PROMPT_PREF, true]],
   });

browser/base/content/test/tabs/browser_multiselect_tabs_using_keyboard.js

@@ -15,7 +15,7 @@ function synthesizeKeyAndWaitForTabToGetKeyboardFocus(tab, keyCode, options) {
   return focused;
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // The DevEdition has the DevTools button in the toolbar by default. Remove it
   // to prevent branch-specific rules what button should be focused.
   CustomizableUI.removeWidgetFromArea("developer-button");

browser/base/content/test/tabs/browser_navigate_through_urls_origin_attributes.js

@@ -33,7 +33,7 @@ var gPrevRemoteTypeRegularTab;
 var gPrevRemoteTypeContainerTab;
 var gPrevRemoteTypePrivateTab;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["privacy.userContext.enabled", true],

browser/base/content/test/tabs/browser_new_tab_in_privilegedabout_process_pref.js

@@ -17,7 +17,7 @@ const ABOUT_NEWTAB = "about:newtab";
 const ABOUT_WELCOME = "about:welcome";
 const TEST_HTTP = "http://example.org/";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.newtab.preload", false],

browser/base/content/test/tabs/browser_origin_attrs_in_remote_type.js

@@ -21,7 +21,7 @@ var TEST_CASES = [
 const NUM_PAGES_OPEN_FOR_EACH_TEST_CASE = 5;
 var remoteTypes;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["privacy.userContext.enabled", true],

browser/base/content/test/tabs/browser_origin_attrs_rel.js

@@ -49,7 +49,7 @@ function handleEventLocal(aEvent) {
   }
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["privacy.userContext.enabled", true],

browser/base/content/test/tabs/browser_positional_attributes.js

@@ -26,7 +26,7 @@ function testAttrib(tabIndex, attrib, expected) {
   );
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   is(gBrowser.tabs.length, 1, "one tab is open initially");
 
   addTab("http://mochi.test:8888/#0");

browser/base/content/test/tabs/browser_privilegedmozilla_process_pref.js

@@ -17,7 +17,7 @@ const TEST_HIGH2 = "https://test1.example.org/";
 const TEST_LOW1 = "http://example.org/";
 const TEST_LOW2 = "https://example.com/";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.tabs.remote.separatePrivilegedMozillaWebContentProcess", true],

browser/base/content/test/tabs/browser_progress_keyword_search_handling.js

@@ -11,7 +11,7 @@ SearchTestUtils.init(this);
 
 const kButton = document.getElementById("reload-button");
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["browser.fixup.dns_first_for_single_words", true]],
   });

browser/base/content/test/tabs/browser_removeTabs_order.js

@@ -5,7 +5,7 @@
 
 const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
 
-add_task(async function setup() {
+add_setup(async function() {
   let tab1 = await addTab();
   let tab2 = await addTab();
   let tab3 = await addTab();

browser/base/content/test/tabs/browser_removeTabs_skipPermitUnload.js

@@ -38,7 +38,7 @@ let win;
 let nonBeforeUnloadTab;
 let beforeUnloadTab;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["dom.require_user_interaction_for_beforeunload", false]],
   });

browser/base/content/test/tabs/browser_tabCloseProbes.js

@@ -58,7 +58,7 @@ function waitForSnapshotCount(histogram, expectedCount) {
   }, `Collected value should become ${expectedCount}.`);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // Force-enable tab animations
   gReduceMotionOverride = false;
 

browser/base/content/test/tabs/browser_tabSpinnerProbe.js

@@ -82,7 +82,7 @@ async function testProbe(aProbe) {
   );
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["dom.ipc.processCount", 1],

browser/base/content/test/touch/browser_menu_touch.js

@@ -112,7 +112,7 @@ async function openAndCheckCustomizationUIMenu(target) {
 }
 
 // Ensure that we can run touch events properly for windows [10]
-add_task(async function setup() {
+add_setup(async function() {
   let isWindows = AppConstants.isPlatformAndVersionAtLeast("win", "10.0");
   await SpecialPowers.pushPrefEnv({
     set: [["apz.test.fails_with_native_injection", isWindows]],

browser/base/content/test/webextensions/browser_extension_update_background.js

@@ -35,7 +35,7 @@ function getBadgeStatus() {
 }
 
 // Set some prefs that apply to all the tests in this file
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // We don't have pre-pinned certificates for the local mochitest server

browser/base/content/test/webextensions/browser_extension_update_background_noprompt.js

@@ -20,7 +20,7 @@ function getBadgeStatus() {
 }
 
 // Set some prefs that apply to all the tests in this file
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // We don't have pre-pinned certificates for the local mochitest server

browser/base/content/test/webextensions/browser_permissions_dismiss.js

@@ -3,7 +3,7 @@
 const INSTALL_PAGE = `${BASE}/file_install_extensions.html`;
 const INSTALL_XPI = `${BASE}/browser_webext_permissions.xpi`;
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["extensions.webapi.testing", true],

browser/base/content/test/webextensions/browser_update_interactive_noprompt.js

@@ -1,5 +1,5 @@
 // Set some prefs that apply to all the tests in this file
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [
       // We don't have pre-pinned certificates for the local mochitest server

browser/base/content/test/webrtc/browser_global_mute_toggles.js

@@ -15,7 +15,7 @@ const MUTE_TOPICS = [
   "getUserMedia:unmuteAudio",
 ];
 
-add_task(async function setup() {
+add_setup(async function() {
   let prefs = [
     [PREF_PERMISSION_FAKE, true],
     [PREF_AUDIO_LOOPBACK, ""],

browser/base/content/test/webrtc/browser_notification_silencing.js

@@ -129,7 +129,7 @@ async function testNotificationSilencing(aBrowser) {
   );
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // Set prefs so that permissions prompts are shown and loopback devices
   // are not used. To test the chrome we want prompts to be shown, and
   // these tests are flakey when using loopback devices (though it would

browser/base/content/test/webrtc/browser_stop_sharing_button.js

@@ -9,7 +9,7 @@ const TEST_ROOT = getRootDirectory(gTestPath).replace(
 );
 const TEST_PAGE = TEST_ROOT + "get_user_media.html";
 
-add_task(async function setup() {
+add_setup(async function() {
   let prefs = [
     [PREF_PERMISSION_FAKE, true],
     [PREF_AUDIO_LOOPBACK, ""],

browser/base/content/test/webrtc/browser_stop_streams_on_indicator_close.js

@@ -9,7 +9,7 @@ const TEST_ROOT = getRootDirectory(gTestPath).replace(
 );
 const TEST_PAGE = TEST_ROOT + "get_user_media.html";
 
-add_task(async function setup() {
+add_setup(async function() {
   let prefs = [
     [PREF_PERMISSION_FAKE, true],
     [PREF_AUDIO_LOOPBACK, ""],

browser/base/content/test/webrtc/browser_tab_switch_warning.js

@@ -188,7 +188,7 @@ async function ensureWarning(tab) {
   );
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.webrtc.sharedTabWarning", true]],
   });

browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js

@@ -30,7 +30,7 @@ let VULNERABLE_TEST_LOGIN2 = new nsLoginInfo(
   "password"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   VULNERABLE_TEST_LOGIN2 = await addLogin(VULNERABLE_TEST_LOGIN2);
   TEST_LOGIN3 = await addLogin(TEST_LOGIN3);

browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js

@@ -24,7 +24,7 @@ let VULNERABLE_TEST_LOGIN2 = new nsLoginInfo(
   "password"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   VULNERABLE_TEST_LOGIN2 = await addLogin(VULNERABLE_TEST_LOGIN2);
   TEST_LOGIN3 = await addLogin(TEST_LOGIN3);

browser/components/aboutlogins/tests/browser/browser_breachAlertShowingForAddedLogin.js

@@ -14,7 +14,7 @@ EXPECTED_BREACH = {
   schema: "1541615609018",
 };
 
-add_task(async function setup() {
+add_setup(async function() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_confirmDeleteDialog.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_contextmenuFillLogins.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,

browser/components/aboutlogins/tests/browser/browser_createLogin.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   let aboutLoginsTab = await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_deleteLogin.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   TEST_LOGIN2 = await addLogin(TEST_LOGIN2);
   await BrowserTestUtils.openNewForegroundTab({

browser/components/aboutlogins/tests/browser/browser_fxAccounts.js

@@ -12,7 +12,7 @@ function mockState(state) {
   });
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   let aboutLoginsTab = await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_loginItemErrors.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_loginListChanges.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_loginSortOrderRestored.js

@@ -16,7 +16,7 @@ EXPECTED_BREACH = {
 
 const SORT_PREF_NAME = "signon.management.page.sort";
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN3.QueryInterface(Ci.nsILoginMetaInfo).timePasswordChanged = 1;
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   info(`TEST_LOGIN1 added with guid=${TEST_LOGIN1.guid}`);

browser/components/aboutlogins/tests/browser/browser_noLoginsView.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_openExport.js

@@ -17,7 +17,7 @@ let { TelemetryTestUtils } = ChromeUtils.import(
 
 let { MockFilePicker } = SpecialPowers;
 
-add_task(async function setup() {
+add_setup(async function() {
   await TestUtils.waitForCondition(() => {
     Services.telemetry.clearEvents();
     let events = Services.telemetry.snapshotEvents(

browser/components/aboutlogins/tests/browser/browser_openFiltered.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   let storageChangedPromised = TestUtils.topicObserved(
     "passwordmgr-storage-changed",
     (_, data) => data == "addLogin"

browser/components/aboutlogins/tests/browser/browser_openImport.js

@@ -5,7 +5,7 @@ let { TelemetryTestUtils } = ChromeUtils.import(
   "resource://testing-common/TelemetryTestUtils.jsm"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   await TestUtils.waitForCondition(() => {
     Services.telemetry.clearEvents();
     let events = Services.telemetry.snapshotEvents(

browser/components/aboutlogins/tests/browser/browser_openImportCSV.js

@@ -257,7 +257,7 @@ class CsvImportHelper {
 
 const random = Math.round(Math.random() * 100000001);
 
-add_task(async function setup() {
+add_setup(async function() {
   registerCleanupFunction(() => {
     Services.logins.removeAllUserFacingLogins();
   });

browser/components/aboutlogins/tests/browser/browser_openPreferences.js

@@ -5,7 +5,7 @@ let { TelemetryTestUtils } = ChromeUtils.import(
   "resource://testing-common/TelemetryTestUtils.jsm"
 );
 
-add_task(async function setup() {
+add_setup(async function() {
   await TestUtils.waitForCondition(() => {
     Services.telemetry.clearEvents();
     let events = Services.telemetry.snapshotEvents(

browser/components/aboutlogins/tests/browser/browser_openPreferencesExternal.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,
     url: "about:logins",

browser/components/aboutlogins/tests/browser/browser_openSite.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,

browser/components/aboutlogins/tests/browser/browser_primaryPassword.js

@@ -17,7 +17,7 @@ function waitForLoginCountToReach(browser, loginCount) {
   );
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await addLogin(TEST_LOGIN1);
   registerCleanupFunction(() => {
     Services.logins.removeAllUserFacingLogins();

browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js

@@ -76,7 +76,7 @@ async function waitForRemoveAllLogins() {
   });
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [[OS_REAUTH_PREF, false]],
   });

browser/components/aboutlogins/tests/browser/browser_tabKeyNav.js

@@ -14,7 +14,7 @@ EXPECTED_BREACH = {
   schema: "1541615609018",
 };
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,

browser/components/aboutlogins/tests/browser/browser_updateLogin.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,

browser/components/aboutlogins/tests/browser/browser_vulnerableLoginAddedInSecondaryWindow.js

@@ -16,7 +16,7 @@ EXPECTED_BREACH = {
 
 let tabInSecondWindow;
 
-add_task(async function setup() {
+add_setup(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   TEST_LOGIN2 = await addLogin(TEST_LOGIN2);
   TEST_LOGIN3 = await addLogin(TEST_LOGIN3);

browser/components/attribution/test/browser/head.js

@@ -13,7 +13,7 @@ const INDEX_DECODE_ERROR = 1;
 const INDEX_WRITE_ERROR = 2;
 const INDEX_QUARANTINE_ERROR = 3;
 
-add_task(function setup() {
+add_setup(function() {
   // AttributionCode._clearCache is only possible in a testing environment
   let env = Cc["@mozilla.org/process/environment;1"].getService(
     Ci.nsIEnvironment

browser/components/contextualidentity/test/browser/browser_blobUrl.js

@@ -6,7 +6,7 @@ const BASE_URI =
   "http://mochi.test:8888/browser/browser/components/" +
   "contextualidentity/test/browser/empty_file.html";
 
-add_task(async function setup() {
+add_setup(async function() {
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.userContext.enabled", true]],
   });

browser/components/contextualidentity/test/browser/browser_broadcastchannel.js

@@ -68,7 +68,7 @@ async function runTestForReceiver(receiver) {
   gBrowser.removeTab(sender2.tab);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.userContext.enabled", true]],

browser/components/contextualidentity/test/browser/browser_count_and_remove.js

@@ -10,7 +10,7 @@ function openTabInUserContext(userContextId) {
   gBrowser.selectedTab = tab;
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.userContext.enabled", true]],

browser/components/contextualidentity/test/browser/browser_eme.js

@@ -90,7 +90,7 @@ function generateKeyInfo(aData) {
   return keyInfo;
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // Make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [

browser/components/contextualidentity/test/browser/browser_favicon.js

@@ -78,7 +78,7 @@ function loadFaviconHandler(metadata, response) {
   response.bodyOutputStream.write(gFaviconData, gFaviconData.length);
 }
 
-add_task(async function setup() {
+add_setup(async function() {
   // Make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.userContext.enabled", true]],

browser/components/contextualidentity/test/browser/browser_forgetAPI_EME_forgetThisSite.js

@@ -199,7 +199,7 @@ async function checkEMEKey(browser, emeSessionId) {
 // Test functions.
 //
 
-add_task(async function setup() {
+add_setup(async function() {
   // Make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [

browser/components/contextualidentity/test/browser/browser_forgetAPI_cookie_getCookiesWithOriginAttributes.js

@@ -37,7 +37,7 @@ function getCookiesForOA(host, userContextId) {
 // Test functions.
 //
 
-add_task(async function setup() {
+add_setup(async function() {
   // Make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.userContext.enabled", true]],

browser/components/contextualidentity/test/browser/browser_forgetAPI_quota_clearStoragesForPrincipal.js

@@ -107,7 +107,7 @@ async function checkIndexedDB(browser) {
 // Test functions.
 //
 
-add_task(async function setup() {
+add_setup(async function() {
   // Make sure userContext is enabled.
   await SpecialPowers.pushPrefEnv({
     set: [["privacy.userContext.enabled", true]],