From 950a3c620d10fdbc30d841e6922ce17b63801fed Mon Sep 17 00:00:00 2001 From: Sandor Molnar Date: Thu, 14 Sep 2023 20:29:06 +0300 Subject: [PATCH] Backed out 3 changesets (bug 1852963) for causing remote failures on remote/shared/messagehandler/test/browser/browser_session_data.js CLOSED TREE Backed out changeset 98de7bc404c3 (bug 1852963) Backed out changeset edf1527c9a99 (bug 1852963) Backed out changeset 34357750f69c (bug 1852963) --- .../browser/events/browser_test_docload.js | 18 ++++------- .../browser/events/browser_test_textcaret.js | 2 +- .../tests/mochitest/name/test_browserui.xhtml | 2 +- .../test/about/browser_aboutCertError.js | 4 +-- .../test/about/browser_aboutNetError.js | 6 ++-- .../about/browser_aboutNetError_csp_iframe.js | 2 +- .../about/browser_aboutNetError_xfo_iframe.js | 2 +- .../browser_aboutNewTab_bookmarksToolbar.js | 14 +++----- .../test/about/browser_aboutStopReload.js | 14 +++----- .../content/test/about/browser_bug435325.js | 2 +- browser/base/content/test/about/head.js | 2 +- .../browser_CaptivePortalWatcher_1.js | 2 +- .../browser_contextmenu_badiframe.js | 2 +- .../browser_contextmenu_loadblobinnewtab.js | 10 ++---- .../browser_contextmenu_spellcheck.js | 6 ++-- .../contextMenu/browser_contextmenu_touch.js | 2 +- .../test/favicons/browser_bug408415.js | 2 +- .../test/favicons/browser_bug550565.js | 2 +- .../test/favicons/browser_favicon_accept.js | 2 +- .../test/favicons/browser_favicon_auth.js | 2 +- .../test/favicons/browser_favicon_cache.js | 2 +- .../test/favicons/browser_favicon_change.js | 2 +- .../browser_favicon_change_not_in_document.js | 2 +- .../favicons/browser_favicon_credentials.js | 2 +- .../favicons/browser_favicon_crossorigin.js | 5 +-- .../test/favicons/browser_favicon_referer.js | 7 ++-- .../favicons/browser_invalid_href_fallback.js | 2 +- .../test/favicons/browser_missing_favicon.js | 4 +-- .../test/favicons/browser_oversized.js | 5 +-- .../content/test/favicons/browser_rooticon.js | 2 +- .../test/favicons/browser_title_flicker.js | 4 +-- .../test/forms/browser_selectpopup_large.js | 5 +-- .../test/fullscreen/browser_bug1557041.js | 2 +- .../test/general/browser_alltabslistener.js | 6 ++-- .../content/test/general/browser_bug417483.js | 2 +- .../content/test/general/browser_bug431826.js | 5 +-- .../content/test/general/browser_bug495058.js | 2 +- .../content/test/general/browser_bug519216.js | 2 +- .../content/test/general/browser_bug581253.js | 2 +- .../content/test/general/browser_bug623893.js | 4 +-- .../content/test/general/browser_bug624734.js | 2 +- .../content/test/general/browser_bug724239.js | 6 ++-- .../content/test/general/browser_bug734076.js | 2 +- .../general/browser_documentnavigation.js | 2 +- .../test/general/browser_findbarClose.js | 2 +- .../test/general/browser_refreshBlocker.js | 4 +-- .../test/general/browser_restore_isAppTab.js | 4 +-- .../general/browser_save_link-perwindowpb.js | 2 +- ...browser_save_link_when_window_navigates.js | 2 +- .../test/general/browser_save_video.js | 2 +- .../content/test/general/browser_star_hsts.js | 2 +- .../general/browser_tab_detach_restore.js | 2 +- .../test/general/browser_tab_dragdrop.js | 2 +- ...tOpenNewRemoteTabsFromNonRemoteBrowsers.js | 2 +- .../test/general/browser_typeAheadFind.js | 2 +- .../browser_unknownContentType_title.js | 4 +-- browser/base/content/test/general/head.js | 4 +-- .../gesture/browser_gesture_navigation.js | 8 ++--- .../keyboard/browser_toolbarButtonKeyPress.js | 2 +- .../test/keyboard/browser_toolbarKeyNav.js | 2 +- .../browser_file_menu_import_wizard.js | 2 +- .../browser_PageActions_overflow.js | 4 +-- .../browser_PageActions_removeExtension.js | 4 +-- .../test/pageStyle/browser_page_style_menu.js | 5 +-- .../browser_page_style_menu_update.js | 2 +- .../browser_pageinfo_firstPartyIsolation.js | 2 +- .../pageinfo/browser_pageinfo_svg_image.js | 2 +- .../browser_hidden_browser_vsync.js | 2 +- .../performance/browser_preferences_usage.js | 2 +- .../permissions/browser_autoplay_blocked.js | 8 ++--- .../test/permissions/browser_permissions.js | 2 +- browser/base/content/test/plugins/head.js | 2 +- .../content/test/popupNotifications/head.js | 2 +- .../base/content/test/protectionsUI/head.js | 2 +- .../test/siteIdentity/browser_bug822367.js | 12 +++---- .../test/siteIdentity/browser_bug902156.js | 2 +- .../browser_check_identity_state.js | 19 +++-------- .../browser_csp_block_all_mixedcontent.js | 2 +- .../browser_deprecatedTLSVersions.js | 10 +++--- .../siteIdentity/browser_getSecurityInfo.js | 9 ++---- .../browser_identityBlock_flicker.js | 5 +-- .../test/siteIdentity/browser_identity_UI.js | 2 +- .../browser_ignore_same_page_navigation.js | 2 +- .../test/siteIdentity/browser_mcb_redirect.js | 18 +++++------ .../browser_mixedContentFromOnunload.js | 6 ++-- .../browser_mixed_content_cert_override.js | 2 +- .../browser_mixed_content_with_navigation.js | 6 ++-- .../browser_navigation_failures.js | 6 ++-- .../browser_no_mcb_on_http_site.js | 4 +-- .../base/content/test/siteIdentity/head.js | 4 +-- .../browser_mediaPlayback.js | 2 +- .../browser_mediaPlayback_mute.js | 4 +-- ...browser_mediaplayback_audibility_change.js | 2 +- .../browser_mute_webAudio.js | 2 +- .../browser_sound_indicator_silent_video.js | 7 ++-- .../browser_webaudio_audibility_change.js | 2 +- .../test/tabPrompts/browser_contentOrigins.js | 2 +- .../browser_switchTabPermissionPrompt.js | 2 +- .../browser_multiple_dialog_navigation.js | 5 +-- .../test/tabdialogs/browser_subdialog_esc.js | 2 +- .../browser_tabdialogbox_navigation.js | 4 +-- ...rocess_switches_despite_related_browser.js | 2 +- .../content/test/tabs/browser_audioTabIcon.js | 2 +- .../browser_bfcache_exemption_about_pages.js | 2 +- .../tabs/browser_close_during_beforeunload.js | 2 +- ...contextmenu_openlink_after_tabnavigated.js | 5 +-- .../tabs/browser_dont_process_switch_204.js | 4 +-- .../test/tabs/browser_e10s_chrome_process.js | 4 +-- .../test/tabs/browser_e10s_switchbrowser.js | 7 ++-- .../test/tabs/browser_navigatePinnedTab.js | 7 ++-- ...navigate_through_urls_origin_attributes.js | 2 +- ...new_tab_in_privilegedabout_process_pref.js | 6 ++-- ...rowser_opened_file_tab_navigated_to_web.js | 2 +- .../content/test/tabs/browser_originalURI.js | 4 +-- .../browser_privilegedmozilla_process_pref.js | 6 ++-- .../test/tabs/browser_relatedTabs_reset.js | 2 +- .../browser_removeTabs_skipPermitUnload.js | 5 +-- ..._viewsource_of_data_URI_in_file_process.js | 2 +- ...mon_link_in_tab_title_and_url_prefilled.js | 4 +-- .../test/tabs/helper_origin_attrs_testing.js | 2 +- .../browser_extension_sideloading.js | 10 ++---- .../browser_extension_update_background.js | 10 ++---- ...er_extension_update_background_noprompt.js | 10 ++---- .../browser_permissions_installTrigger.js | 5 +-- .../browser_permissions_mozAddonManager.js | 5 +-- .../browser_permissions_unsigned.js | 2 +- .../browser_update_interactive_noprompt.js | 5 +-- .../base/content/test/webextensions/head.js | 5 +-- .../webrtc/browser_devices_get_user_media.js | 2 +- browser/base/content/test/zoom/head.js | 2 +- .../browser/browser_originattrs_reopenin.js | 2 +- ...browser_962069_drag_to_overflow_chevron.js | 2 +- .../browser_backfwd_enabled_post_customize.js | 4 +-- .../browser_exit_background_customize_mode.js | 2 +- .../test/browser_history_recently_closed.js | 4 +-- ...ser_history_recently_closed_middleclick.js | 2 +- .../test/browser_panel_locationSpecific.js | 2 +- .../components/customizableui/test/head.js | 2 +- .../test/browser/browser_about_downloads.js | 2 +- .../test/browser/browser_pdfjs_preview.js | 2 +- .../browser_policy_disable_developer_tools.js | 2 +- .../enterprisepolicies/tests/browser/head.js | 6 ++-- .../browser_ext_browserAction_contextMenu.js | 2 +- ...browser_ext_browserAction_popup_preload.js | 2 +- .../browser/browser_ext_commands_onCommand.js | 12 ++----- .../browser_ext_contentscript_sender_url.js | 4 +-- .../test/browser/browser_ext_currentWindow.js | 10 ++---- ...t_devtools_inspectedWindow_targetSwitch.js | 2 +- ...owser_ext_devtools_network_targetSwitch.js | 2 +- .../test/browser/browser_ext_find.js | 7 ++-- .../test/browser/browser_ext_menus_refresh.js | 2 +- ...ersistent_storage_permission_indication.js | 4 +-- .../browser_ext_sessions_getRecentlyClosed.js | 4 +-- ...ser_ext_sessions_getRecentlyClosed_tabs.js | 9 ++---- .../browser/browser_ext_sessions_restore.js | 10 ++---- .../test/browser/browser_ext_tabs_discard.js | 5 +-- .../browser/browser_ext_tabs_update_url.js | 2 +- .../test/browser/browser_ext_tabs_zoom.js | 2 +- .../test/browser/browser_ext_windows.js | 5 +-- ...rowser_unified_extensions_accessibility.js | 2 +- .../extensions/test/browser/head.js | 2 +- .../extensions/test/browser/head_devtools.js | 2 +- .../browser/browser_recently_closed_tabs.js | 2 +- .../tests/browser/browser_setup_state.js | 5 +-- .../browser/browser_tab_close_last_tab.js | 2 +- .../tests/browser/browser_dialog_open.js | 2 +- .../browser/browser_entrypoint_telemetry.js | 2 +- .../migration/tests/browser/head.js | 2 +- .../test/browser/abouthomecache/head.js | 2 +- .../browser/browser_aboutwelcome_observer.js | 2 +- .../test/browser/browser_asrouter_cfr.js | 32 +++++++++---------- .../browser_asrouter_group_frequency.js | 6 ++-- .../browser_asrouter_group_userprefs.js | 4 +-- .../test/browser/browser_asrouter_snippets.js | 2 +- .../browser_feature_callout_in_chrome.js | 6 ++-- .../test/browser/browser_newtab_ping.js | 4 +-- .../components/newtab/test/browser/head.js | 2 +- .../browser_firstPartyIsolation_aboutPages.js | 2 +- .../browser_firstPartyIsolation_blobURI.js | 2 +- .../browser_firstPartyIsolation_js_uri.js | 4 +-- .../tests/browser/browser_pagedata_basic.js | 2 +- .../tests/browser/browser_bookmark_titles.js | 4 +-- .../browser_library_bookmark_clear_visits.js | 2 +- .../browser_interactions_blocklist.js | 4 +-- .../browser_interactions_scrolling.js | 12 +++---- ...wser_interactions_scrolling_dom_history.js | 10 +++--- .../browser_interactions_typing.js | 8 ++--- ...browser_interactions_typing_dom_history.js | 10 +++--- .../browser_interactions_view_time.js | 28 +++++----------- .../test/browser_pocket_button_icon_state.js | 2 +- .../tests/browser_contentblocking.js | 10 ++---- .../browser_privatebrowsing_blobUrl.js | 4 +-- .../browser_privatebrowsing_cleanup.js | 2 +- .../browser_privatebrowsing_concurrent.js | 14 ++++---- .../browser/browser_privatebrowsing_crh.js | 4 +-- .../browser_privatebrowsing_localStorage.js | 2 +- ...owser_privatebrowsing_newtab_from_popup.js | 2 +- .../browser_privatebrowsing_rememberprompt.js | 4 +-- .../browser/browser_privatebrowsing_ui.js | 5 +-- .../browser_privatebrowsing_windowtitle.js | 2 +- .../browser_privatebrowsing_zoomrestore.js | 2 +- ...er_registerProtocolHandler_notification.js | 5 +-- .../content/test/browser_bug400731.js | 6 ++-- .../content/test/browser_bug415846.js | 2 +- .../safebrowsing/content/test/head.js | 2 +- .../search/test/browser/browser_426329.js | 24 ++++---------- .../test/browser/browser_google_behavior.js | 2 +- .../browser/browser_searchEngine_behaviors.js | 2 +- .../browser_search_telemetry_abandonment.js | 8 ++--- .../browser_search_telemetry_aboutHome.js | 2 +- ...search_telemetry_adImpression_component.js | 2 +- ...search_telemetry_engagement_cached_serp.js | 4 +-- ...earch_telemetry_engagement_query_params.js | 2 +- .../browser_search_telemetry_sources.js | 4 +-- .../browser_search_telemetry_sources_ads.js | 2 +- .../test/browser_394759_perwindowpb.js | 5 +-- .../sessionstore/test/browser_480893.js | 2 +- .../sessionstore/test/browser_500328.js | 2 +- .../test/browser_async_remove_tab.js | 2 +- .../test/browser_async_window_flushing.js | 4 +-- .../test/browser_background_tab_crash.js | 2 +- .../test/browser_backup_recovery.js | 2 +- .../test/browser_bfcache_telemetry.js | 2 +- .../sessionstore/test/browser_broadcast.js | 2 +- ...osed_objects_changed_notifications_tabs.js | 4 +-- ...d_objects_changed_notifications_windows.js | 4 +-- .../sessionstore/test/browser_crashedTabs.js | 30 ++++++++--------- .../test/browser_docshell_uuid_consistency.js | 2 +- .../browser_duplicate_tab_in_new_window.js | 2 +- .../sessionstore/test/browser_dying_cache.js | 10 ++---- .../test/browser_forget_async_closings.js | 2 +- .../sessionstore/test/browser_frametree.js | 2 +- .../test/browser_history_persist.js | 4 +-- .../browser_ignore_updates_crashed_tabs.js | 4 +-- .../browser_multiple_navigateAndRestore.js | 4 +-- .../browser_restoreLastActionCorrectOrder.js | 2 +- ...r_restoreLastClosedTabOrWindowOrSession.js | 4 +-- .../test/browser_restore_reversed_z_order.js | 5 +-- .../test/browser_restored_window_features.js | 5 +-- .../test/browser_scrollPositions.js | 2 +- .../test/browser_sessionHistory.js | 6 ++-- .../test/browser_sessionStorage.js | 2 +- .../test/browser_should_restore_tab.js | 2 +- .../test/browser_switch_remoteness.js | 4 +-- .../test/browser_undoCloseById.js | 4 +-- .../browser_undoCloseById_targetWindow.js | 4 +-- .../tests/browser/browser_private_mode.js | 2 +- .../tests/browser/browser_shopping_urlbar.js | 10 +++--- .../browser_touchbar_searchrestrictions.js | 2 +- .../tests/browser/browser_touchbar_tests.js | 2 +- .../translations/tests/browser/head.js | 4 +-- .../test/browser_UITour_private_browsing.js | 2 +- .../tests/browser-tips/browser_searchTips.js | 4 +-- .../browser_searchTips_interaction.js | 25 +++++---------- .../browser_UrlbarInput_searchTerms.js | 4 +-- ...ser_UrlbarInput_searchTerms_modifiedUrl.js | 4 +-- ...browser_UrlbarInput_searchTerms_moveTab.js | 2 +- ...owser_UrlbarInput_searchTerms_telemetry.js | 2 +- .../browser/browser_UrlbarInput_setURI.js | 2 +- .../browser/browser_UrlbarInput_trimURLs.js | 2 +- .../tests/browser/browser_aboutHomeLoading.js | 4 +-- .../urlbar/tests/browser/browser_autoOpen.js | 2 +- .../tests/browser/browser_contextualsearch.js | 10 ++---- .../urlbar/tests/browser/browser_copying.js | 2 +- .../tests/browser/browser_dynamicResults.js | 5 +-- .../browser_inputHistory_emptystring.js | 5 +-- .../urlbar/tests/browser/browser_loadRace.js | 2 +- .../tests/browser/browser_quickactions.js | 15 ++++----- .../browser/browser_quickactions_devtools.js | 2 +- .../browser_quickactions_screenshot.js | 2 +- .../browser_quickactions_tab_refocus.js | 2 +- .../tests/browser/browser_redirect_error.js | 2 +- .../browser/browser_remoteness_switch.js | 2 +- .../browser/browser_retainedResultsOnFocus.js | 5 +-- .../browser/browser_searchMode_switchTabs.js | 2 +- .../tests/browser/browser_stop_pending.js | 2 +- .../browser/browser_switchToTab_chiclet.js | 16 ++-------- .../browser/browser_tabMatchesInAwesomebar.js | 2 +- .../browser_urlbar_telemetry_handoff.js | 2 +- .../browser_urlbar_telemetry_persisted.js | 2 +- .../tests/browser/browser_valueOnTabSwitch.js | 6 ++-- .../browser/browser_view_selectionByMouse.js | 7 ++-- ...an_telemetry_engagement_selected_result.js | 2 +- .../engagementTelemetry/browser/head-sap.js | 4 +-- ...rowser_autocomplete_marked_back_forward.js | 2 +- .../browser_server_side_redirection.js | 4 +-- .../browser_SitePermissions_tab_urls.js | 8 ++--- ...elemetry_numberOfSiteOriginsPerDocument.js | 4 +-- .../test/browser/browser_UsageTelemetry.js | 17 +++------- .../browser/browser_UsageTelemetry_domains.js | 18 ++++------- ...wser_UsageTelemetry_private_and_restore.js | 2 +- .../formValidation/browser_form_validation.js | 7 ++-- .../extension/TestRunner.sys.mjs | 4 +-- .../configurations/ControlCenter.sys.mjs | 4 +-- ...owser_browser_toolbox_watchedByDevTools.js | 2 +- ...ser_toolbox_backward_forward_navigation.js | 4 +-- ...browser_animation_fission_switch-target.js | 2 +- ...rowser_compatibility_event_panel-select.js | 2 +- ...atibility_event_top-level-target-change.js | 2 +- ...ser_inspector_remove-iframe-during-load.js | 2 +- .../test/browser_net_image_cache.js | 5 +-- .../netmonitor/test/browser_net_initiator.js | 2 +- .../test/browser/browser_max_touchpoints.js | 2 +- .../browser_orientationchange_event.js | 2 +- .../test/browser/browser_page_redirection.js | 2 +- devtools/client/shared/test/shared-head.js | 2 +- ...wser_webconsole_warn_about_replaced_api.js | 5 +-- ...r_resources_console_messages_navigation.js | 2 +- .../browser_resources_document_events.js | 12 ++----- .../tests/browser_resources_network_events.js | 2 +- .../tests/browser_resources_root_node.js | 5 +-- .../tests/browser_resources_sources.js | 8 +---- ...rowser_resources_stylesheets_navigation.js | 2 +- .../browser_resources_target_switching.js | 7 ++-- ...rget_configuration_command_color_scheme.js | 2 +- ...configuration_command_custom_user_agent.js | 2 +- ...owser_target_configuration_command_dppx.js | 2 +- ...rget_configuration_command_touch_events.js | 2 +- .../tests/browser_target_command_bfcache.js | 10 ++---- .../tests/browser_target_command_frames.js | 6 ++-- ...rget_command_service_workers_navigation.js | 30 ++++------------- .../browser_target_command_tab_workers.js | 2 +- ..._command_tab_workers_bfcache_navigation.js | 2 +- ...wser_target_command_various_descriptors.js | 2 +- .../network-observer/test/browser/head.js | 2 +- .../browser_backforward_restore_scroll.js | 2 +- .../browser/browser_badCertDomainFixup.js | 4 +-- .../browser/browser_bfcache_copycommand.js | 2 +- .../browser_browsingContext-webProgress.js | 4 +-- ...ug1309900_crossProcessHistoryNavigation.js | 4 +-- docshell/test/browser/browser_bug1347823.js | 4 +-- ...browser_bug1415918_beforeunload_options.js | 2 +- docshell/test/browser/browser_bug1673702.js | 2 +- docshell/test/browser/browser_bug1674464.js | 2 +- docshell/test/browser/browser_bug1691153.js | 2 +- docshell/test/browser/browser_bug1705872.js | 2 +- docshell/test/browser/browser_bug1757005.js | 2 +- docshell/test/browser/browser_bug1798780.js | 2 +- docshell/test/browser/browser_bug349769.js | 2 +- docshell/test/browser/browser_bug420605.js | 2 +- docshell/test/browser/browser_bug422543.js | 4 +-- docshell/test/browser/browser_bug670318.js | 2 +- .../browser_dataURI_unique_opaque_origin.js | 2 +- .../browser_frameloader_swap_with_bfcache.js | 2 +- .../test/browser/browser_onunload_stop.js | 2 +- ...browser_targetTopLevelLinkClicksToBlank.js | 6 ++-- .../browser_viewsource_chrome_to_content.js | 2 +- .../browser/browser_viewsource_multipart.js | 7 ++-- docshell/test/browser/head.js | 2 +- docshell/test/chrome/bug215405_window.xhtml | 8 ++--- docshell/test/chrome/docshell_helpers.js | 2 +- .../test/navigation/browser_bug1757458.js | 2 +- docshell/test/navigation/browser_bug343515.js | 4 +-- .../browser_ghistorymaxsize_is_0.js | 2 +- .../browser_test_bfcache_eviction.js | 2 +- .../browser_test_shentry_wireframe.js | 2 +- ...t_simultaneous_normal_and_history_loads.js | 2 +- .../browser_aboutnewtab_process_selection.js | 2 +- dom/base/test/browser_bug1554070.js | 2 +- dom/base/test/browser_bug902350.js | 2 +- .../browser_chromeutils_getalldomprocesses.js | 5 +-- ...rowser_messagemanager_loadprocessscript.js | 10 ++---- .../test/browser_page_load_event_telemetry.js | 2 +- dom/base/test/browser_state_notifications.js | 4 +-- ..._timeout_throttling_with_audio_playback.js | 2 +- .../chrome/test_chromeOuterWindowID.xhtml | 4 +-- ...wser_fullscreen-navigation-history-race.js | 2 +- .../browser_fullscreen-navigation-history.js | 2 +- dom/events/test/test_bug415498.xhtml | 4 +-- dom/events/test/test_bug617528.xhtml | 2 +- .../test/browser_DOMDocElementInserted.js | 2 +- dom/indexedDB/test/browser_forgetThisSite.js | 20 +++--------- .../JSWindowActor/browser_contentWindow.js | 2 +- .../tests/browser_ProcessPriorityManager.js | 4 +-- dom/ipc/tests/browser_bug1646088.js | 2 +- dom/ipc/tests/browser_cancel_content_js.js | 2 +- dom/ipc/tests/browser_hide_tooltip.js | 2 +- .../browser_autoplay_policy_play_twice.js | 2 +- .../browser_autoplay_policy_user_gestures.js | 4 +-- .../browser/browser_media_control_metadata.js | 2 +- .../browser_active_mediasession_among_tabs.js | 2 +- .../test/browser/wmfme/browser_wmfme_crash.js | 2 +- .../wmfme/browser_wmfme_max_crashes.js | 2 +- .../test/mochitest/browser_blockallplugins.js | 2 +- .../browser/browser_permissionsPromptAllow.js | 4 +-- .../browser/browser_permissionsPromptDeny.js | 8 ++--- .../browser_permissionsPromptUnknown.js | 5 +-- .../cors/browser_CORS-console-warnings.js | 4 +-- .../browser_same_site_cookies_bug1748693.js | 4 +-- .../general/browser_test_data_download.js | 4 +-- .../general/browser_test_data_text_csv.js | 4 +-- .../browser_test_framing_error_pages.js | 4 +-- .../general/browser_test_report_blocking.js | 6 ++-- .../general/browser_test_xfo_embed_object.js | 4 +-- .../browser_beforeunload_permit_http.js | 10 +++--- ...rade_mixed_content_auto_upgrade_console.js | 4 +-- .../browser_downgrade_view_source.js | 2 +- .../https-first/browser_download_attribute.js | 2 +- .../test/https-first/browser_httpsfirst.js | 2 +- .../browser_httpsfirst_console_logging.js | 5 ++- .../browser_httpsfirst_speculative_connect.js | 4 +-- .../browser_mixed_content_console.js | 2 +- .../test/https-first/browser_navigation.js | 2 +- .../test/https-first/browser_slow_download.js | 2 +- .../test/https-first/browser_upgrade_onion.js | 2 +- .../https-only/browser_background_redirect.js | 2 +- .../https-only/browser_console_logging.js | 5 +-- .../https-only/browser_cors_mixedcontent.js | 5 +-- .../test/https-only/browser_hsts_host.js | 27 ++-------------- .../browser_httpsonly_speculative_connect.js | 4 +-- .../test/https-only/browser_iframe_test.js | 2 +- .../test/https-only/browser_navigation.js | 2 +- .../test/https-only/browser_user_gesture.js | 2 +- .../browser_websocket_exceptions.js | 2 +- ...ed_content_auto_upgrade_display_console.js | 2 +- ...r_referrer_disallow_cross_site_relaxing.js | 4 +-- .../test/sec-fetch/browser_navigation.js | 2 +- .../test/browser_antitracking.js | 7 ++-- .../test/browser_antitracking_subiframes.js | 7 ++-- dom/serviceworkers/test/browser_download.js | 2 +- .../test/browser_force_refresh.js | 2 +- ...rowser_intercepted_channel_process_swap.js | 2 +- .../test/browser_intercepted_worker_script.js | 2 +- ...avigationPreload_read_after_respondWith.js | 10 ++---- .../test/browser_remote_type_process_swap.js | 2 +- .../test/test_privateBrowsing.html | 2 +- ...rowser_ConsoleStoragePBTest_perwindowpb.js | 5 +-- .../browser/browser_autofocus_background.js | 2 +- .../browser/browser_autofocus_preference.js | 2 +- ...ser_beforeunload_between_chrome_content.js | 4 +-- dom/tests/browser/browser_bug1236512.js | 5 +-- dom/tests/browser/browser_bug1563629.js | 2 +- ...owser_data_document_crossOriginIsolated.js | 2 +- .../browser_focus_steal_from_chrome.js | 12 +++---- dom/tests/browser/browser_hasbeforeunload.js | 4 +-- ...rowser_navigate_replace_browsingcontext.js | 4 +-- dom/tests/browser/browser_persist_cookies.js | 2 +- .../browser_sessionStorage_navigation.js | 14 ++++---- .../browser_test_new_window_from_content.js | 2 +- .../browser/browser_windowProxy_transplant.js | 2 +- dom/tests/browser/helper_localStorage.js | 2 +- .../mochitest/beacon/test_beaconCookies.html | 4 +-- .../test_beaconWithSafelistedContentType.html | 2 +- .../test/browser_worker_use_counters.js | 2 +- .../test_sharedWorker_privateBrowsing.html | 2 +- dom/xhr/tests/browser_xhr_onchange_leak.js | 2 +- dom/xslt/tests/browser/browser_bug1309630.js | 4 +-- ...ffscreen_image_in_out_of_process_iframe.js | 2 +- layout/base/tests/browser_bug1791083.js | 2 +- .../browser_disableDialogs_onbeforeunload.js | 4 +-- ...r_onbeforeunload_only_after_interaction.js | 4 +-- ...eunload_only_after_interaction_in_frame.js | 4 +-- ...popup_position_in_out_of_process_iframe.js | 5 +-- .../browser/browser_103_private_window.js | 2 +- netwerk/test/browser/browser_bug1629307.js | 4 +-- netwerk/test/browser/browser_post_auth.js | 5 +-- netwerk/test/browser/browser_post_file.js | 2 +- remote/cdp/test/browser/head.js | 2 +- .../browser_emulateNetworkConditions.js | 2 +- .../page/browser_navigatedWithinDocument.js | 2 +- .../browser_setIgnoreCertificateErrors.js | 10 +++--- remote/shared/listeners/test/browser/head.js | 2 +- .../test/browser/browser_session_data.js | 5 ++- .../messagehandler/test/browser/head.js | 2 +- .../test/browser/browser_NavigationManager.js | 6 ++-- remote/shared/test/browser/head.js | 2 +- remote/webdriver-bidi/test/browser/head.js | 2 +- .../browser/browser_add_exception_dialog.js | 2 +- .../browser/browser_bug627234_perwindowpb.js | 5 +-- .../browser_clientAuthRememberService.js | 5 +-- .../browser/browser_clientAuth_connection.js | 5 +-- .../tests/browser/browser_device_connected.js | 5 +-- .../tests/browser/browser_verify_login.js | 5 +-- .../BrowserTestUtils/BrowserTestUtils.sys.mjs | 13 ++------ .../alerts/test/browser_bug1682866.js | 2 +- .../test/browser/antitracking_head.js | 2 +- .../browser_staticPartition_CORS_preflight.js | 5 +-- .../browser/browser_staticPartition_HSTS.js | 4 +-- .../browser/browser_staticPartition_cache.js | 2 +- .../browser/browser_cookiebanner_telemetry.js | 8 ++--- .../test/browser/browser_cookieinjector.js | 10 +++--- ...rowser_ext_extension_page_tab_navigated.js | 4 +-- .../tests/browser/browser_errorpage.js | 2 +- .../browser/browser_errorpage_timeout.js | 2 +- .../browser_errorpage_www_suggestion.js | 5 +-- .../browser_sma_show_migration_wizard.js | 2 +- .../browser_asrouter_trigger_listeners.js | 2 +- .../mozprotocol/tests/browser_mozprotocol.js | 2 +- .../browser/browser_DOMFormHasPassword.js | 2 +- .../browser_DOMFormHasPossibleUsername.js | 6 ++-- .../browser/browser_DOMInputPasswordAdded.js | 2 +- .../browser_autofill_hidden_document.js | 6 ++-- .../browser/browser_basicAuth_multiTab.js | 2 +- .../browser/browser_basicAuth_rateLimit.js | 4 +-- .../browser/browser_basicAuth_switchTab.js | 2 +- .../browser/browser_formless_submit_chrome.js | 4 +-- .../test/browser/browser_private_window.js | 4 +-- .../test/browser_pdfjs_download_button.js | 2 +- .../pdfjs/test/browser_pdfjs_find.js | 2 +- ..._pdfjs_notification_close_on_navigation.js | 2 +- toolkit/components/pdfjs/test/head.js | 8 ++--- .../places/tests/browser/browser_bug399606.js | 2 +- .../places/tests/browser/browser_bug680727.js | 5 +-- ...ser_favicon_privatebrowsing_perwindowpb.js | 5 +-- .../places/tests/browser/browser_settitle.js | 2 +- .../browser/browser_visituri_nohistory.js | 2 +- ...er_visituri_privatebrowsing_perwindowpb.js | 2 +- toolkit/components/printing/tests/head.js | 2 +- .../reader/test/browser_readerMode.js | 10 +++--- .../test/browser_readerMode_hidden_nodes.js | 2 +- .../test/browser_readerMode_remoteType.js | 2 +- ...ser_readerMode_samesite_cookie_redirect.js | 2 +- toolkit/components/reader/test/head.js | 2 +- .../tests/browser/browser_documentChannel.js | 2 +- .../browser_httpCrossOriginOpenerPolicy.js | 12 +++---- .../browser/browser_httpToFileHistory.js | 2 +- .../browser_privbrowsing_perwindowpb.js | 2 +- .../browser/browser_shopping_integration.js | 6 ++-- .../test/browser_thumbnails_bug726727.js | 2 +- .../test/browser_thumbnails_capture.js | 4 +-- .../test/browser_thumbnails_update.js | 4 +-- .../translations/tests/browser/shared-head.js | 12 ++----- .../tests/mochitest/test_advisory_link.html | 2 +- .../tests/mochitest/test_reporturl.html | 4 +-- .../mochitest/test_threathit_report.html | 2 +- .../test_trackingprotection_bug1312515.html | 6 ++-- .../test_trackingprotection_bug1580416.html | 4 +-- .../test_trackingprotection_whitelist.html | 4 +-- .../test/browser_non_popup_from_popup.js | 2 +- toolkit/components/windowwatcher/test/head.js | 6 ++-- .../browser/browser_autoscroll_disabled.js | 2 +- .../tests/browser/browser_bug1170531.js | 8 ++--- .../tests/browser/browser_bug1572798.js | 2 +- .../browser_bug295977_autoscroll_overflow.js | 2 +- .../tests/browser/browser_bug982298.js | 2 +- .../browser/browser_content_url_annotation.js | 2 +- ..._delay_autoplay_cross_origin_navigation.js | 2 +- .../browser/browser_delay_autoplay_media.js | 2 +- .../browser_delay_autoplay_multipleMedia.js | 2 +- ...r_delay_autoplay_silentAudioTrack_media.js | 4 +-- .../browser_delay_autoplay_webAudio.js | 2 +- .../content/tests/browser/browser_findbar.js | 2 +- .../tests/browser/browser_isSynthetic.js | 4 +-- .../browser_remoteness_change_listeners.js | 2 +- .../browser_resume_bkg_video_on_tab_hover.js | 2 +- .../browser/browser_save_resend_postdata.js | 2 +- .../tests/chrome/bug263683_window.xhtml | 4 +-- .../tests/chrome/bug304188_window.xhtml | 2 +- .../tests/chrome/bug331215_window.xhtml | 2 +- .../tests/chrome/bug360437_window.xhtml | 2 +- .../tests/chrome/bug409624_window.xhtml | 2 +- .../tests/chrome/bug429723_window.xhtml | 2 +- .../tests/chrome/bug451540_window.xhtml | 2 +- .../chrome/findbar_entireword_window.xhtml | 2 +- .../tests/chrome/findbar_events_window.xhtml | 2 +- .../content/tests/chrome/findbar_window.xhtml | 2 +- .../test/browser/browser_bug471404.js | 2 +- .../browser/browser_FinderHighlighter.js | 2 +- .../browser/browser_history_navigation.js | 7 ++-- .../xpinstall/browser_amosigned_trigger.js | 2 +- .../browser_amosigned_trigger_iframe.js | 2 +- .../test/xpinstall/browser_amosigned_url.js | 5 +-- .../extensions/test/xpinstall/browser_auth.js | 2 +- .../test/xpinstall/browser_auth2.js | 2 +- .../test/xpinstall/browser_auth3.js | 2 +- .../test/xpinstall/browser_auth4.js | 2 +- .../test/xpinstall/browser_badargs.js | 2 +- .../test/xpinstall/browser_badargs2.js | 2 +- .../test/xpinstall/browser_badhash.js | 2 +- .../test/xpinstall/browser_badhashtype.js | 2 +- .../test/xpinstall/browser_bug540558.js | 2 +- .../test/xpinstall/browser_bug611242.js | 5 +-- .../test/xpinstall/browser_bug645699.js | 2 +- .../browser_bug645699_postDownload.js | 2 +- .../test/xpinstall/browser_bug672485.js | 2 +- .../test/xpinstall/browser_containers.js | 2 +- .../test/xpinstall/browser_cookies.js | 2 +- .../test/xpinstall/browser_cookies2.js | 2 +- .../test/xpinstall/browser_cookies3.js | 2 +- .../test/xpinstall/browser_cookies4.js | 2 +- .../test/xpinstall/browser_corrupt.js | 2 +- .../xpinstall/browser_doorhanger_installs.js | 11 +++---- .../test/xpinstall/browser_empty.js | 2 +- .../extensions/test/xpinstall/browser_hash.js | 2 +- .../test/xpinstall/browser_hash2.js | 2 +- .../test/xpinstall/browser_httphash.js | 2 +- .../test/xpinstall/browser_httphash2.js | 2 +- .../test/xpinstall/browser_httphash3.js | 2 +- .../test/xpinstall/browser_httphash4.js | 2 +- .../test/xpinstall/browser_httphash5.js | 2 +- .../test/xpinstall/browser_httphash6.js | 2 +- .../test/xpinstall/browser_installchrome.js | 2 +- .../test/xpinstall/browser_localfile.js | 2 +- .../test/xpinstall/browser_localfile3.js | 2 +- .../test/xpinstall/browser_localfile4.js | 2 +- .../browser_localfile4_postDownload.js | 2 +- .../test/xpinstall/browser_offline.js | 7 ++-- .../test/xpinstall/browser_privatebrowsing.js | 2 +- .../test/xpinstall/browser_relative.js | 2 +- .../test/xpinstall/browser_signed_url.js | 5 +-- .../test/xpinstall/browser_softwareupdate.js | 2 +- .../xpinstall/browser_trigger_redirect.js | 5 +-- .../xpinstall/browser_unsigned_trigger.js | 2 +- .../browser_unsigned_trigger_iframe.js | 2 +- .../browser_unsigned_trigger_xorigin.js | 2 +- .../test/xpinstall/browser_unsigned_url.js | 2 +- .../browser_test_marker_network_cancel.js | 2 +- ...er_test_marker_network_private_browsing.js | 2 +- .../browser/browser_test_profile_fission.js | 4 +-- ...ser_test_profile_single_frame_page_info.js | 2 +- ...ser_download_open_with_internal_handler.js | 7 ++-- .../browser_download_preferred_action.js | 7 ++-- ...pt_not_blocked_without_user_interaction.js | 2 +- .../browser_ftp_protocol_handlers.js | 2 +- .../mochitest/browser_protocol_ask_dialog.js | 7 ++-- .../browser_protocol_ask_dialog_permission.js | 4 +-- .../mochitest/browser_protocolhandler_loop.js | 2 +- .../browser_web_handler_app_pinned_tab.js | 2 +- .../browser_web_protocol_handlers.js | 2 +- .../browser/browser_test_swipe_gesture.js | 28 ++++++++-------- widget/tests/test_bug428405.xhtml | 4 +-- 621 files changed, 1011 insertions(+), 1470 deletions(-) diff --git a/accessible/tests/browser/events/browser_test_docload.js b/accessible/tests/browser/events/browser_test_docload.js index 78ac77fd8c5e..11ba90db19cb 100644 --- a/accessible/tests/browser/events/browser_test_docload.js +++ b/accessible/tests/browser/events/browser_test_docload.js @@ -43,7 +43,7 @@ async function runTests(browser, accDoc) { ], }); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, `data:text/html;charset=utf-8, @@ -59,7 +59,7 @@ async function runTests(browser, accDoc) { [EVENT_REORDER, getAccessible(browser)], ]); - BrowserTestUtils.startLoadingURIString(browser, "about:about"); + BrowserTestUtils.loadURIString(browser, "about:about"); await onLoadEvents; @@ -79,7 +79,7 @@ async function runTests(browser, accDoc) { [EVENT_REORDER, getAccessible(browser)], ]); - BrowserTestUtils.startLoadingURIString(browser, "about:mozilla"); + BrowserTestUtils.loadURIString(browser, "about:mozilla"); await onLoadEvents; @@ -100,11 +100,8 @@ async function runTests(browser, accDoc) { [EVENT_REORDER, getAccessible(browser)], ]); - BrowserTestUtils.startLoadingURIString( - browser, - // eslint-disable-next-line @microsoft/sdl/no-insecure-url - "http://www.wronguri.wronguri/" - ); + // eslint-disable-next-line @microsoft/sdl/no-insecure-url + BrowserTestUtils.loadURIString(browser, "http://www.wronguri.wronguri/"); await onLoadEvents; @@ -114,10 +111,7 @@ async function runTests(browser, accDoc) { [EVENT_REORDER, getAccessible(browser)], ]); - BrowserTestUtils.startLoadingURIString( - browser, - "https://nocert.example.com:443/" - ); + BrowserTestUtils.loadURIString(browser, "https://nocert.example.com:443/"); await onLoadEvents; } diff --git a/accessible/tests/browser/events/browser_test_textcaret.js b/accessible/tests/browser/events/browser_test_textcaret.js index e0f6f1a176be..d5065c81f3d5 100644 --- a/accessible/tests/browser/events/browser_test_textcaret.js +++ b/accessible/tests/browser/events/browser_test_textcaret.js @@ -19,7 +19,7 @@ function caretMoveChecker(target, caretOffset) { async function checkURLBarCaretEvents() { const kURL = "about:mozilla"; let newWin = await BrowserTestUtils.openNewBrowserWindow(); - BrowserTestUtils.startLoadingURIString(newWin.gBrowser.selectedBrowser, kURL); + BrowserTestUtils.loadURIString(newWin.gBrowser.selectedBrowser, kURL); newWin.gBrowser.selectedBrowser.focus(); await waitForEvent(EVENT_DOCUMENT_LOAD_COMPLETE, event => { diff --git a/accessible/tests/mochitest/name/test_browserui.xhtml b/accessible/tests/mochitest/name/test_browserui.xhtml index d7834eb3c0ba..8031b1b85ac9 100644 --- a/accessible/tests/mochitest/name/test_browserui.xhtml +++ b/accessible/tests/mochitest/name/test_browserui.xhtml @@ -34,7 +34,7 @@ let docLoaded = waitForEvent(EVENT_DOCUMENT_LOAD_COMPLETE, event => event.accessible.QueryInterface(nsIAccessibleDocument).URL === ABOUT_LICENSE_URL, `Loaded tab: ${ABOUT_LICENSE_URL}`); - BrowserTestUtils.startLoadingURIString(win.gBrowser.selectedBrowser, + BrowserTestUtils.loadURIString(win.gBrowser.selectedBrowser, "about:license"); await loaded; await docLoaded; diff --git a/browser/base/content/test/about/browser_aboutCertError.js b/browser/base/content/test/about/browser_aboutCertError.js index 233ea3c64203..7f1f8149fafa 100644 --- a/browser/base/content/test/about/browser_aboutCertError.js +++ b/browser/base/content/test/about/browser_aboutCertError.js @@ -84,7 +84,7 @@ add_task(async function checkReturnToPreviousPage() { tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, GOOD_PAGE); browser = tab.linkedBrowser; - BrowserTestUtils.startLoadingURIString(browser, GOOD_PAGE_2); + BrowserTestUtils.loadURIString(browser, GOOD_PAGE_2); await BrowserTestUtils.browserLoaded(browser, false, GOOD_PAGE_2); await injectErrorPageFrame(tab, BAD_CERT); } else { @@ -93,7 +93,7 @@ add_task(async function checkReturnToPreviousPage() { info("Loading and waiting for the cert error"); let certErrorLoaded = BrowserTestUtils.waitForErrorPage(browser); - BrowserTestUtils.startLoadingURIString(browser, BAD_CERT); + BrowserTestUtils.loadURIString(browser, BAD_CERT); await certErrorLoaded; } diff --git a/browser/base/content/test/about/browser_aboutNetError.js b/browser/base/content/test/about/browser_aboutNetError.js index 8cc804cd9de0..0f98413f3310 100644 --- a/browser/base/content/test/about/browser_aboutNetError.js +++ b/browser/base/content/test/about/browser_aboutNetError.js @@ -213,7 +213,7 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() { await BrowserTestUtils.withNewTab( { gBrowser, url: "about:blank" }, async browser => { - BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE); + BrowserTestUtils.loadURIString(browser, TRIPLEDES_PAGE); await BrowserTestUtils.waitForErrorPage(browser); } ); @@ -223,7 +223,7 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() { await BrowserTestUtils.withNewTab( { gBrowser, url: "about:blank" }, async browser => { - BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE); + BrowserTestUtils.loadURIString(browser, TRIPLEDES_PAGE); await BrowserTestUtils.browserLoaded(browser, false, TRIPLEDES_PAGE); } ); @@ -236,7 +236,7 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() { await BrowserTestUtils.withNewTab( { gBrowser, url: "about:blank" }, async browser => { - BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE); + BrowserTestUtils.loadURIString(browser, TRIPLEDES_PAGE); await BrowserTestUtils.waitForErrorPage(browser); } ); diff --git a/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js b/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js index c8028a4cf436..21e2ba7b51e2 100644 --- a/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js +++ b/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js @@ -80,7 +80,7 @@ async function setupPage(htmlPageName, blockedPage) { true ); - BrowserTestUtils.startLoadingURIString(browser, iFramePage); + BrowserTestUtils.loadURIString(browser, iFramePage); await browserLoaded; info("The error page has loaded!"); diff --git a/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js b/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js index f5fd2406434e..ae4d5c22a219 100644 --- a/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js +++ b/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js @@ -80,7 +80,7 @@ async function setupPage(htmlPageName, blockedPage) { true ); - BrowserTestUtils.startLoadingURIString(browser, iFramePage); + BrowserTestUtils.loadURIString(browser, iFramePage); await browserLoaded; info("The error page has loaded!"); diff --git a/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js b/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js index aaa6eac8bd2b..c566276d9f62 100644 --- a/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js +++ b/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js @@ -18,10 +18,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() { ok(isBookmarksToolbarVisible(), "Toolbar should be visible on newtab"); // 2: Test that the toolbar is hidden when the browser is navigated away from newtab - BrowserTestUtils.startLoadingURIString( - newtab.linkedBrowser, - "https://example.com" - ); + BrowserTestUtils.loadURIString(newtab.linkedBrowser, "https://example.com"); await BrowserTestUtils.browserLoaded(newtab.linkedBrowser); await waitForBookmarksToolbarVisibility({ visible: false, @@ -34,7 +31,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() { ); // 3: Re-load about:newtab in the browser for the following tests and confirm toolbar reappears - BrowserTestUtils.startLoadingURIString(newtab.linkedBrowser, "about:newtab"); + BrowserTestUtils.loadURIString(newtab.linkedBrowser, "about:newtab"); await BrowserTestUtils.browserLoaded(newtab.linkedBrowser); await waitForBookmarksToolbarVisibility({ visible: true, @@ -68,7 +65,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() { }); // 7: Similar to #3 above, loading about:newtab in example should show toolbar - BrowserTestUtils.startLoadingURIString(example.linkedBrowser, "about:newtab"); + BrowserTestUtils.loadURIString(example.linkedBrowser, "about:newtab"); await BrowserTestUtils.browserLoaded(example.linkedBrowser); await waitForBookmarksToolbarVisibility({ visible: true, @@ -91,10 +88,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() { await BrowserTestUtils.switchTab(gBrowser, newtab); await waitForBookmarksToolbarVisibility({ visible: false }); ok(!isBookmarksToolbarVisible(), "Toolbar should hide with custom newtab"); - BrowserTestUtils.startLoadingURIString( - example.linkedBrowser, - AboutNewTab.newTabURL - ); + BrowserTestUtils.loadURIString(example.linkedBrowser, AboutNewTab.newTabURL); await BrowserTestUtils.browserLoaded(example.linkedBrowser); await BrowserTestUtils.switchTab(gBrowser, example); await waitForBookmarksToolbarVisibility({ visible: true }); diff --git a/browser/base/content/test/about/browser_aboutStopReload.js b/browser/base/content/test/about/browser_aboutStopReload.js index 21507509bcb3..66c11a3de332 100644 --- a/browser/base/content/test/about/browser_aboutStopReload.js +++ b/browser/base/content/test/about/browser_aboutStopReload.js @@ -57,7 +57,7 @@ add_task(async function checkDontShowStopFromLocalURI() { stopReloadContainerObserver.observe(stopReloadContainer, { attributeFilter: ["animate"], }); - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, "about:mozilla"); + BrowserTestUtils.loadURIString(tab.linkedBrowser, "about:mozilla"); BrowserTestUtils.removeTab(tab); Assert.ok( @@ -82,7 +82,7 @@ add_task(async function checkDontShowStopFromNonLocalURI() { stopReloadContainerObserver.observe(stopReloadContainer, { attributeFilter: ["animate"], }); - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, "about:mozilla"); + BrowserTestUtils.loadURIString(tab.linkedBrowser, "about:mozilla"); BrowserTestUtils.removeTab(tab); Assert.ok( @@ -132,10 +132,7 @@ add_task(async function checkAnimateStopOnTabAfterTabFinishesOpening() { return !gBrowser.tabAnimationsInProgress; }); let animatePromise = getAnimatePromise(stopReloadContainer); - BrowserTestUtils.startLoadingURIString( - tab.linkedBrowser, - "https://example.com" - ); + BrowserTestUtils.loadURIString(tab.linkedBrowser, "https://example.com"); await animatePromise; BrowserTestUtils.removeTab(tab); @@ -161,10 +158,7 @@ add_task(async function checkDoShowStopFromLocalURI() { return !gBrowser.tabAnimationsInProgress; }); let animatePromise = getAnimatePromise(stopReloadContainer); - BrowserTestUtils.startLoadingURIString( - tab.linkedBrowser, - "https://example.com" - ); + BrowserTestUtils.loadURIString(tab.linkedBrowser, "https://example.com"); await animatePromise; await waitForNoAnimation(stopReloadContainer); BrowserTestUtils.removeTab(tab); diff --git a/browser/base/content/test/about/browser_bug435325.js b/browser/base/content/test/about/browser_bug435325.js index 6fef28273088..70a3b272a90d 100644 --- a/browser/base/content/test/about/browser_bug435325.js +++ b/browser/base/content/test/about/browser_bug435325.js @@ -22,7 +22,7 @@ add_task(async function checkSwitchPageToOnlineMode() { let netErrorLoaded = BrowserTestUtils.waitForErrorPage(browser); // eslint-disable-next-line @microsoft/sdl/no-insecure-url - BrowserTestUtils.startLoadingURIString(browser, "http://example.com/"); + BrowserTestUtils.loadURIString(browser, "http://example.com/"); await netErrorLoaded; // Re-enable the proxy so example.com is resolved to localhost, rather than diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js index 29a17fcdbd4a..c723fbee3384 100644 --- a/browser/base/content/test/about/head.js +++ b/browser/base/content/test/about/head.js @@ -142,7 +142,7 @@ function promiseTabLoadEvent(tab, url) { let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle); if (url) { - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, url); + BrowserTestUtils.loadURIString(tab.linkedBrowser, url); } return loaded; diff --git a/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js b/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js index 1cfaf0ea20da..6c6cc5f43824 100644 --- a/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js +++ b/browser/base/content/test/captivePortal/browser_CaptivePortalWatcher_1.js @@ -19,7 +19,7 @@ let testcases = [ false, CANONICAL_URL_REDIRECTED ); - BrowserTestUtils.startLoadingURIString(browser, CANONICAL_URL_REDIRECTED); + BrowserTestUtils.loadURIString(browser, CANONICAL_URL_REDIRECTED); await loadPromise; await freePortal(true); ensurePortalTab(win); diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_badiframe.js b/browser/base/content/test/contextMenu/browser_contextmenu_badiframe.js index 991a55af70f8..89e7fe15e083 100644 --- a/browser/base/content/test/contextMenu/browser_contextmenu_badiframe.js +++ b/browser/base/content/test/contextMenu/browser_contextmenu_badiframe.js @@ -36,7 +36,7 @@ async function openTestPage() { }, true /* maybeErrorPage */ ); - BrowserTestUtils.startLoadingURIString(browser, testPage); + BrowserTestUtils.loadURIString(browser, testPage); await pageAndIframesLoaded; // Make sure both the top-level document and the iframe documents have diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js b/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js index ec5062eee931..cbf1b27590ef 100644 --- a/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js +++ b/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js @@ -20,10 +20,7 @@ async function rightClickOpenInNewTabAndReturnContent(selector) { false, RESOURCE_LINK ); - BrowserTestUtils.startLoadingURIString( - gBrowser.selectedBrowser, - RESOURCE_LINK - ); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, RESOURCE_LINK); await loaded; const generatedBlobURL = await ContentTask.spawn( @@ -100,10 +97,7 @@ async function openInNewTabAndReturnContent(selector) { false, RESOURCE_LINK ); - BrowserTestUtils.startLoadingURIString( - gBrowser.selectedBrowser, - RESOURCE_LINK - ); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, RESOURCE_LINK); await loaded; const generatedBlobURL = await ContentTask.spawn( diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_spellcheck.js b/browser/base/content/test/contextMenu/browser_contextmenu_spellcheck.js index 2360cf6b2294..6f556a58ddc4 100644 --- a/browser/base/content/test/contextMenu/browser_contextmenu_spellcheck.js +++ b/browser/base/content/test/contextMenu/browser_contextmenu_spellcheck.js @@ -185,7 +185,7 @@ add_task(async function test_text_input_spellcheck_deadactor() { contextMenu.hidePopup(); // Now go back to the input testcase: - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, MAIN_URL); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, MAIN_URL); await BrowserTestUtils.browserLoaded( gBrowser.selectedBrowser, false, @@ -206,7 +206,7 @@ add_task(async function test_text_input_spellcheck_deadactor() { wgp = gBrowser.selectedBrowser.browsingContext.currentWindowGlobal; const NEW_URL = MAIN_URL.replace(".com", ".org"); - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, NEW_URL); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, NEW_URL); await BrowserTestUtils.browserLoaded( gBrowser.selectedBrowser, false, @@ -229,7 +229,7 @@ add_task(async function test_text_input_spellcheck_deadactor() { // again; now the context menu stuff should be destroyed by the menu // hiding, nothing else. wgp = gBrowser.selectedBrowser.browsingContext.currentWindowGlobal; - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, NEW_URL); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, NEW_URL); await BrowserTestUtils.browserLoaded( gBrowser.selectedBrowser, false, diff --git a/browser/base/content/test/contextMenu/browser_contextmenu_touch.js b/browser/base/content/test/contextMenu/browser_contextmenu_touch.js index 98de2b12f8e2..2f4e5a79c634 100644 --- a/browser/base/content/test/contextMenu/browser_contextmenu_touch.js +++ b/browser/base/content/test/contextMenu/browser_contextmenu_touch.js @@ -63,7 +63,7 @@ add_task(async function test_back_forward_button_contextmenu_touch() { () => !backbutton.hasAttribute("disabled") ); // eslint-disable-next-line @microsoft/sdl/no-insecure-url - BrowserTestUtils.startLoadingURIString(browser, "http://example.org"); + BrowserTestUtils.loadURIString(browser, "http://example.org"); await notDisabled; await openAndCheckContextMenu(contextMenu, backbutton); diff --git a/browser/base/content/test/favicons/browser_bug408415.js b/browser/base/content/test/favicons/browser_bug408415.js index 2614e8abd565..1526477db343 100644 --- a/browser/base/content/test/favicons/browser_bug408415.js +++ b/browser/base/content/test/favicons/browser_bug408415.js @@ -8,7 +8,7 @@ add_task(async function test() { const expectedIcon = testPath + "file_generic_favicon.ico"; let faviconPromise = waitForLinkAvailable(tabBrowser); - BrowserTestUtils.startLoadingURIString(tabBrowser, URI); + BrowserTestUtils.loadURIString(tabBrowser, URI); let iconURI = await faviconPromise; is(iconURI, expectedIcon, "Correct icon before pushState."); diff --git a/browser/base/content/test/favicons/browser_bug550565.js b/browser/base/content/test/favicons/browser_bug550565.js index 46f5a7855255..32a7527bbf0a 100644 --- a/browser/base/content/test/favicons/browser_bug550565.js +++ b/browser/base/content/test/favicons/browser_bug550565.js @@ -8,7 +8,7 @@ add_task(async function test() { const expectedIcon = testPath + "file_generic_favicon.ico"; let faviconPromise = waitForLinkAvailable(tabBrowser); - BrowserTestUtils.startLoadingURIString(tabBrowser, URI); + BrowserTestUtils.loadURIString(tabBrowser, URI); let iconURI = await faviconPromise; is(iconURI, expectedIcon, "Correct icon before pushState."); diff --git a/browser/base/content/test/favicons/browser_favicon_accept.js b/browser/base/content/test/favicons/browser_favicon_accept.js index 72f6e69931bb..dc59a406b51b 100644 --- a/browser/base/content/test/favicons/browser_favicon_accept.js +++ b/browser/base/content/test/favicons/browser_favicon_accept.js @@ -12,7 +12,7 @@ add_task(async () => { async browser => { let faviconPromise = waitForFaviconMessage(true, `${ROOT}accept.sjs`); - BrowserTestUtils.startLoadingURIString(browser, ROOT + "accept.html"); + BrowserTestUtils.loadURIString(browser, ROOT + "accept.html"); await BrowserTestUtils.browserLoaded(browser); try { diff --git a/browser/base/content/test/favicons/browser_favicon_auth.js b/browser/base/content/test/favicons/browser_favicon_auth.js index 3a5f977eabb9..fb0e75f2ab09 100644 --- a/browser/base/content/test/favicons/browser_favicon_auth.js +++ b/browser/base/content/test/favicons/browser_favicon_auth.js @@ -12,7 +12,7 @@ add_task(async () => { async browser => { let faviconPromise = waitForFaviconMessage(true, `${ROOT}auth_test.png`); - BrowserTestUtils.startLoadingURIString(browser, `${ROOT}auth_test.html`); + BrowserTestUtils.loadURIString(browser, `${ROOT}auth_test.html`); await BrowserTestUtils.browserLoaded(browser); await Assert.rejects( diff --git a/browser/base/content/test/favicons/browser_favicon_cache.js b/browser/base/content/test/favicons/browser_favicon_cache.js index 97fc01db1daf..903f038d6c22 100644 --- a/browser/base/content/test/favicons/browser_favicon_cache.js +++ b/browser/base/content/test/favicons/browser_favicon_cache.js @@ -27,7 +27,7 @@ add_task(async () => { ok(seenCookie, "Should have seen the cookie."); faviconPromise = waitForLinkAvailable(browser); - BrowserTestUtils.startLoadingURIString(browser, testPath); + BrowserTestUtils.loadURIString(browser, testPath); await BrowserTestUtils.browserLoaded(browser); await faviconPromise; cookies = Services.cookies.getCookiesFromHost( diff --git a/browser/base/content/test/favicons/browser_favicon_change.js b/browser/base/content/test/favicons/browser_favicon_change.js index b7470334b8a1..8faf26666533 100644 --- a/browser/base/content/test/favicons/browser_favicon_change.js +++ b/browser/base/content/test/favicons/browser_favicon_change.js @@ -14,7 +14,7 @@ add_task(async function () { TEST_ROOT + "file_bug970276_favicon1.ico" ); - BrowserTestUtils.startLoadingURIString(extraTab.linkedBrowser, TEST_URL); + BrowserTestUtils.loadURIString(extraTab.linkedBrowser, TEST_URL); await BrowserTestUtils.browserLoaded(extraTab.linkedBrowser); await haveChanged; diff --git a/browser/base/content/test/favicons/browser_favicon_change_not_in_document.js b/browser/base/content/test/favicons/browser_favicon_change_not_in_document.js index 5a3ad2bd1afb..90923601a68d 100644 --- a/browser/base/content/test/favicons/browser_favicon_change_not_in_document.js +++ b/browser/base/content/test/favicons/browser_favicon_change_not_in_document.js @@ -39,7 +39,7 @@ add_task(async function () { let expectedFavicon = TEST_ROOT + "file_generic_favicon.ico"; let faviconPromise = waitForFavicon(extraTab.linkedBrowser, expectedFavicon); - BrowserTestUtils.startLoadingURIString(extraTab.linkedBrowser, TEST_URL); + BrowserTestUtils.loadURIString(extraTab.linkedBrowser, TEST_URL); await BrowserTestUtils.browserLoaded(extraTab.linkedBrowser); await faviconPromise; diff --git a/browser/base/content/test/favicons/browser_favicon_credentials.js b/browser/base/content/test/favicons/browser_favicon_credentials.js index 7e04344db568..405c620c8a82 100644 --- a/browser/base/content/test/favicons/browser_favicon_credentials.js +++ b/browser/base/content/test/favicons/browser_favicon_credentials.js @@ -32,7 +32,7 @@ function run_test(url, shouldHaveCookies, description) { async browser => { const faviconPromise = waitForFaviconMessage(true, FAVICON_URL); - BrowserTestUtils.startLoadingURIString(browser, url); + BrowserTestUtils.loadURIString(browser, url); await BrowserTestUtils.browserLoaded(browser); await faviconPromise; diff --git a/browser/base/content/test/favicons/browser_favicon_crossorigin.js b/browser/base/content/test/favicons/browser_favicon_crossorigin.js index d9b5a41dbe48..c1ae18f76567 100644 --- a/browser/base/content/test/favicons/browser_favicon_crossorigin.js +++ b/browser/base/content/test/favicons/browser_favicon_crossorigin.js @@ -27,10 +27,7 @@ function run_test(root, shouldSucceed, description) { async browser => { const faviconPromise = waitForFaviconMessage(true, FAVICON_URL); - BrowserTestUtils.startLoadingURIString( - browser, - `${root}crossorigin.html` - ); + BrowserTestUtils.loadURIString(browser, `${root}crossorigin.html`); await BrowserTestUtils.browserLoaded(browser); if (shouldSucceed) { diff --git a/browser/base/content/test/favicons/browser_favicon_referer.js b/browser/base/content/test/favicons/browser_favicon_referer.js index ed332e74130e..ad1cb5d9b176 100644 --- a/browser/base/content/test/favicons/browser_favicon_referer.js +++ b/browser/base/content/test/favicons/browser_favicon_referer.js @@ -20,10 +20,7 @@ add_task(async function test_check_referrer_for_discovered_favicon() { } ).then(([chan]) => chan.getRequestHeader("Referer")); - BrowserTestUtils.startLoadingURIString( - browser, - `${FOLDER}discovery.html` - ); + BrowserTestUtils.loadURIString(browser, `${FOLDER}discovery.html`); let referrer = await referrerPromise; is( @@ -48,7 +45,7 @@ add_task( } ).then(([chan]) => chan.getRequestHeader("Referer")); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, `${FOLDER}file_favicon_no_referrer.html` ); diff --git a/browser/base/content/test/favicons/browser_invalid_href_fallback.js b/browser/base/content/test/favicons/browser_invalid_href_fallback.js index ab1fb137755c..d2a36b970da9 100644 --- a/browser/base/content/test/favicons/browser_invalid_href_fallback.js +++ b/browser/base/content/test/favicons/browser_invalid_href_fallback.js @@ -12,7 +12,7 @@ add_task(async () => { { gBrowser, url: "about:blank" }, async browser => { let faviconPromise = waitForLinkAvailable(browser); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, testPath + "file_invalid_href.html" ); diff --git a/browser/base/content/test/favicons/browser_missing_favicon.js b/browser/base/content/test/favicons/browser_missing_favicon.js index f6194259093b..40dce7f7a9db 100644 --- a/browser/base/content/test/favicons/browser_missing_favicon.js +++ b/browser/base/content/test/favicons/browser_missing_favicon.js @@ -13,7 +13,7 @@ add_task(async () => { const expectedIcon = testPath + "file_generic_favicon.ico"; let faviconPromise = waitForLinkAvailable(browser); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, testPath + "file_with_favicon.html" ); @@ -22,7 +22,7 @@ add_task(async () => { let iconURI = await faviconPromise; is(iconURI, expectedIcon, "Got correct icon."); - BrowserTestUtils.startLoadingURIString(browser, testPath + "blank.html"); + BrowserTestUtils.loadURIString(browser, testPath + "blank.html"); await BrowserTestUtils.browserLoaded(browser); is(browser.mIconURL, null, "Should have blanked the icon."); diff --git a/browser/base/content/test/favicons/browser_oversized.js b/browser/base/content/test/favicons/browser_oversized.js index abccff52ac39..4756873a304a 100644 --- a/browser/base/content/test/favicons/browser_oversized.js +++ b/browser/base/content/test/favicons/browser_oversized.js @@ -10,10 +10,7 @@ add_task(async () => { async browser => { let faviconPromise = waitForFaviconMessage(true, `${ROOT}large.png`); - BrowserTestUtils.startLoadingURIString( - browser, - ROOT + "large_favicon.html" - ); + BrowserTestUtils.loadURIString(browser, ROOT + "large_favicon.html"); await BrowserTestUtils.browserLoaded(browser); await Assert.rejects( diff --git a/browser/base/content/test/favicons/browser_rooticon.js b/browser/base/content/test/favicons/browser_rooticon.js index b574f5a86a35..6e642070c7ca 100644 --- a/browser/base/content/test/favicons/browser_rooticon.js +++ b/browser/base/content/test/favicons/browser_rooticon.js @@ -15,7 +15,7 @@ add_task(async () => { is(iconURI, expectedIcon, "Got correct initial icon."); faviconPromise = waitForLinkAvailable(browser); - BrowserTestUtils.startLoadingURIString(browser, testPath); + BrowserTestUtils.loadURIString(browser, testPath); await BrowserTestUtils.browserLoaded(browser); iconURI = await faviconPromise; is(iconURI, expectedIcon, "Got correct icon on second load."); diff --git a/browser/base/content/test/favicons/browser_title_flicker.js b/browser/base/content/test/favicons/browser_title_flicker.js index 01a456abd119..71fadce908f4 100644 --- a/browser/base/content/test/favicons/browser_title_flicker.js +++ b/browser/base/content/test/favicons/browser_title_flicker.js @@ -38,7 +38,7 @@ add_task(async () => { { gBrowser, url: "about:blank" }, async browser => { let tab = gBrowser.getTabForBrowser(browser); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, TEST_PATH + "file_with_slow_favicon.html" ); @@ -147,7 +147,7 @@ add_task(async () => { gBrowser.pinTab(tab); let bounds = tab.getBoundingClientRect(); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, TEST_PATH + "file_with_slow_favicon.html" ); diff --git a/browser/base/content/test/forms/browser_selectpopup_large.js b/browser/base/content/test/forms/browser_selectpopup_large.js index d43ab5b4f0d3..d655aa6179d5 100644 --- a/browser/base/content/test/forms/browser_selectpopup_large.js +++ b/browser/base/content/test/forms/browser_selectpopup_large.js @@ -322,10 +322,7 @@ add_task(async function test_large_popup_in_small_window() { let browserLoadedPromise = BrowserTestUtils.browserLoaded( newWin.gBrowser.selectedBrowser ); - BrowserTestUtils.startLoadingURIString( - newWin.gBrowser.selectedBrowser, - pageUrl - ); + BrowserTestUtils.loadURIString(newWin.gBrowser.selectedBrowser, pageUrl); await browserLoadedPromise; newWin.gBrowser.selectedBrowser.focus(); diff --git a/browser/base/content/test/fullscreen/browser_bug1557041.js b/browser/base/content/test/fullscreen/browser_bug1557041.js index 7e4545af3953..3f00de86a03e 100644 --- a/browser/base/content/test/fullscreen/browser_bug1557041.js +++ b/browser/base/content/test/fullscreen/browser_bug1557041.js @@ -14,7 +14,7 @@ add_task(async function test_identityPopupCausesFSExit() { await BrowserTestUtils.withNewTab("about:blank", async browser => { let loaded = BrowserTestUtils.browserLoaded(browser, false, url); - BrowserTestUtils.startLoadingURIString(browser, url); + BrowserTestUtils.loadURIString(browser, url); await loaded; let identityPermissionBox = document.getElementById( diff --git a/browser/base/content/test/general/browser_alltabslistener.js b/browser/base/content/test/general/browser_alltabslistener.js index 8293db703ef6..0c9677306d1f 100644 --- a/browser/base/content/test/general/browser_alltabslistener.js +++ b/browser/base/content/test/general/browser_alltabslistener.js @@ -198,8 +198,8 @@ async function test() { BrowserTestUtils.browserStopped(gBackgroundBrowser, kBasePage), BrowserTestUtils.browserStopped(gForegroundBrowser, kBasePage), ]; - BrowserTestUtils.startLoadingURIString(gBackgroundBrowser, kBasePage); - BrowserTestUtils.startLoadingURIString(gForegroundBrowser, kBasePage); + BrowserTestUtils.loadURIString(gBackgroundBrowser, kBasePage); + BrowserTestUtils.loadURIString(gForegroundBrowser, kBasePage); await Promise.all(promises); // If we process switched, the tabbrowser may still be processing the state_stop // notification here because of how microtasks work. Ensure that that has @@ -214,7 +214,7 @@ function runTest(browser, url, next) { gAllNotificationsPos = 0; gNextTest = next; gTestBrowser = browser; - BrowserTestUtils.startLoadingURIString(browser, url); + BrowserTestUtils.loadURIString(browser, url); } function startTest1() { diff --git a/browser/base/content/test/general/browser_bug417483.js b/browser/base/content/test/general/browser_bug417483.js index 68e2e995119c..6c8619b5327f 100644 --- a/browser/base/content/test/general/browser_bug417483.js +++ b/browser/base/content/test/general/browser_bug417483.js @@ -5,7 +5,7 @@ add_task(async function () { ); const htmlContent = "data:text/html, "; - BrowserTestUtils.startLoadingURIString(gBrowser, htmlContent); + BrowserTestUtils.loadURIString(gBrowser, htmlContent); await loadedPromise; await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function (arg) { diff --git a/browser/base/content/test/general/browser_bug431826.js b/browser/base/content/test/general/browser_bug431826.js index f90de6c53084..704cd4a6751f 100644 --- a/browser/base/content/test/general/browser_bug431826.js +++ b/browser/base/content/test/general/browser_bug431826.js @@ -6,10 +6,7 @@ add_task(async function () { gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser); let promise = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser); - BrowserTestUtils.startLoadingURIString( - gBrowser, - "https://nocert.example.com/" - ); + BrowserTestUtils.loadURIString(gBrowser, "https://nocert.example.com/"); await promise; await remote(() => { diff --git a/browser/base/content/test/general/browser_bug495058.js b/browser/base/content/test/general/browser_bug495058.js index c1c848aae389..95a444bf6a34 100644 --- a/browser/base/content/test/general/browser_bug495058.js +++ b/browser/base/content/test/general/browser_bug495058.js @@ -13,7 +13,7 @@ const URIS = [ add_task(async function () { for (let uri of URIS) { let tab = BrowserTestUtils.addTab(gBrowser); - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, uri); + BrowserTestUtils.loadURIString(tab.linkedBrowser, uri); await BrowserTestUtils.browserLoaded(tab.linkedBrowser); let isRemote = tab.linkedBrowser.isRemoteBrowser; diff --git a/browser/base/content/test/general/browser_bug519216.js b/browser/base/content/test/general/browser_bug519216.js index ccb467a234fb..d83d082556bb 100644 --- a/browser/base/content/test/general/browser_bug519216.js +++ b/browser/base/content/test/general/browser_bug519216.js @@ -3,7 +3,7 @@ function test() { gBrowser.addProgressListener(progressListener1); gBrowser.addProgressListener(progressListener2); gBrowser.addProgressListener(progressListener3); - BrowserTestUtils.startLoadingURIString(gBrowser, "data:text/plain,bug519216"); + BrowserTestUtils.loadURIString(gBrowser, "data:text/plain,bug519216"); } var calledListener1 = false; diff --git a/browser/base/content/test/general/browser_bug581253.js b/browser/base/content/test/general/browser_bug581253.js index b9446e3d3401..a901ce96e13b 100644 --- a/browser/base/content/test/general/browser_bug581253.js +++ b/browser/base/content/test/general/browser_bug581253.js @@ -27,7 +27,7 @@ add_task(async function test_remove_bookmark_with_tag_via_edit_bookmark() { "the test url is bookmarked" ); - BrowserTestUtils.startLoadingURIString(gBrowser, testURL); + BrowserTestUtils.loadURIString(gBrowser, testURL); await TestUtils.waitForCondition( () => BookmarkingUI.status == BookmarkingUI.STATUS_STARRED, diff --git a/browser/base/content/test/general/browser_bug623893.js b/browser/base/content/test/general/browser_bug623893.js index 79cd10c59195..27751e74ad80 100644 --- a/browser/base/content/test/general/browser_bug623893.js +++ b/browser/base/content/test/general/browser_bug623893.js @@ -2,13 +2,13 @@ add_task(async function test() { await BrowserTestUtils.withNewTab( "data:text/plain;charset=utf-8,1", async function (browser) { - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, "data:text/plain;charset=utf-8,2" ); await BrowserTestUtils.browserLoaded(browser); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, "data:text/plain;charset=utf-8,3" ); diff --git a/browser/base/content/test/general/browser_bug624734.js b/browser/base/content/test/general/browser_bug624734.js index df2dcb4b0da6..962c62c5d8cd 100644 --- a/browser/base/content/test/general/browser_bug624734.js +++ b/browser/base/content/test/general/browser_bug624734.js @@ -41,7 +41,7 @@ function test() { } }); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( tab.linkedBrowser, // eslint-disable-next-line @microsoft/sdl/no-insecure-url "http://example.com/browser/browser/base/content/test/general/dummy_page.html" diff --git a/browser/base/content/test/general/browser_bug724239.js b/browser/base/content/test/general/browser_bug724239.js index 8aeb5f622135..78290e21f51d 100644 --- a/browser/base/content/test/general/browser_bug724239.js +++ b/browser/base/content/test/general/browser_bug724239.js @@ -10,7 +10,7 @@ add_task(async function test_blank() { { gBrowser, url: "about:blank" }, async function (browser) { // eslint-disable-next-line @microsoft/sdl/no-insecure-url - BrowserTestUtils.startLoadingURIString(browser, "http://example.com"); + BrowserTestUtils.loadURIString(browser, "http://example.com"); await BrowserTestUtils.browserLoaded(browser); ok(!gBrowser.canGoBack, "about:blank wasn't added to session history"); } @@ -23,13 +23,13 @@ add_task(async function test_newtab() { async function (browser) { // Can't load it directly because that'll use a preloaded tab if present. let stopped = BrowserTestUtils.browserStopped(browser, "about:newtab"); - BrowserTestUtils.startLoadingURIString(browser, "about:newtab"); + BrowserTestUtils.loadURIString(browser, "about:newtab"); await stopped; // eslint-disable-next-line @microsoft/sdl/no-insecure-url stopped = BrowserTestUtils.browserStopped(browser, "http://example.com/"); // eslint-disable-next-line @microsoft/sdl/no-insecure-url - BrowserTestUtils.startLoadingURIString(browser, "http://example.com/"); + BrowserTestUtils.loadURIString(browser, "http://example.com/"); await stopped; // This makes sure the parent process has the most up-to-date notion diff --git a/browser/base/content/test/general/browser_bug734076.js b/browser/base/content/test/general/browser_bug734076.js index bd86f8e2b31c..9e7bcf59776d 100644 --- a/browser/base/content/test/general/browser_bug734076.js +++ b/browser/base/content/test/general/browser_bug734076.js @@ -124,7 +124,7 @@ add_task(async function () { let loadedPromise = BrowserTestUtils.browserLoaded( gBrowser.selectedBrowser ); - BrowserTestUtils.startLoadingURIString(gBrowser, test.url); + BrowserTestUtils.loadURIString(gBrowser, test.url); await loadedPromise; info("Run subtest " + test.name); diff --git a/browser/base/content/test/general/browser_documentnavigation.js b/browser/base/content/test/general/browser_documentnavigation.js index 880db6110fa2..8a4fd2ca6bfb 100644 --- a/browser/base/content/test/general/browser_documentnavigation.js +++ b/browser/base/content/test/general/browser_documentnavigation.js @@ -121,7 +121,7 @@ add_task(async function () { false, testPage1 ); - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, testPage1); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, testPage1); await page1Promise; // When the urlbar is focused, pressing F6 should focus the root of the content page. diff --git a/browser/base/content/test/general/browser_findbarClose.js b/browser/base/content/test/general/browser_findbarClose.js index 996f01e0b9da..e0fe2fcb9890 100644 --- a/browser/base/content/test/general/browser_findbarClose.js +++ b/browser/base/content/test/general/browser_findbarClose.js @@ -18,7 +18,7 @@ add_task(async function findbar_test() { false, url ); - BrowserTestUtils.startLoadingURIString(newTab.linkedBrowser, url); + BrowserTestUtils.loadURIString(newTab.linkedBrowser, url); await promise; await gFindBarPromise; diff --git a/browser/base/content/test/general/browser_refreshBlocker.js b/browser/base/content/test/general/browser_refreshBlocker.js index cbeb9efdbcd1..005228225729 100644 --- a/browser/base/content/test/general/browser_refreshBlocker.js +++ b/browser/base/content/test/general/browser_refreshBlocker.js @@ -111,7 +111,7 @@ async function testRealRefresh(refreshPage, delay) { async function (browser) { await pushPrefs(["accessibility.blockautorefresh", true]); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, refreshPage + "?p=" + TARGET_PAGE + "&d=" + delay ); @@ -177,7 +177,7 @@ add_task(async function test_can_update_notification() { await pushPrefs(["accessibility.blockautorefresh", true]); // First, attempt a redirect - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( browser, META_PAGE + "?d=0&p=" + TARGET_PAGE ); diff --git a/browser/base/content/test/general/browser_restore_isAppTab.js b/browser/base/content/test/general/browser_restore_isAppTab.js index d46f53db7df5..ab26342692e1 100644 --- a/browser/base/content/test/general/browser_restore_isAppTab.js +++ b/browser/base/content/test/general/browser_restore_isAppTab.js @@ -42,7 +42,7 @@ add_task(async function navigate() { isAppTab = isBrowserAppTab(browser); ok(isAppTab, "Docshell should think it is an app tab"); - BrowserTestUtils.startLoadingURIString(gBrowser, DUMMY); + BrowserTestUtils.loadURIString(gBrowser, DUMMY); await BrowserTestUtils.browserStopped(gBrowser); isAppTab = isBrowserAppTab(browser); ok(isAppTab, "Docshell should think it is an app tab"); @@ -55,7 +55,7 @@ add_task(async function navigate() { isAppTab = isBrowserAppTab(browser); ok(isAppTab, "Docshell should think it is an app tab"); - BrowserTestUtils.startLoadingURIString(gBrowser, "about:robots"); + BrowserTestUtils.loadURIString(gBrowser, "about:robots"); await BrowserTestUtils.browserStopped(gBrowser); isAppTab = isBrowserAppTab(browser); ok(isAppTab, "Docshell should think it is an app tab"); diff --git a/browser/base/content/test/general/browser_save_link-perwindowpb.js b/browser/base/content/test/general/browser_save_link-perwindowpb.js index b018212280c1..4800c813b3be 100644 --- a/browser/base/content/test/general/browser_save_link-perwindowpb.js +++ b/browser/base/content/test/general/browser_save_link-perwindowpb.js @@ -15,7 +15,7 @@ function triggerSave(aWindow, aCallback) { // This page sets a cookie if and only if a cookie does not exist yet let testURI = "http://mochi.test:8888/browser/browser/base/content/test/general/bug792517-2.html"; - BrowserTestUtils.startLoadingURIString(testBrowser, testURI); + BrowserTestUtils.loadURIString(testBrowser, testURI); BrowserTestUtils.browserLoaded(testBrowser, false, testURI).then(() => { waitForFocus(function () { info("register to handle popupshown"); diff --git a/browser/base/content/test/general/browser_save_link_when_window_navigates.js b/browser/base/content/test/general/browser_save_link_when_window_navigates.js index e7507fcbb083..49901e8bfa6d 100644 --- a/browser/base/content/test/general/browser_save_link_when_window_navigates.js +++ b/browser/base/content/test/general/browser_save_link_when_window_navigates.js @@ -43,7 +43,7 @@ function triggerSave(aWindow, aCallback) { windowObserver.setCallback(onUCTDialog); } - BrowserTestUtils.startLoadingURIString(testBrowser, testURI); + BrowserTestUtils.loadURIString(testBrowser, testURI); // Create the folder the link will be saved into. var destDir = createTemporarySaveDirectory(); diff --git a/browser/base/content/test/general/browser_save_video.js b/browser/base/content/test/general/browser_save_video.js index 276088fbb111..5456ac240fdb 100644 --- a/browser/base/content/test/general/browser_save_video.js +++ b/browser/base/content/test/general/browser_save_video.js @@ -12,7 +12,7 @@ add_task(async function () { var fileName; let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( gBrowser, "http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html" ); diff --git a/browser/base/content/test/general/browser_star_hsts.js b/browser/base/content/test/general/browser_star_hsts.js index 92c1dcdb8bc0..9452c61bebb2 100644 --- a/browser/base/content/test/general/browser_star_hsts.js +++ b/browser/base/content/test/general/browser_star_hsts.js @@ -82,6 +82,6 @@ function promiseTabLoadEvent(aTab, aURL, aFinalURL) { } info("Wait for load tab event"); - BrowserTestUtils.startLoadingURIString(aTab.linkedBrowser, aURL); + BrowserTestUtils.loadURIString(aTab.linkedBrowser, aURL); return BrowserTestUtils.browserLoaded(aTab.linkedBrowser, false, aFinalURL); } diff --git a/browser/base/content/test/general/browser_tab_detach_restore.js b/browser/base/content/test/general/browser_tab_detach_restore.js index 405e4509b4be..d3f6a58aaa2f 100644 --- a/browser/base/content/test/general/browser_tab_detach_restore.js +++ b/browser/base/content/test/general/browser_tab_detach_restore.js @@ -15,7 +15,7 @@ add_task(async function () { } let tab = BrowserTestUtils.addTab(gBrowser); - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, uri); + BrowserTestUtils.loadURIString(tab.linkedBrowser, uri); await BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, uri); await TabStateFlusher.flush(tab.linkedBrowser); diff --git a/browser/base/content/test/general/browser_tab_dragdrop.js b/browser/base/content/test/general/browser_tab_dragdrop.js index 33b0a5c23876..9ea05842f293 100644 --- a/browser/base/content/test/general/browser_tab_dragdrop.js +++ b/browser/base/content/test/general/browser_tab_dragdrop.js @@ -55,7 +55,7 @@ var clickTest = async function (tab) { }; function loadURI(tab, url) { - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, url); + BrowserTestUtils.loadURIString(tab.linkedBrowser, url); return BrowserTestUtils.browserLoaded(tab.linkedBrowser); } diff --git a/browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js b/browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js index 49f8629a2597..d5144b47b0e4 100644 --- a/browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js +++ b/browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js @@ -25,7 +25,7 @@ function insertAndClickAnchor(browser) { * Promise that resolves when the browser is no longer remote. */ function prepareNonRemoteBrowser(aWindow, browser) { - BrowserTestUtils.startLoadingURIString(browser, NON_REMOTE_PAGE); + BrowserTestUtils.loadURIString(browser, NON_REMOTE_PAGE); return BrowserTestUtils.browserLoaded(browser); } diff --git a/browser/base/content/test/general/browser_typeAheadFind.js b/browser/base/content/test/general/browser_typeAheadFind.js index eee3775249ac..d68de34333df 100644 --- a/browser/base/content/test/general/browser_typeAheadFind.js +++ b/browser/base/content/test/general/browser_typeAheadFind.js @@ -8,7 +8,7 @@ add_task(async function () { // Calls focus event on the TabContextMenu early in the test. testWindow.gBrowser.selectedTab.focus(); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( testWindow.gBrowser, "data:text/html,

A Page

" ); diff --git a/browser/base/content/test/general/browser_unknownContentType_title.js b/browser/base/content/test/general/browser_unknownContentType_title.js index ea0b99ebf162..be55f06fae3f 100644 --- a/browser/base/content/test/general/browser_unknownContentType_title.js +++ b/browser/base/content/test/general/browser_unknownContentType_title.js @@ -48,7 +48,7 @@ add_task(async function unknownContentType_title_with_pref_enabled() { is(gBrowser.contentTitle, "Test Page", "Should have the right title."); - BrowserTestUtils.startLoadingURIString(browser, unknown_url); + BrowserTestUtils.loadURIString(browser, unknown_url); let win = await waitForNewWindow(); is( win.location.href, @@ -73,7 +73,7 @@ add_task(async function unknownContentType_title_with_pref_disabled() { is(gBrowser.contentTitle, "Test Page", "Should have the right title."); - BrowserTestUtils.startLoadingURIString(browser, unknown_url); + BrowserTestUtils.loadURIString(browser, unknown_url); // If the pref is disabled, then the downloads panel should open right away // since there is no UCT window prompt to block it. let waitForPanelShown = BrowserTestUtils.waitForCondition(() => { diff --git a/browser/base/content/test/general/head.js b/browser/base/content/test/general/head.js index 7066312341e9..f44d74b96092 100644 --- a/browser/base/content/test/general/head.js +++ b/browser/base/content/test/general/head.js @@ -238,7 +238,7 @@ function promiseTabLoadEvent(tab, url) { let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle); if (url) { - BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, url); + BrowserTestUtils.loadURIString(tab.linkedBrowser, url); } return loaded; @@ -329,7 +329,7 @@ function promiseOnBookmarkItemAdded(aExpectedURI) { async function loadBadCertPage(url) { let loaded = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser); - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, url); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, url); await loaded; await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function () { diff --git a/browser/base/content/test/gesture/browser_gesture_navigation.js b/browser/base/content/test/gesture/browser_gesture_navigation.js index 78da1373b8fa..667a1f07b66f 100644 --- a/browser/base/content/test/gesture/browser_gesture_navigation.js +++ b/browser/base/content/test/gesture/browser_gesture_navigation.js @@ -72,7 +72,7 @@ add_task(async () => { ); }); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( newWindow.gBrowser.selectedBrowser, "about:mozilla" ); @@ -81,7 +81,7 @@ add_task(async () => { false, "about:mozilla" ); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( newWindow.gBrowser.selectedBrowser, "about:about" ); @@ -179,7 +179,7 @@ add_task(async () => { ); }); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( newWindow.gBrowser.selectedBrowser, "about:mozilla" ); @@ -188,7 +188,7 @@ add_task(async () => { false, "about:mozilla" ); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( newWindow.gBrowser.selectedBrowser, "about:about" ); diff --git a/browser/base/content/test/keyboard/browser_toolbarButtonKeyPress.js b/browser/base/content/test/keyboard/browser_toolbarButtonKeyPress.js index 8640716babae..8a3f686c6a47 100644 --- a/browser/base/content/test/keyboard/browser_toolbarButtonKeyPress.js +++ b/browser/base/content/test/keyboard/browser_toolbarButtonKeyPress.js @@ -139,7 +139,7 @@ add_task(async function testBackForwardButtonPress() { await BrowserTestUtils.withNewTab( "https://example.com/1", async function (aBrowser) { - BrowserTestUtils.startLoadingURIString(aBrowser, "https://example.com/2"); + BrowserTestUtils.loadURIString(aBrowser, "https://example.com/2"); await BrowserTestUtils.browserLoaded(aBrowser); let backButton = document.getElementById("back-button"); diff --git a/browser/base/content/test/keyboard/browser_toolbarKeyNav.js b/browser/base/content/test/keyboard/browser_toolbarKeyNav.js index 242f00e90c21..2788cccaf446 100644 --- a/browser/base/content/test/keyboard/browser_toolbarKeyNav.js +++ b/browser/base/content/test/keyboard/browser_toolbarKeyNav.js @@ -315,7 +315,7 @@ add_task(async function testArrowsDisabledButtons() { "ArrowLeft on Reload button when prior buttons disabled does nothing" ); - BrowserTestUtils.startLoadingURIString(aBrowser, "https://example.com/2"); + BrowserTestUtils.loadURIString(aBrowser, "https://example.com/2"); await BrowserTestUtils.browserLoaded(aBrowser); await waitUntilReloadEnabled(); startFromUrlBar(); diff --git a/browser/base/content/test/menubar/browser_file_menu_import_wizard.js b/browser/base/content/test/menubar/browser_file_menu_import_wizard.js index fc4c02c0fea6..7783d59da7d5 100644 --- a/browser/base/content/test/menubar/browser_file_menu_import_wizard.js +++ b/browser/base/content/test/menubar/browser_file_menu_import_wizard.js @@ -10,7 +10,7 @@ add_setup(async () => { // makes it easier to be consistent with closing and opening // behaviours between the two kinds of migration wizards. let browser = gBrowser.selectedBrowser; - BrowserTestUtils.startLoadingURIString(browser, "https://example.com"); + BrowserTestUtils.loadURIString(browser, "https://example.com"); await BrowserTestUtils.browserLoaded(browser); }); diff --git a/browser/base/content/test/pageActions/browser_PageActions_overflow.js b/browser/base/content/test/pageActions/browser_PageActions_overflow.js index 2a24f8471147..463dd336c480 100644 --- a/browser/base/content/test/pageActions/browser_PageActions_overflow.js +++ b/browser/base/content/test/pageActions/browser_PageActions_overflow.js @@ -22,7 +22,7 @@ add_task(async function test() { let win = await BrowserTestUtils.openNewBrowserWindow(); await SimpleTest.promiseFocus(win); Assert.greater(win.outerWidth, 700, "window is bigger than 700px"); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( win.gBrowser, "data:text/html,

A Page

" ); @@ -86,7 +86,7 @@ add_task(async function bookmark() { const url = "data:text/html,

A Page

"; let win = await BrowserTestUtils.openNewBrowserWindow(); await SimpleTest.promiseFocus(win); - BrowserTestUtils.startLoadingURIString(win.gBrowser, url); + BrowserTestUtils.loadURIString(win.gBrowser, url); await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser); // The pageAction implementation enables the button at the next animation diff --git a/browser/base/content/test/pageActions/browser_PageActions_removeExtension.js b/browser/base/content/test/pageActions/browser_PageActions_removeExtension.js index 821c53e3f113..329be2db172c 100644 --- a/browser/base/content/test/pageActions/browser_PageActions_removeExtension.js +++ b/browser/base/content/test/pageActions/browser_PageActions_removeExtension.js @@ -39,7 +39,7 @@ add_task(async function contextMenu_removeExtension_panel() { const url = "data:text/html,

A Page

"; let win = await BrowserTestUtils.openNewBrowserWindow(); await SimpleTest.promiseFocus(win); - BrowserTestUtils.startLoadingURIString(win.gBrowser, url); + BrowserTestUtils.loadURIString(win.gBrowser, url); await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser); info("Shrink the window if necessary, check the meatball menu is visible"); @@ -243,7 +243,7 @@ add_task(async function contextMenu_removeExtension_disabled_in_panel() { const url = "data:text/html,

A Page

"; let win = await BrowserTestUtils.openNewBrowserWindow(); await SimpleTest.promiseFocus(win); - BrowserTestUtils.startLoadingURIString(win.gBrowser, url); + BrowserTestUtils.loadURIString(win.gBrowser, url); await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser); info("Shrink the window if necessary, check the meatball menu is visible"); diff --git a/browser/base/content/test/pageStyle/browser_page_style_menu.js b/browser/base/content/test/pageStyle/browser_page_style_menu.js index ac543f48f555..2ae635f16b85 100644 --- a/browser/base/content/test/pageStyle/browser_page_style_menu.js +++ b/browser/base/content/test/pageStyle/browser_page_style_menu.js @@ -34,10 +34,7 @@ add_task(async function test_menu() { false ); let browser = tab.linkedBrowser; - BrowserTestUtils.startLoadingURIString( - browser, - WEB_ROOT + "page_style_sample.html" - ); + BrowserTestUtils.loadURIString(browser, WEB_ROOT + "page_style_sample.html"); await promiseStylesheetsLoaded(browser, kStyleSheetsInPageStyleSample); let menuitems = fillPopupAndGetItems(); diff --git a/browser/base/content/test/pageStyle/browser_page_style_menu_update.js b/browser/base/content/test/pageStyle/browser_page_style_menu_update.js index e406bdcc0bf5..1cd0aadb6ea0 100644 --- a/browser/base/content/test/pageStyle/browser_page_style_menu_update.js +++ b/browser/base/content/test/pageStyle/browser_page_style_menu_update.js @@ -16,7 +16,7 @@ add_task(async function () { false ); let browser = tab.linkedBrowser; - BrowserTestUtils.startLoadingURIString(browser, PAGE); + BrowserTestUtils.loadURIString(browser, PAGE); await promiseStylesheetsLoaded(browser, 18); let menupopup = document.getElementById("pageStyleMenu").menupopup; diff --git a/browser/base/content/test/pageinfo/browser_pageinfo_firstPartyIsolation.js b/browser/base/content/test/pageinfo/browser_pageinfo_firstPartyIsolation.js index 354e85a241f9..b280242b40d6 100644 --- a/browser/base/content/test/pageinfo/browser_pageinfo_firstPartyIsolation.js +++ b/browser/base/content/test/pageinfo/browser_pageinfo_firstPartyIsolation.js @@ -70,7 +70,7 @@ async function test() { false, url ); - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, url); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, url); await loadPromise; // Pass a dummy imageElement, if there isn't an imageElement, pageInfo.js diff --git a/browser/base/content/test/pageinfo/browser_pageinfo_svg_image.js b/browser/base/content/test/pageinfo/browser_pageinfo_svg_image.js index 3934cd2aeaf8..547c6158ad48 100644 --- a/browser/base/content/test/pageinfo/browser_pageinfo_svg_image.js +++ b/browser/base/content/test/pageinfo/browser_pageinfo_svg_image.js @@ -4,7 +4,7 @@ const URI = add_task(async function () { gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser); - BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, URI); + BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, URI); await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, URI); const pageInfo = BrowserPageInfo( diff --git a/browser/base/content/test/performance/browser_hidden_browser_vsync.js b/browser/base/content/test/performance/browser_hidden_browser_vsync.js index a2e5cc990c95..ffd5ad8adedb 100644 --- a/browser/base/content/test/performance/browser_hidden_browser_vsync.js +++ b/browser/base/content/test/performance/browser_hidden_browser_vsync.js @@ -21,7 +21,7 @@ add_task(async function test_hidden_sidebar() { let panel = gBrowser.getPanel(mainBrowser); panel.append(b); let loaded = BrowserTestUtils.browserLoaded(b); - BrowserTestUtils.startLoadingURIString( + BrowserTestUtils.loadURIString( b, `data:text/html,