Bug 1514164 - Move urlbar tests to the new urlbar directory and split out tests that already pass with QuantumBar. r=mak
authorMark Banner <standard8@mozilla.com>
Mon, 21 Jan 2019 16:58:39 +0000
changeset 514727 306a66424aad636fc9ec9010dd605f72fdc47b94
parent 514726 ba9f9c0ce2561b72c6dedd0bf5817ba452bb4638
child 514728 3ee7a4b57a9a955db8ba8d8f961754c4db638ebc
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1514164
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1514164 - Move urlbar tests to the new urlbar directory and split out tests that already pass with QuantumBar. r=mak This moves the tests to browser/components/urlbar and sets them up for running both against QuantumBar as well as the legacy address bar. Differential Revision: https://phabricator.services.mozilla.com/D16996
browser/base/content/moz.build
browser/base/content/test/urlbar/.eslintrc.js
browser/base/content/test/urlbar/Panel.jsm
browser/base/content/test/urlbar/authenticate.sjs
browser/base/content/test/urlbar/browser.ini
browser/base/content/test/urlbar/browser_URLBarSetURI.js
browser/base/content/test/urlbar/browser_action_keyword.js
browser/base/content/test/urlbar/browser_action_keyword_override.js
browser/base/content/test/urlbar/browser_action_searchengine.js
browser/base/content/test/urlbar/browser_action_searchengine_alias.js
browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js
browser/base/content/test/urlbar/browser_autocomplete_autoselect.js
browser/base/content/test/urlbar/browser_autocomplete_cursor.js
browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js
browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
browser/base/content/test/urlbar/browser_autocomplete_no_title.js
browser/base/content/test/urlbar/browser_autocomplete_readline_navigation.js
browser/base/content/test/urlbar/browser_autocomplete_tag_star_visibility.js
browser/base/content/test/urlbar/browser_bug1003461-switchtab-override.js
browser/base/content/test/urlbar/browser_bug1024133-switchtab-override-keynav.js
browser/base/content/test/urlbar/browser_bug1025195_switchToTabHavingURI_aOpenParams.js
browser/base/content/test/urlbar/browser_bug1070778.js
browser/base/content/test/urlbar/browser_bug1104165-switchtab-decodeuri.js
browser/base/content/test/urlbar/browser_bug1225194-remotetab.js
browser/base/content/test/urlbar/browser_bug304198.js
browser/base/content/test/urlbar/browser_bug556061.js
browser/base/content/test/urlbar/browser_bug562649.js
browser/base/content/test/urlbar/browser_bug623155.js
browser/base/content/test/urlbar/browser_bug783614.js
browser/base/content/test/urlbar/browser_canonizeURL.js
browser/base/content/test/urlbar/browser_dragdropURL.js
browser/base/content/test/urlbar/browser_locationBarCommand.js
browser/base/content/test/urlbar/browser_locationBarExternalLoad.js
browser/base/content/test/urlbar/browser_moz_action_link.js
browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js
browser/base/content/test/urlbar/browser_page_action_menu.js
browser/base/content/test/urlbar/browser_page_action_menu_add_search_engine.js
browser/base/content/test/urlbar/browser_page_action_menu_clipboard.js
browser/base/content/test/urlbar/browser_page_action_menu_share_mac.js
browser/base/content/test/urlbar/browser_page_action_menu_share_win.html
browser/base/content/test/urlbar/browser_page_action_menu_share_win.js
browser/base/content/test/urlbar/browser_pasteAndGo.js
browser/base/content/test/urlbar/browser_populateAfterPushState.js
browser/base/content/test/urlbar/browser_removeUnsafeProtocolsFromURLBarPaste.js
browser/base/content/test/urlbar/browser_search_favicon.js
browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar_perwindowpb.js
browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
browser/base/content/test/urlbar/browser_urlbarAddonIframe.js
browser/base/content/test/urlbar/browser_urlbarAutoFillTrimURLs.js
browser/base/content/test/urlbar/browser_urlbarAutofillPreserveCase.js
browser/base/content/test/urlbar/browser_urlbarCopying.js
browser/base/content/test/urlbar/browser_urlbarDecode.js
browser/base/content/test/urlbar/browser_urlbarDelete.js
browser/base/content/test/urlbar/browser_urlbarEnter.js
browser/base/content/test/urlbar/browser_urlbarEnterAfterMouseOver.js
browser/base/content/test/urlbar/browser_urlbarFocusedCmdK.js
browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js
browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js
browser/base/content/test/urlbar/browser_urlbarOneOffs.js
browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
browser/base/content/test/urlbar/browser_urlbarOneOffs_settings.js
browser/base/content/test/urlbar/browser_urlbarPlaceholder.js
browser/base/content/test/urlbar/browser_urlbarPrivateBrowsingWindowChange.js
browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js
browser/base/content/test/urlbar/browser_urlbarRevert.js
browser/base/content/test/urlbar/browser_urlbarSearchFunction.js
browser/base/content/test/urlbar/browser_urlbarSearchSingleWordNotification.js
browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js
browser/base/content/test/urlbar/browser_urlbarStop.js
browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js
browser/base/content/test/urlbar/browser_urlbarTokenAlias.js
browser/base/content/test/urlbar/browser_urlbarUpdateForDomainCompletion.js
browser/base/content/test/urlbar/browser_urlbar_autoFill_backspaced.js
browser/base/content/test/urlbar/browser_urlbar_blanking.js
browser/base/content/test/urlbar/browser_urlbar_canonize_on_autofill.js
browser/base/content/test/urlbar/browser_urlbar_locationchange_urlbar_edit_dos.js
browser/base/content/test/urlbar/browser_urlbar_remoteness_switch.js
browser/base/content/test/urlbar/browser_urlbar_remove_match.js
browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect.js
browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js
browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_mousedown.js
browser/base/content/test/urlbar/browser_urlbar_searchsettings.js
browser/base/content/test/urlbar/browser_urlbar_stop_pending.js
browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js
browser/base/content/test/urlbar/browser_wyciwyg_urlbarCopying.js
browser/base/content/test/urlbar/dummy_page.html
browser/base/content/test/urlbar/file_blank_but_not_blank.html
browser/base/content/test/urlbar/file_bug562649.html
browser/base/content/test/urlbar/file_urlbar_edit_dos.html
browser/base/content/test/urlbar/head.js
browser/base/content/test/urlbar/moz.png
browser/base/content/test/urlbar/page_action_menu_add_search_engine_0.xml
browser/base/content/test/urlbar/page_action_menu_add_search_engine_1.xml
browser/base/content/test/urlbar/page_action_menu_add_search_engine_2.xml
browser/base/content/test/urlbar/page_action_menu_add_search_engine_many.html
browser/base/content/test/urlbar/page_action_menu_add_search_engine_one.html
browser/base/content/test/urlbar/page_action_menu_add_search_engine_same_names.html
browser/base/content/test/urlbar/print_postdata.sjs
browser/base/content/test/urlbar/redirect_bug623155.sjs
browser/base/content/test/urlbar/searchSuggestionEngine.sjs
browser/base/content/test/urlbar/searchSuggestionEngine.xml
browser/base/content/test/urlbar/searchSuggestionEngine2.xml
browser/base/content/test/urlbar/searchSuggestionEngineSlow.xml
browser/base/content/test/urlbar/slow-page.sjs
browser/base/content/test/urlbar/test_wyciwyg_copying.html
browser/base/content/test/urlbar/urlbarAddonIframe.html
browser/base/content/test/urlbar/urlbarAddonIframe.js
browser/base/content/test/urlbar/urlbarAddonIframeContentScript.js
browser/base/moz.build
browser/components/urlbar/moz.build
browser/components/urlbar/tests/browser/Panel.jsm
browser/components/urlbar/tests/browser/authenticate.sjs
browser/components/urlbar/tests/browser/browser.ini
browser/components/urlbar/tests/browser/browser_URLBarSetURI.js
browser/components/urlbar/tests/browser/browser_bug1025195_switchToTabHavingURI_aOpenParams.js
browser/components/urlbar/tests/browser/browser_bug562649.js
browser/components/urlbar/tests/browser/browser_bug623155.js
browser/components/urlbar/tests/browser/browser_bug783614.js
browser/components/urlbar/tests/browser/browser_locationBarExternalLoad.js
browser/components/urlbar/tests/browser/browser_moz_action_link.js
browser/components/urlbar/tests/browser/browser_page_action_menu_add_search_engine.js
browser/components/urlbar/tests/browser/browser_page_action_menu_clipboard.js
browser/components/urlbar/tests/browser/browser_page_action_menu_share_mac.js
browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.html
browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.js
browser/components/urlbar/tests/browser/browser_populateAfterPushState.js
browser/components/urlbar/tests/browser/browser_urlbarCopying.js
browser/components/urlbar/tests/browser/browser_urlbarEnter.js
browser/components/urlbar/tests/browser/browser_urlbarFocusedCmdK.js
browser/components/urlbar/tests/browser/browser_urlbarHashChangeProxyState.js
browser/components/urlbar/tests/browser/browser_urlbarPlaceholder.js
browser/components/urlbar/tests/browser/browser_urlbarRevert.js
browser/components/urlbar/tests/browser/browser_urlbarSearchSingleWordNotification.js
browser/components/urlbar/tests/browser/browser_urlbarUpdateForDomainCompletion.js
browser/components/urlbar/tests/browser/browser_urlbar_blanking.js
browser/components/urlbar/tests/browser/browser_urlbar_locationchange_urlbar_edit_dos.js
browser/components/urlbar/tests/browser/browser_urlbar_remoteness_switch.js
browser/components/urlbar/tests/browser/browser_urlbar_searchsettings.js
browser/components/urlbar/tests/browser/browser_urlbar_whereToOpen.js
browser/components/urlbar/tests/browser/browser_wyciwyg_urlbarCopying.js
browser/components/urlbar/tests/browser/dummy_page.html
browser/components/urlbar/tests/browser/file_blank_but_not_blank.html
browser/components/urlbar/tests/browser/file_bug562649.html
browser/components/urlbar/tests/browser/file_urlbar_edit_dos.html
browser/components/urlbar/tests/browser/head-common.js
browser/components/urlbar/tests/browser/head.js
browser/components/urlbar/tests/browser/moz.png
browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_0.xml
browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_1.xml
browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_2.xml
browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_many.html
browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_one.html
browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_same_names.html
browser/components/urlbar/tests/browser/print_postdata.sjs
browser/components/urlbar/tests/browser/redirect_bug623155.sjs
browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs
browser/components/urlbar/tests/browser/searchSuggestionEngine.xml
browser/components/urlbar/tests/browser/searchSuggestionEngine2.xml
browser/components/urlbar/tests/browser/searchSuggestionEngineSlow.xml
browser/components/urlbar/tests/browser/slow-page.sjs
browser/components/urlbar/tests/browser/test_wyciwyg_copying.html
browser/components/urlbar/tests/browser/urlbarAddonIframe.html
browser/components/urlbar/tests/browser/urlbarAddonIframe.js
browser/components/urlbar/tests/browser/urlbarAddonIframeContentScript.js
browser/components/urlbar/tests/legacy/.eslintrc.js
browser/components/urlbar/tests/legacy/browser.ini
browser/components/urlbar/tests/legacy/browser_action_keyword.js
browser/components/urlbar/tests/legacy/browser_action_keyword_override.js
browser/components/urlbar/tests/legacy/browser_action_searchengine.js
browser/components/urlbar/tests/legacy/browser_action_searchengine_alias.js
browser/components/urlbar/tests/legacy/browser_autocomplete_a11y_label.js
browser/components/urlbar/tests/legacy/browser_autocomplete_autoselect.js
browser/components/urlbar/tests/legacy/browser_autocomplete_cursor.js
browser/components/urlbar/tests/legacy/browser_autocomplete_edit_completed.js
browser/components/urlbar/tests/legacy/browser_autocomplete_enter_race.js
browser/components/urlbar/tests/legacy/browser_autocomplete_no_title.js
browser/components/urlbar/tests/legacy/browser_autocomplete_readline_navigation.js
browser/components/urlbar/tests/legacy/browser_autocomplete_tag_star_visibility.js
browser/components/urlbar/tests/legacy/browser_bug1003461-switchtab-override.js
browser/components/urlbar/tests/legacy/browser_bug1024133-switchtab-override-keynav.js
browser/components/urlbar/tests/legacy/browser_bug1070778.js
browser/components/urlbar/tests/legacy/browser_bug1104165-switchtab-decodeuri.js
browser/components/urlbar/tests/legacy/browser_bug1225194-remotetab.js
browser/components/urlbar/tests/legacy/browser_bug304198.js
browser/components/urlbar/tests/legacy/browser_bug556061.js
browser/components/urlbar/tests/legacy/browser_canonizeURL.js
browser/components/urlbar/tests/legacy/browser_dragdropURL.js
browser/components/urlbar/tests/legacy/browser_locationBarCommand.js
browser/components/urlbar/tests/legacy/browser_new_tab_urlbar_reset.js
browser/components/urlbar/tests/legacy/browser_page_action_menu.js
browser/components/urlbar/tests/legacy/browser_pasteAndGo.js
browser/components/urlbar/tests/legacy/browser_removeUnsafeProtocolsFromURLBarPaste.js
browser/components/urlbar/tests/legacy/browser_search_favicon.js
browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar.js
browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar_perwindowpb.js
browser/components/urlbar/tests/legacy/browser_urlbarAboutHomeLoading.js
browser/components/urlbar/tests/legacy/browser_urlbarAddonIframe.js
browser/components/urlbar/tests/legacy/browser_urlbarAutoFillTrimURLs.js
browser/components/urlbar/tests/legacy/browser_urlbarAutofillPreserveCase.js
browser/components/urlbar/tests/legacy/browser_urlbarDecode.js
browser/components/urlbar/tests/legacy/browser_urlbarDelete.js
browser/components/urlbar/tests/legacy/browser_urlbarEnterAfterMouseOver.js
browser/components/urlbar/tests/legacy/browser_urlbarKeepStateAcrossTabSwitches.js
browser/components/urlbar/tests/legacy/browser_urlbarOneOffs.js
browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_searchSuggestions.js
browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_settings.js
browser/components/urlbar/tests/legacy/browser_urlbarPrivateBrowsingWindowChange.js
browser/components/urlbar/tests/legacy/browser_urlbarRaceWithTabs.js
browser/components/urlbar/tests/legacy/browser_urlbarSearchFunction.js
browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions.js
browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions_opt-out.js
browser/components/urlbar/tests/legacy/browser_urlbarSearchTelemetry.js
browser/components/urlbar/tests/legacy/browser_urlbarStop.js
browser/components/urlbar/tests/legacy/browser_urlbarStopSearchOnSelection.js
browser/components/urlbar/tests/legacy/browser_urlbarTokenAlias.js
browser/components/urlbar/tests/legacy/browser_urlbar_autoFill_backspaced.js
browser/components/urlbar/tests/legacy/browser_urlbar_canonize_on_autofill.js
browser/components/urlbar/tests/legacy/browser_urlbar_remove_match.js
browser/components/urlbar/tests/legacy/browser_urlbar_search_no_speculative_connect_with_client_cert.js
browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect.js
browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_engine.js
browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_mousedown.js
browser/components/urlbar/tests/legacy/browser_urlbar_stop_pending.js
browser/components/urlbar/tests/legacy/head.js
--- a/browser/base/content/moz.build
+++ b/browser/base/content/moz.build
@@ -92,19 +92,16 @@ with Files("test/tabs/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
 with Files("test/touch/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
 with Files("test/trackingUI/**"):
     BUG_COMPONENT = ("Firefox", "Tracking Protection")
 
-with Files("test/urlbar/**"):
-    BUG_COMPONENT = ("Firefox", "Address Bar")
-
 with Files("test/webextensions/**"):
     BUG_COMPONENT = ("WebExtensions", "Untriaged")
 
 with Files("test/webrtc/**"):
     BUG_COMPONENT = ("Core", "WebRTC")
 
 with Files("aboutNetError.xhtml"):
     BUG_COMPONENT = ("Firefox", "Security")
deleted file mode 100644
--- a/browser/base/content/test/urlbar/browser.ini
+++ /dev/null
@@ -1,164 +0,0 @@
-[DEFAULT]
-support-files =
-  dummy_page.html
-  head.js
-
-[browser_URLBarSetURI.js]
-skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
-[browser_action_keyword.js]
-skip-if = os == "linux" # Bug 1188154
-support-files =
-  print_postdata.sjs
-[browser_action_keyword_override.js]
-[browser_action_searchengine.js]
-[browser_action_searchengine_alias.js]
-[browser_autocomplete_a11y_label.js]
-skip-if = (verify && !debug && (os == 'win'))
-[browser_autocomplete_autoselect.js]
-[browser_autocomplete_cursor.js]
-skip-if = verify
-[browser_autocomplete_edit_completed.js]
-[browser_autocomplete_enter_race.js]
-[browser_autocomplete_no_title.js]
-[browser_autocomplete_readline_navigation.js]
-skip-if = os != "mac" # Mac only feature
-[browser_autocomplete_tag_star_visibility.js]
-[browser_bug1104165-switchtab-decodeuri.js]
-[browser_bug1003461-switchtab-override.js]
-skip-if = (verify && debug && (os == 'win'))
-[browser_bug1024133-switchtab-override-keynav.js]
-[browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
-[browser_bug1070778.js]
-[browser_bug1225194-remotetab.js]
-[browser_bug304198.js]
-[browser_bug556061.js]
-subsuite = clipboard
-[browser_bug562649.js]
-support-files = file_bug562649.html
-[browser_bug623155.js]
-support-files =
-  redirect_bug623155.sjs
-[browser_bug783614.js]
-[browser_canonizeURL.js]
-[browser_dragdropURL.js]
-[browser_locationBarCommand.js]
-[browser_locationBarExternalLoad.js]
-[browser_moz_action_link.js]
-[browser_new_tab_urlbar_reset.js]
-[browser_page_action_menu.js]
-[browser_page_action_menu_add_search_engine.js]
-support-files =
-  page_action_menu_add_search_engine_one.html
-  page_action_menu_add_search_engine_many.html
-  page_action_menu_add_search_engine_same_names.html
-  page_action_menu_add_search_engine_0.xml
-  page_action_menu_add_search_engine_1.xml
-  page_action_menu_add_search_engine_2.xml
-[browser_page_action_menu_clipboard.js]
-subsuite = clipboard
-[browser_page_action_menu_share_mac.js]
-skip-if = os != "mac" # Mac only feature
-[browser_page_action_menu_share_win.js]
-support-files =
-  browser_page_action_menu_share_win.html
-skip-if = os != "win" # Windows only feature
-[browser_pasteAndGo.js]
-subsuite = clipboard
-[browser_populateAfterPushState.js]
-[browser_removeUnsafeProtocolsFromURLBarPaste.js]
-subsuite = clipboard
-[browser_search_favicon.js]
-[browser_tabMatchesInAwesomebar.js]
-support-files =
-  moz.png
-[browser_tabMatchesInAwesomebar_perwindowpb.js]
-skip-if = os == 'linux' # Bug 1104755
-[browser_urlbarAddonIframe.js]
-support-files =
-  Panel.jsm
-  urlbarAddonIframe.html
-  urlbarAddonIframe.js
-  urlbarAddonIframeContentScript.js
-[browser_urlbarAboutHomeLoading.js]
-[browser_urlbarAutofillPreserveCase.js]
-[browser_urlbarAutoFillTrimURLs.js]
-[browser_urlbarCopying.js]
-subsuite = clipboard
-support-files =
-  authenticate.sjs
-[browser_urlbarDecode.js]
-[browser_urlbarDelete.js]
-[browser_urlbarEnter.js]
-[browser_urlbar_whereToOpen.js]
-[browser_urlbarEnterAfterMouseOver.js]
-skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
-[browser_urlbarFocusedCmdK.js]
-[browser_urlbarHashChangeProxyState.js]
-[browser_urlbarKeepStateAcrossTabSwitches.js]
-[browser_urlbarOneOffs.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarOneOffs_searchSuggestions.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarOneOffs_settings.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarPlaceholder.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarPrivateBrowsingWindowChange.js]
-[browser_urlbarRaceWithTabs.js]
-skip-if = os == "linux" # Bug 1382456
-[browser_urlbarRevert.js]
-[browser_urlbarSearchFunction.js]
-[browser_urlbarSearchSingleWordNotification.js]
-[browser_urlbarSearchSuggestions.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarSearchSuggestions_opt-out.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarSearchTelemetry.js]
-support-files =
-  searchSuggestionEngine.xml
-  searchSuggestionEngine.sjs
-[browser_urlbarStop.js]
-[browser_urlbarTokenAlias.js]
-[browser_urlbarUpdateForDomainCompletion.js]
-[browser_urlbar_autoFill_backspaced.js]
-[browser_urlbar_canonize_on_autofill.js]
-[browser_urlbar_blanking.js]
-support-files =
-  file_blank_but_not_blank.html
-[browser_urlbar_locationchange_urlbar_edit_dos.js]
-support-files =
-  file_urlbar_edit_dos.html
-[browser_urlbar_remove_match.js]
-[browser_urlbar_searchsettings.js]
-[browser_urlbar_search_speculative_connect.js]
-[browser_urlbar_search_speculative_connect_engine.js]
-support-files =
-  searchSuggestionEngine2.xml
-  searchSuggestionEngine.sjs
-[browser_urlbar_search_speculative_connect_mousedown.js]
-[browser_urlbar_search_no_speculative_connect_with_client_cert.js]
-[browser_urlbar_stop_pending.js]
-support-files =
-  slow-page.sjs
-[browser_urlbar_remoteness_switch.js]
-run-if = e10s
-[browser_wyciwyg_urlbarCopying.js]
-subsuite = clipboard
-support-files =
-  test_wyciwyg_copying.html
-[browser_urlbarStopSearchOnSelection.js]
-support-files =
-  searchSuggestionEngineSlow.xml
-  searchSuggestionEngine.sjs
deleted file mode 100644
--- a/browser/base/content/test/urlbar/urlbarAddonIframe.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-  <head>
-    <script src="http://mochi.test:8888/browser/browser/base/content/test/urlbar/urlbarAddonIframe.js"></script>
-  </head>
-  <body>
-    Hello
-  </body>
-</html>
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -48,17 +48,16 @@ BROWSER_CHROME_MANIFESTS += [
     'content/test/static/browser.ini',
     'content/test/statuspanel/browser.ini',
     'content/test/sync/browser.ini',
     'content/test/tabcrashed/browser.ini',
     'content/test/tabPrompts/browser.ini',
     'content/test/tabs/browser.ini',
     'content/test/touch/browser.ini',
     'content/test/trackingUI/browser.ini',
-    'content/test/urlbar/browser.ini',
     'content/test/webextensions/browser.ini',
     'content/test/webrtc/browser.ini',
 ]
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 DEFINES['MOZ_BROWSER_XHTML'] = CONFIG['MOZ_BROWSER_XHTML']
 
--- a/browser/components/urlbar/moz.build
+++ b/browser/components/urlbar/moz.build
@@ -15,10 +15,13 @@ EXTRA_JS_MODULES += [
     'UrlbarProvidersManager.jsm',
     'UrlbarProviderUnifiedComplete.jsm',
     'UrlbarTokenizer.jsm',
     'UrlbarUtils.jsm',
     'UrlbarValueFormatter.jsm',
     'UrlbarView.jsm',
 ]
 
-BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+BROWSER_CHROME_MANIFESTS += [
+    'tests/browser/browser.ini',
+    'tests/legacy/browser.ini',
+]
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
rename from browser/base/content/test/urlbar/Panel.jsm
rename to browser/components/urlbar/tests/browser/Panel.jsm
rename from browser/base/content/test/urlbar/authenticate.sjs
rename to browser/components/urlbar/tests/browser/authenticate.sjs
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@@ -1,16 +1,75 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
+prefs=browser.urlbar.quantumbar=false
 support-files =
+  dummy_page.html
   head.js
+  head-common.js
 
+[browser_bug562649.js]
+support-files = file_bug562649.html
+[browser_bug623155.js]
+support-files =
+  redirect_bug623155.sjs
+[browser_bug783614.js]
+[browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
+[browser_locationBarExternalLoad.js]
+[browser_moz_action_link.js]
+[browser_page_action_menu_add_search_engine.js]
+support-files =
+  page_action_menu_add_search_engine_one.html
+  page_action_menu_add_search_engine_many.html
+  page_action_menu_add_search_engine_same_names.html
+  page_action_menu_add_search_engine_0.xml
+  page_action_menu_add_search_engine_1.xml
+  page_action_menu_add_search_engine_2.xml
+[browser_page_action_menu_clipboard.js]
+subsuite = clipboard
+[browser_page_action_menu_share_mac.js]
+skip-if = os != "mac" # Mac only feature
+[browser_page_action_menu_share_win.js]
+support-files =
+  browser_page_action_menu_share_win.html
+skip-if = os != "win" # Windows only feature
+[browser_populateAfterPushState.js]
+[browser_urlbar_blanking.js]
+support-files =
+  file_blank_but_not_blank.html
+[browser_urlbar_locationchange_urlbar_edit_dos.js]
+support-files =
+  file_urlbar_edit_dos.html
+[browser_urlbar_remoteness_switch.js]
+run-if = e10s
+[browser_urlbar_searchsettings.js]
+[browser_urlbar_whereToOpen.js]
+[browser_urlbarCopying.js]
+subsuite = clipboard
+support-files =
+  authenticate.sjs
+[browser_urlbarEnter.js]
+[browser_urlbarFocusedCmdK.js]
+[browser_urlbarHashChangeProxyState.js]
 [browser_UrlbarInput_formatValue.js]
 [browser_UrlbarInput_overflow.js]
 [browser_UrlbarInput_tooltip.js]
 [browser_UrlbarInput_trimURLs.js]
 subsuite = clipboard
 [browser_UrlbarInput_unit.js]
 support-files = empty.xul
 [browser_UrlbarLoadRace.js]
+[browser_urlbarPlaceholder.js]
+support-files =
+  searchSuggestionEngine.xml
+  searchSuggestionEngine.sjs
+[browser_urlbarRevert.js]
+[browser_urlbarSearchSingleWordNotification.js]
+[browser_URLBarSetURI.js]
+skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
+[browser_urlbarUpdateForDomainCompletion.js]
+[browser_wyciwyg_urlbarCopying.js]
+subsuite = clipboard
+support-files =
+  test_wyciwyg_copying.html
rename from browser/base/content/test/urlbar/browser_URLBarSetURI.js
rename to browser/components/urlbar/tests/browser/browser_URLBarSetURI.js
rename from browser/base/content/test/urlbar/browser_bug1025195_switchToTabHavingURI_aOpenParams.js
rename to browser/components/urlbar/tests/browser/browser_bug1025195_switchToTabHavingURI_aOpenParams.js
rename from browser/base/content/test/urlbar/browser_bug562649.js
rename to browser/components/urlbar/tests/browser/browser_bug562649.js
rename from browser/base/content/test/urlbar/browser_bug623155.js
rename to browser/components/urlbar/tests/browser/browser_bug623155.js
rename from browser/base/content/test/urlbar/browser_bug783614.js
rename to browser/components/urlbar/tests/browser/browser_bug783614.js
rename from browser/base/content/test/urlbar/browser_locationBarExternalLoad.js
rename to browser/components/urlbar/tests/browser/browser_locationBarExternalLoad.js
rename from browser/base/content/test/urlbar/browser_moz_action_link.js
rename to browser/components/urlbar/tests/browser/browser_moz_action_link.js
rename from browser/base/content/test/urlbar/browser_page_action_menu_add_search_engine.js
rename to browser/components/urlbar/tests/browser/browser_page_action_menu_add_search_engine.js
rename from browser/base/content/test/urlbar/browser_page_action_menu_clipboard.js
rename to browser/components/urlbar/tests/browser/browser_page_action_menu_clipboard.js
rename from browser/base/content/test/urlbar/browser_page_action_menu_share_mac.js
rename to browser/components/urlbar/tests/browser/browser_page_action_menu_share_mac.js
rename from browser/base/content/test/urlbar/browser_page_action_menu_share_win.html
rename to browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.html
rename from browser/base/content/test/urlbar/browser_page_action_menu_share_win.js
rename to browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.js
rename from browser/base/content/test/urlbar/browser_populateAfterPushState.js
rename to browser/components/urlbar/tests/browser/browser_populateAfterPushState.js
rename from browser/base/content/test/urlbar/browser_urlbarCopying.js
rename to browser/components/urlbar/tests/browser/browser_urlbarCopying.js
rename from browser/base/content/test/urlbar/browser_urlbarEnter.js
rename to browser/components/urlbar/tests/browser/browser_urlbarEnter.js
rename from browser/base/content/test/urlbar/browser_urlbarFocusedCmdK.js
rename to browser/components/urlbar/tests/browser/browser_urlbarFocusedCmdK.js
rename from browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js
rename to browser/components/urlbar/tests/browser/browser_urlbarHashChangeProxyState.js
rename from browser/base/content/test/urlbar/browser_urlbarPlaceholder.js
rename to browser/components/urlbar/tests/browser/browser_urlbarPlaceholder.js
rename from browser/base/content/test/urlbar/browser_urlbarRevert.js
rename to browser/components/urlbar/tests/browser/browser_urlbarRevert.js
rename from browser/base/content/test/urlbar/browser_urlbarSearchSingleWordNotification.js
rename to browser/components/urlbar/tests/browser/browser_urlbarSearchSingleWordNotification.js
rename from browser/base/content/test/urlbar/browser_urlbarUpdateForDomainCompletion.js
rename to browser/components/urlbar/tests/browser/browser_urlbarUpdateForDomainCompletion.js
rename from browser/base/content/test/urlbar/browser_urlbar_blanking.js
rename to browser/components/urlbar/tests/browser/browser_urlbar_blanking.js
rename from browser/base/content/test/urlbar/browser_urlbar_locationchange_urlbar_edit_dos.js
rename to browser/components/urlbar/tests/browser/browser_urlbar_locationchange_urlbar_edit_dos.js
rename from browser/base/content/test/urlbar/browser_urlbar_remoteness_switch.js
rename to browser/components/urlbar/tests/browser/browser_urlbar_remoteness_switch.js
rename from browser/base/content/test/urlbar/browser_urlbar_searchsettings.js
rename to browser/components/urlbar/tests/browser/browser_urlbar_searchsettings.js
rename from browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js
rename to browser/components/urlbar/tests/browser/browser_urlbar_whereToOpen.js
rename from browser/base/content/test/urlbar/browser_wyciwyg_urlbarCopying.js
rename to browser/components/urlbar/tests/browser/browser_wyciwyg_urlbarCopying.js
rename from browser/base/content/test/urlbar/dummy_page.html
rename to browser/components/urlbar/tests/browser/dummy_page.html
rename from browser/base/content/test/urlbar/file_blank_but_not_blank.html
rename to browser/components/urlbar/tests/browser/file_blank_but_not_blank.html
rename from browser/base/content/test/urlbar/file_bug562649.html
rename to browser/components/urlbar/tests/browser/file_bug562649.html
rename from browser/base/content/test/urlbar/file_urlbar_edit_dos.html
rename to browser/components/urlbar/tests/browser/file_urlbar_edit_dos.html
rename from browser/base/content/test/urlbar/head.js
rename to browser/components/urlbar/tests/browser/head-common.js
--- a/browser/base/content/test/urlbar/head.js
+++ b/browser/components/urlbar/tests/browser/head-common.js
@@ -13,26 +13,28 @@ XPCOMUtils.defineLazyModuleGetters(this,
 
 SearchTestUtils.init(Assert, registerCleanupFunction);
 
 /**
  * Waits for the next top-level document load in the current browser.  The URI
  * of the document is compared against aExpectedURL.  The load is then stopped
  * before it actually starts.
  *
- * @param aExpectedURL
+ * @param {string} aExpectedURL
  *        The URL of the document that is expected to load.
- * @param aStopFromProgressListener
+ * @param {object} [aBrowser]
+ *        The browser to wait for.
+ * @param {boolean} [aStopFromProgressListener]
  *        Whether to cancel the load directly from the progress listener. Defaults to true.
  *        If you're using this method to avoid hitting the network, you want the default (true).
  *        However, the browser UI will behave differently for loads stopped directly from
  *        the progress listener (effectively in the middle of a call to loadURI) and so there
  *        are cases where you may want to avoid stopping the load directly from within the
  *        progress listener callback.
- * @return promise
+ * @returns {Promise}
  */
 function waitForDocLoadAndStopIt(aExpectedURL, aBrowser = gBrowser.selectedBrowser, aStopFromProgressListener = true) {
   function content_script(contentStopFromProgressListener) {
     ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
     let wp = docShell.QueryInterface(Ci.nsIWebProgress);
 
     function stopContent(now, uri) {
       if (now) {
--- a/browser/components/urlbar/tests/browser/head.js
+++ b/browser/components/urlbar/tests/browser/head.js
@@ -14,14 +14,19 @@ XPCOMUtils.defineLazyModuleGetters(this,
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
   Services: "resource://gre/modules/Services.jsm",
   QueryContext: "resource:///modules/UrlbarUtils.jsm",
   UrlbarController: "resource:///modules/UrlbarController.jsm",
   UrlbarMatch: "resource:///modules/UrlbarMatch.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
+/* import-globals-from head-common.js */
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/browser/components/urlbar/tests/browser/head-common.js",
+  this);
+
 /* global sinon */
 Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js");
 
 registerCleanupFunction(function() {
   delete window.sinon;
 });
rename from browser/base/content/test/urlbar/moz.png
rename to browser/components/urlbar/tests/browser/moz.png
rename from browser/base/content/test/urlbar/page_action_menu_add_search_engine_0.xml
rename to browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_0.xml
rename from browser/base/content/test/urlbar/page_action_menu_add_search_engine_1.xml
rename to browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_1.xml
rename from browser/base/content/test/urlbar/page_action_menu_add_search_engine_2.xml
rename to browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_2.xml
rename from browser/base/content/test/urlbar/page_action_menu_add_search_engine_many.html
rename to browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_many.html
--- a/browser/base/content/test/urlbar/page_action_menu_add_search_engine_many.html
+++ b/browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_many.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
-<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_0" href="http://mochi.test:8888/browser/browser/base/content/test/urlbar/page_action_menu_add_search_engine_0.xml">
-<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_1" href="http://mochi.test:8888/browser/browser/base/content/test/urlbar/page_action_menu_add_search_engine_1.xml">
-<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_2" href="http://mochi.test:8888/browser/browser/base/content/test/urlbar/page_action_menu_add_search_engine_2.xml">
+<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_0" href="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_0.xml">
+<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_1" href="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_1.xml">
+<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_2" href="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_2.xml">
 </head>
 <body></body>
 </html>
rename from browser/base/content/test/urlbar/page_action_menu_add_search_engine_one.html
rename to browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_one.html
--- a/browser/base/content/test/urlbar/page_action_menu_add_search_engine_one.html
+++ b/browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_one.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
-<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_0" href="http://mochi.test:8888/browser/browser/base/content/test/urlbar/page_action_menu_add_search_engine_0.xml">
+<link rel="search" type="application/opensearchdescription+xml" title="page_action_menu_add_search_engine_0" href="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_0.xml">
 </head>
 <body></body>
 </html>
rename from browser/base/content/test/urlbar/page_action_menu_add_search_engine_same_names.html
rename to browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_same_names.html
rename from browser/base/content/test/urlbar/print_postdata.sjs
rename to browser/components/urlbar/tests/browser/print_postdata.sjs
rename from browser/base/content/test/urlbar/redirect_bug623155.sjs
rename to browser/components/urlbar/tests/browser/redirect_bug623155.sjs
rename from browser/base/content/test/urlbar/searchSuggestionEngine.sjs
rename to browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs
rename from browser/base/content/test/urlbar/searchSuggestionEngine.xml
rename to browser/components/urlbar/tests/browser/searchSuggestionEngine.xml
--- a/browser/base/content/test/urlbar/searchSuggestionEngine.xml
+++ b/browser/components/urlbar/tests/browser/searchSuggestionEngine.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>browser_searchSuggestionEngine searchSuggestionEngine.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/base/content/test/urlbar/searchSuggestionEngine.sjs?{searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs?{searchTerms}"/>
 <Url type="text/html" method="GET" template="http://mochi.test:8888/" rel="searchform">
   <Param name="terms" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
rename from browser/base/content/test/urlbar/searchSuggestionEngine2.xml
rename to browser/components/urlbar/tests/browser/searchSuggestionEngine2.xml
--- a/browser/base/content/test/urlbar/searchSuggestionEngine2.xml
+++ b/browser/components/urlbar/tests/browser/searchSuggestionEngine2.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>browser_searchSuggestionEngine searchSuggestionEngine.xml</ShortName>
 <!-- Redirect the actual search request to the test-server because of proxy restriction -->
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/base/content/test/urlbar/searchSuggestionEngine.sjs?{searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs?{searchTerms}"/>
 <!-- Redirect speculative connect to a local http server we run for this test -->
 <Url type="text/html" method="GET" template="http://localhost:20709/" rel="searchform">
   <Param name="terms" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
rename from browser/base/content/test/urlbar/searchSuggestionEngineSlow.xml
rename to browser/components/urlbar/tests/browser/searchSuggestionEngineSlow.xml
--- a/browser/base/content/test/urlbar/searchSuggestionEngineSlow.xml
+++ b/browser/components/urlbar/tests/browser/searchSuggestionEngineSlow.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Any copyright is dedicated to the Public Domain.
    - http://creativecommons.org/publicdomain/zero/1.0/ -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>searchSuggestionEngineSlow.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/base/content/test/urlbar/searchSuggestionEngine.sjs?query={searchTerms}&amp;timeout=1000"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs?query={searchTerms}&amp;timeout=1000"/>
 <Url type="text/html" method="GET" template="http://mochi.test:8888/" rel="searchform">
   <Param name="terms" value="{searchTerms}"/>
 </Url>
 </SearchPlugin>
rename from browser/base/content/test/urlbar/slow-page.sjs
rename to browser/components/urlbar/tests/browser/slow-page.sjs
rename from browser/base/content/test/urlbar/test_wyciwyg_copying.html
rename to browser/components/urlbar/tests/browser/test_wyciwyg_copying.html
--- a/browser/base/content/test/urlbar/test_wyciwyg_copying.html
+++ b/browser/components/urlbar/tests/browser/test_wyciwyg_copying.html
@@ -1,13 +1,13 @@
 <html>
 <body>
 <script>
   function go() {
-    var w = window.open();
+    let w = window.open();
     w.document.open();
     w.document.write("<html><body>test document</body></html>");
     w.document.close();
   }
 </script>
 <button id="btn" onclick="go();">test</button>
 </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/browser/components/urlbar/tests/browser/urlbarAddonIframe.html
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <script src="http://mochi.test:8888/browser/browser/components/urlbar/tests/legacy/urlbarAddonIframe.js"></script>
+  </head>
+  <body>
+    Hello
+  </body>
+</html>
rename from browser/base/content/test/urlbar/urlbarAddonIframe.js
rename to browser/components/urlbar/tests/browser/urlbarAddonIframe.js
rename from browser/base/content/test/urlbar/urlbarAddonIframeContentScript.js
rename to browser/components/urlbar/tests/browser/urlbarAddonIframeContentScript.js
rename from browser/base/content/test/urlbar/.eslintrc.js
rename to browser/components/urlbar/tests/legacy/.eslintrc.js
new file mode 100644
--- /dev/null
+++ b/browser/components/urlbar/tests/legacy/browser.ini
@@ -0,0 +1,177 @@
+[DEFAULT]
+prefs=browser.urlbar.quantumbar=false
+support-files =
+  ../browser/dummy_page.html
+  ../browser/head-common.js
+  head.js
+
+# XXX Bug 1514162: These are tests that have not yet been ported to the new
+# QuantumBar.
+#
+# If you port a test, please move it to the section below to make it clearer
+# to identify the remaining tests.
+
+[browser_action_keyword.js]
+skip-if = os == "linux" # Bug 1188154
+support-files =
+  ../browser/print_postdata.sjs
+[browser_action_keyword_override.js]
+[browser_action_searchengine.js]
+[browser_action_searchengine_alias.js]
+[browser_autocomplete_a11y_label.js]
+skip-if = (verify && !debug && (os == 'win'))
+[browser_autocomplete_autoselect.js]
+[browser_autocomplete_cursor.js]
+skip-if = verify
+[browser_autocomplete_edit_completed.js]
+[browser_autocomplete_enter_race.js]
+[browser_autocomplete_no_title.js]
+[browser_autocomplete_readline_navigation.js]
+skip-if = os != "mac" # Mac only feature
+[browser_autocomplete_tag_star_visibility.js]
+[browser_bug1104165-switchtab-decodeuri.js]
+[browser_bug1003461-switchtab-override.js]
+skip-if = (verify && debug && (os == 'win'))
+[browser_bug1024133-switchtab-override-keynav.js]
+[browser_bug1070778.js]
+[browser_bug1225194-remotetab.js]
+[browser_bug304198.js]
+[browser_bug556061.js]
+subsuite = clipboard
+[browser_canonizeURL.js]
+[browser_dragdropURL.js]
+[browser_locationBarCommand.js]
+[browser_new_tab_urlbar_reset.js]
+[browser_page_action_menu.js]
+skip-if = os != "win" # Windows only feature
+[browser_pasteAndGo.js]
+subsuite = clipboard
+[../browser/browser_populateAfterPushState.js]
+[browser_removeUnsafeProtocolsFromURLBarPaste.js]
+subsuite = clipboard
+[browser_search_favicon.js]
+[browser_tabMatchesInAwesomebar.js]
+support-files =
+  ../browser/moz.png
+[browser_tabMatchesInAwesomebar_perwindowpb.js]
+skip-if = os == 'linux' # Bug 1104755
+[browser_urlbarAddonIframe.js]
+support-files =
+  ../browser/Panel.jsm
+  ../browser/urlbarAddonIframe.html
+  ../browser/urlbarAddonIframe.js
+  ../browser/urlbarAddonIframeContentScript.js
+[browser_urlbarAboutHomeLoading.js]
+[browser_urlbarAutofillPreserveCase.js]
+[browser_urlbarAutoFillTrimURLs.js]
+[browser_urlbarDecode.js]
+[browser_urlbarDelete.js]
+[browser_urlbarEnterAfterMouseOver.js]
+skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
+[browser_urlbarKeepStateAcrossTabSwitches.js]
+[browser_urlbarOneOffs.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbarOneOffs_searchSuggestions.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbarOneOffs_settings.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbarPrivateBrowsingWindowChange.js]
+[browser_urlbarRaceWithTabs.js]
+skip-if = os == "linux" # Bug 1382456
+[browser_urlbarSearchFunction.js]
+[browser_urlbarSearchSuggestions.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbarSearchSuggestions_opt-out.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbarSearchTelemetry.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbarStop.js]
+[browser_urlbarTokenAlias.js]
+[browser_urlbar_autoFill_backspaced.js]
+[browser_urlbar_canonize_on_autofill.js]
+[browser_urlbar_remove_match.js]
+[browser_urlbar_search_speculative_connect.js]
+[browser_urlbar_search_speculative_connect_engine.js]
+support-files =
+  ../browser/searchSuggestionEngine2.xml
+  ../browser/searchSuggestionEngine.sjs
+[browser_urlbar_search_speculative_connect_mousedown.js]
+[browser_urlbar_search_no_speculative_connect_with_client_cert.js]
+[browser_urlbar_stop_pending.js]
+support-files =
+  ../browser/slow-page.sjs
+[browser_urlbarStopSearchOnSelection.js]
+support-files =
+  ../browser/searchSuggestionEngineSlow.xml
+  ../browser/searchSuggestionEngine.sjs
+
+# These are tests that are already running with QuantumBar, but we want to run them
+# against both the legacy urlbar and the new QuantumBar. The references in this
+# directory will run them against the old urlbar as per the pref above.
+
+[../browser/browser_URLBarSetURI.js]
+skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
+[../browser/browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
+[../browser/browser_bug562649.js]
+support-files = ../browser/file_bug562649.html
+[../browser/browser_bug623155.js]
+support-files =
+  ../browser/redirect_bug623155.sjs
+[../browser/browser_bug783614.js]
+[../browser/browser_locationBarExternalLoad.js]
+[../browser/browser_moz_action_link.js]
+[../browser/browser_page_action_menu_add_search_engine.js]
+support-files =
+  ../browser/page_action_menu_add_search_engine_one.html
+  ../browser/page_action_menu_add_search_engine_many.html
+  ../browser/page_action_menu_add_search_engine_same_names.html
+  ../browser/page_action_menu_add_search_engine_0.xml
+  ../browser/page_action_menu_add_search_engine_1.xml
+  ../browser/page_action_menu_add_search_engine_2.xml
+[../browser/browser_page_action_menu_clipboard.js]
+subsuite = clipboard
+[../browser/browser_page_action_menu_share_mac.js]
+skip-if = os != "mac" # Mac only feature
+[../browser/browser_page_action_menu_share_win.js]
+support-files =
+  ../browser/browser_page_action_menu_share_win.html
+[../browser/browser_urlbarCopying.js]
+subsuite = clipboard
+support-files =
+  ../browser/authenticate.sjs
+[../browser/browser_urlbar_blanking.js]
+support-files =
+  ../browser/file_blank_but_not_blank.html
+[../browser/browser_urlbar_locationchange_urlbar_edit_dos.js]
+support-files =
+  ../browser/file_urlbar_edit_dos.html
+[../browser/browser_urlbarEnter.js]
+[../browser/browser_urlbar_whereToOpen.js]
+[../browser/browser_urlbarFocusedCmdK.js]
+[../browser/browser_urlbarHashChangeProxyState.js]
+[../browser/browser_urlbarPlaceholder.js]
+support-files =
+  ../browser/searchSuggestionEngine.xml
+  ../browser/searchSuggestionEngine.sjs
+[../browser/browser_urlbarRevert.js]
+[../browser/browser_urlbarSearchSingleWordNotification.js]
+[../browser/browser_urlbarUpdateForDomainCompletion.js]
+[../browser/browser_urlbar_searchsettings.js]
+[../browser/browser_urlbar_remoteness_switch.js]
+run-if = e10s
+[../browser/browser_wyciwyg_urlbarCopying.js]
+subsuite = clipboard
+support-files =
+  ../browser/test_wyciwyg_copying.html
rename from browser/base/content/test/urlbar/browser_action_keyword.js
rename to browser/components/urlbar/tests/legacy/browser_action_keyword.js
rename from browser/base/content/test/urlbar/browser_action_keyword_override.js
rename to browser/components/urlbar/tests/legacy/browser_action_keyword_override.js
rename from browser/base/content/test/urlbar/browser_action_searchengine.js
rename to browser/components/urlbar/tests/legacy/browser_action_searchengine.js
rename from browser/base/content/test/urlbar/browser_action_searchengine_alias.js
rename to browser/components/urlbar/tests/legacy/browser_action_searchengine_alias.js
rename from browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_a11y_label.js
rename from browser/base/content/test/urlbar/browser_autocomplete_autoselect.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_autoselect.js
rename from browser/base/content/test/urlbar/browser_autocomplete_cursor.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_cursor.js
rename from browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_edit_completed.js
rename from browser/base/content/test/urlbar/browser_autocomplete_enter_race.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_enter_race.js
rename from browser/base/content/test/urlbar/browser_autocomplete_no_title.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_no_title.js
rename from browser/base/content/test/urlbar/browser_autocomplete_readline_navigation.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_readline_navigation.js
rename from browser/base/content/test/urlbar/browser_autocomplete_tag_star_visibility.js
rename to browser/components/urlbar/tests/legacy/browser_autocomplete_tag_star_visibility.js
rename from browser/base/content/test/urlbar/browser_bug1003461-switchtab-override.js
rename to browser/components/urlbar/tests/legacy/browser_bug1003461-switchtab-override.js
rename from browser/base/content/test/urlbar/browser_bug1024133-switchtab-override-keynav.js
rename to browser/components/urlbar/tests/legacy/browser_bug1024133-switchtab-override-keynav.js
rename from browser/base/content/test/urlbar/browser_bug1070778.js
rename to browser/components/urlbar/tests/legacy/browser_bug1070778.js
rename from browser/base/content/test/urlbar/browser_bug1104165-switchtab-decodeuri.js
rename to browser/components/urlbar/tests/legacy/browser_bug1104165-switchtab-decodeuri.js
rename from browser/base/content/test/urlbar/browser_bug1225194-remotetab.js
rename to browser/components/urlbar/tests/legacy/browser_bug1225194-remotetab.js
rename from browser/base/content/test/urlbar/browser_bug304198.js
rename to browser/components/urlbar/tests/legacy/browser_bug304198.js
rename from browser/base/content/test/urlbar/browser_bug556061.js
rename to browser/components/urlbar/tests/legacy/browser_bug556061.js
rename from browser/base/content/test/urlbar/browser_canonizeURL.js
rename to browser/components/urlbar/tests/legacy/browser_canonizeURL.js
rename from browser/base/content/test/urlbar/browser_dragdropURL.js
rename to browser/components/urlbar/tests/legacy/browser_dragdropURL.js
rename from browser/base/content/test/urlbar/browser_locationBarCommand.js
rename to browser/components/urlbar/tests/legacy/browser_locationBarCommand.js
rename from browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js
rename to browser/components/urlbar/tests/legacy/browser_new_tab_urlbar_reset.js
rename from browser/base/content/test/urlbar/browser_page_action_menu.js
rename to browser/components/urlbar/tests/legacy/browser_page_action_menu.js
rename from browser/base/content/test/urlbar/browser_pasteAndGo.js
rename to browser/components/urlbar/tests/legacy/browser_pasteAndGo.js
rename from browser/base/content/test/urlbar/browser_removeUnsafeProtocolsFromURLBarPaste.js
rename to browser/components/urlbar/tests/legacy/browser_removeUnsafeProtocolsFromURLBarPaste.js
rename from browser/base/content/test/urlbar/browser_search_favicon.js
rename to browser/components/urlbar/tests/legacy/browser_search_favicon.js
rename from browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
rename to browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar.js
rename from browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar_perwindowpb.js
rename to browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar_perwindowpb.js
rename from browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarAboutHomeLoading.js
rename from browser/base/content/test/urlbar/browser_urlbarAddonIframe.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarAddonIframe.js
--- a/browser/base/content/test/urlbar/browser_urlbarAddonIframe.js
+++ b/browser/components/urlbar/tests/legacy/browser_urlbarAddonIframe.js
@@ -164,35 +164,44 @@ function promiseIframeLoad() {
       resolve();
     });
   });
 }
 
 /**
  * Returns a single promise that's resolved when the content JS has called the
  * function.
+ * @returns {Promise}
  */
 function promiseUrlbarFunctionCall(...args) {
   return promiseMessage("function", args)[0];
 }
 
 /**
  * Returns two promises in an array.  The first is resolved when the content JS
  * has added its event listener.  The second is resolved when the content JS
  * has received the event.
+ *
+ * @param {string} type
+ * @returns {Promise}
  */
 function promiseEvent(type) {
   return promiseMessage("event", type, 2);
 }
 
 let gNextMessageID = 1;
 
 /**
  * Returns an array of promises, one per ack.  Each is resolved when the content
  * JS acks the message.  numExpectedAcks is the number of acks you expect.
+ *
+ * @param {string} type
+ * @param {string} data
+ * @param {number} [numExpectedAcks]
+ * @returns {Promise}
  */
 function promiseMessage(type, data, numExpectedAcks = 1) {
   let testMsgName = "TestMessage";
   let ackMsgName = "TestMessageAck";
   let msgID = gNextMessageID++;
   gMsgMan.sendAsyncMessage(testMsgName, {
     type,
     messageID: msgID,
rename from browser/base/content/test/urlbar/browser_urlbarAutoFillTrimURLs.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarAutoFillTrimURLs.js
rename from browser/base/content/test/urlbar/browser_urlbarAutofillPreserveCase.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarAutofillPreserveCase.js
rename from browser/base/content/test/urlbar/browser_urlbarDecode.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarDecode.js
rename from browser/base/content/test/urlbar/browser_urlbarDelete.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarDelete.js
rename from browser/base/content/test/urlbar/browser_urlbarEnterAfterMouseOver.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarEnterAfterMouseOver.js
rename from browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarKeepStateAcrossTabSwitches.js
rename from browser/base/content/test/urlbar/browser_urlbarOneOffs.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarOneOffs.js
rename from browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_searchSuggestions.js
rename from browser/base/content/test/urlbar/browser_urlbarOneOffs_settings.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_settings.js
rename from browser/base/content/test/urlbar/browser_urlbarPrivateBrowsingWindowChange.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarPrivateBrowsingWindowChange.js
rename from browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarRaceWithTabs.js
rename from browser/base/content/test/urlbar/browser_urlbarSearchFunction.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarSearchFunction.js
--- a/browser/base/content/test/urlbar/browser_urlbarSearchFunction.js
+++ b/browser/components/urlbar/tests/legacy/browser_urlbarSearchFunction.js
@@ -79,18 +79,18 @@ add_task(async function searchEngineAlia
   resetNotification();
 });
 
 
 /**
  * Makes sure the search-suggestions notification will be shown the next several
  * times the popup opens.
  *
- * @return  A function that you should call when you're done that resets the
- *          state of the notification.
+ * @returns {function} A function that you should call when you're done that
+ *   resets the state state of the notification.
  */
 function enableSearchSuggestionsNotification() {
   let which = gURLBar._whichSearchSuggestionsNotification || undefined;
   gURLBar._whichSearchSuggestionsNotification = "opt-out";
   Services.prefs.setIntPref("timesBeforeHidingSuggestionsHint", 10);
   return function reset() {
     if (which === undefined) {
       delete gURLBar._whichSearchSuggestionsNotification;
@@ -99,50 +99,50 @@ function enableSearchSuggestionsNotifica
     }
     Services.prefs.clearUserPref("timesBeforeHidingSuggestionsHint");
   };
 }
 
 /**
  * Asserts that the search-suggestion notification is or isn't visible.
  *
- * @param visible
+ * @param {boolean} visible
  *        True if it should be visible, false if not.
  */
 function assertSearchSuggestionsNotificationVisible(visible) {
   Assert.equal(
     gURLBar.popup.classList.contains("showSearchSuggestionsNotification"),
     visible
   );
   Assert.equal(
     window.getComputedStyle(gURLBar.popup.searchSuggestionsNotification).display,
     visible ? "-moz-deck" : "none"
   );
 }
 
 /**
  * Asserts that the one-off search buttons are or aren't visible.
  *
- * @param visible
+ * @param {boolean} visible
  *        True if they should be visible, false if not.
  */
 function assertOneOffButtonsVisible(visible) {
   Assert.equal(gURLBar.popup.oneOffSearchesEnabled, visible);
   Assert.equal(
     window.getComputedStyle(gURLBar.popup.oneOffSearchButtons.container).display,
     visible ? "-moz-box" : "none"
   );
 }
 
 /**
  * Asserts that the urlbar's input value is the given value.  Also asserts that
  * the first (heuristic) result in the popup is a search suggestion whose search
  * query is the given value.
  *
- * @param value
+ * @param {string} value
  *        The urlbar's expected value.
  */
 function assertUrlbarValue(value) {
   Assert.equal(gURLBar.value, value);
   let controller = gURLBar.controller;
   Assert.ok(controller.matchCount > 0);
   let action = gURLBar._parseActionUrl(controller.getValueAt(0));
   Assert.ok(action);
rename from browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions.js
rename from browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions_opt-out.js
rename from browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarSearchTelemetry.js
--- a/browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js
+++ b/browser/components/urlbar/tests/legacy/browser_urlbarSearchTelemetry.js
@@ -94,18 +94,18 @@ add_task(async function searchSuggestion
   });
 });
 
 /**
  * This does three things: gets current telemetry/FHR counts, calls
  * clickCallback, gets telemetry/FHR counts again to compare them to the old
  * counts.
  *
- * @param clickCallback Use this to open the urlbar popup and choose and click a
- *        result.
+ * @param {function} clickCallback Use this to open the urlbar popup and choose
+ *   and click a result.
  */
 async function compareCounts(clickCallback) {
   // Search events triggered by clicks (not the Return key in the urlbar) are
   // recorded in three places:
   // * Telemetry histogram named "SEARCH_COUNTS"
   // * FHR
 
   let engine = Services.search.defaultEngine;
@@ -145,18 +145,18 @@ async function compareCounts(clickCallba
   Assert.equal(snapshot[histogramKey].sum, histogramCount + 1,
                "histogram sum should be incremented");
 }
 
 /**
  * Returns the "action" object at the given index in the urlbar results:
  * { type, params: {}}
  *
- * @param index The index in the urlbar results.
- * @return An action object, or null if index >= number of results.
+ * @param {number} index The index in the urlbar results.
+ * @returns {object|null} An action object, or null if index >= number of results.
  */
 function getActionAtIndex(index) {
   let controller = gURLBar.popup.input.controller;
   if (controller.matchCount <= index) {
     return null;
   }
   let url = controller.getValueAt(index);
   let mozActionMatch = url.match(/^moz-action:([^,]+),(.*)$/);
@@ -170,17 +170,17 @@ function getActionAtIndex(index) {
     type,
     params: JSON.parse(paramStr),
   };
 }
 
 /**
  * Returns the index of the first search suggestion in the urlbar results.
  *
- * @return An index, or -1 if there are no search suggestions.
+ * @returns {number} An index, or -1 if there are no search suggestions.
  */
 function getFirstSuggestionIndex() {
   let controller = gURLBar.popup.input.controller;
   let matchCount = controller.matchCount;
   for (let i = 0; i < matchCount; i++) {
     let url = controller.getValueAt(i);
     let mozActionMatch = url.match(/^moz-action:([^,]+),(.*)$/);
     if (mozActionMatch) {
rename from browser/base/content/test/urlbar/browser_urlbarStop.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarStop.js
rename from browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarStopSearchOnSelection.js
rename from browser/base/content/test/urlbar/browser_urlbarTokenAlias.js
rename to browser/components/urlbar/tests/legacy/browser_urlbarTokenAlias.js
rename from browser/base/content/test/urlbar/browser_urlbar_autoFill_backspaced.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_autoFill_backspaced.js
rename from browser/base/content/test/urlbar/browser_urlbar_canonize_on_autofill.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_canonize_on_autofill.js
rename from browser/base/content/test/urlbar/browser_urlbar_remove_match.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_remove_match.js
rename from browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_search_no_speculative_connect_with_client_cert.js
rename from browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect.js
rename from browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_engine.js
rename from browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_mousedown.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_mousedown.js
rename from browser/base/content/test/urlbar/browser_urlbar_stop_pending.js
rename to browser/components/urlbar/tests/legacy/browser_urlbar_stop_pending.js
new file mode 100644
--- /dev/null
+++ b/browser/components/urlbar/tests/legacy/head.js
@@ -0,0 +1,7 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* import-globals-from ../browser/head-common.js */
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/browser/components/urlbar/tests/legacy/head-common.js",
+  this);