Bug 579909 - Move WebConsole code to browser; f=nfitzgerald r=dtownsend,ddahl,gavin.sharp
authorRob Campbell <rcampbell@mozilla.com>
Tue, 26 Jul 2011 12:22:51 -0300
changeset 74497 eee7a94c44e20510e8002af43fc3719d2154feb7
parent 74496 0ffeb8ce63f141c411738954f90cb6807c24e056
child 74498 fe060dc4ee3d4d795387616a2c72be9189eb9946
push id67
push userclegnitto@mozilla.com
push dateFri, 04 Nov 2011 22:39:41 +0000
treeherdermozilla-release@04778346a3b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend, ddahl, gavin
bugs579909
milestone8.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 579909 - Move WebConsole code to browser; f=nfitzgerald r=dtownsend,ddahl,gavin.sharp
browser/Makefile.in
browser/base/jar.mn
browser/build.mk
browser/devtools/Makefile.in
browser/devtools/jar.mn
browser/devtools/webconsole/AutocompletePopup.jsm
browser/devtools/webconsole/HUDService.jsm
browser/devtools/webconsole/Makefile.in
browser/devtools/webconsole/NetworkHelper.jsm
browser/devtools/webconsole/NetworkPanel.xhtml
browser/devtools/webconsole/PropertyPanel.jsm
browser/devtools/webconsole/test/Makefile.in
browser/devtools/webconsole/test/browser/Makefile.in
browser/devtools/webconsole/test/browser/browser_warn_user_about_replaced_api.js
browser/devtools/webconsole/test/browser/browser_webconsole_abbreviate_source_url.js
browser/devtools/webconsole/test/browser/browser_webconsole_basic_net_logging.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_578437_page_reload.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_579412_input_focus.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_580001_closing_after_completion.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_580400_groups.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_580454_timestamp_l10n.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_581231_close_button.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_583816_tab_focus.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_585237_line_limit.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_585956_console_trace.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_keys.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_popup.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_586388_select_all.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_587617_output_copy.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_588342_document_focus.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_588730_text_node_insertion.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_588967_input_expansion.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_589162_css_filter.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_592442_closing_brackets.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_594477_clickable_output.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_594497_history_arrow_keys.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_595223_file_uri.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_595934_message_categories.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_network_requests_from_chrome.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_597460_filter_scroll.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_598357_jsterm_output.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_599725_response_headers.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_600183_charset.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_601352_scroll.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_601667_filter_buttons.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_601909_remember_height.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_602572_log_bodies_checkbox.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_603750_websocket.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_611795.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_613013_console_api_iframe.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_613280_jsterm_copy.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_613642_maintain_scroll.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_613642_prune_scroll.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_614793_jsterm_scroll.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_618311_close_panels.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_618311_private_browsing.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_621644_jsterm_dollar.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_626484_output_copy_order.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_630733_response_redirect_headers.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_632275_getters_document_width.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_632347_iterators_generators.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_632817.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_642108_pruneTest.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_642615_autocomplete.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_646025_console_file_location.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_651501_document_body_autocomplete.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_660806_history_nav.js
browser/devtools/webconsole/test/browser/browser_webconsole_bug_663443_panel_title.js
browser/devtools/webconsole/test/browser/browser_webconsole_chrome.js
browser/devtools/webconsole/test/browser/browser_webconsole_completion.js
browser/devtools/webconsole/test/browser/browser_webconsole_console_extras.js
browser/devtools/webconsole/test/browser/browser_webconsole_console_logging_api.js
browser/devtools/webconsole/test/browser/browser_webconsole_consoleonpage.js
browser/devtools/webconsole/test/browser/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
browser/devtools/webconsole/test/browser/browser_webconsole_execution_scope.js
browser/devtools/webconsole/test/browser/browser_webconsole_history.js
browser/devtools/webconsole/test/browser/browser_webconsole_hud_getters.js
browser/devtools/webconsole/test/browser/browser_webconsole_js_input_and_output_styling.js
browser/devtools/webconsole/test/browser/browser_webconsole_js_input_expansion.js
browser/devtools/webconsole/test/browser/browser_webconsole_jsterm.js
browser/devtools/webconsole/test/browser/browser_webconsole_live_filtering_of_message_types.js
browser/devtools/webconsole/test/browser/browser_webconsole_live_filtering_on_search_strings.js
browser/devtools/webconsole/test/browser/browser_webconsole_log_node_classes.js
browser/devtools/webconsole/test/browser/browser_webconsole_message_node_id.js
browser/devtools/webconsole/test/browser/browser_webconsole_netlogging.js
browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
browser/devtools/webconsole/test/browser/browser_webconsole_notifications.js
browser/devtools/webconsole/test/browser/browser_webconsole_null_and_undefined_output.js
browser/devtools/webconsole/test/browser/browser_webconsole_output_order.js
browser/devtools/webconsole/test/browser/browser_webconsole_position_ui.js
browser/devtools/webconsole/test/browser/browser_webconsole_property_panel.js
browser/devtools/webconsole/test/browser/browser_webconsole_property_provider.js
browser/devtools/webconsole/test/browser/browser_webconsole_registries.js
browser/devtools/webconsole/test/browser/browser_webconsole_storage_create_display.js
browser/devtools/webconsole/test/browser/browser_webconsole_storage_iteration.js
browser/devtools/webconsole/test/browser/browser_webconsole_storage_record_entry.js
browser/devtools/webconsole/test/browser/browser_webconsole_storage_record_many_entries.js
browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
browser/devtools/webconsole/test/browser/head.js
browser/devtools/webconsole/test/browser/test-bug-585956-console-trace.html
browser/devtools/webconsole/test/browser/test-bug-593003-iframe-wrong-hud-iframe.html
browser/devtools/webconsole/test/browser/test-bug-593003-iframe-wrong-hud.html
browser/devtools/webconsole/test/browser/test-bug-595934-canvas-css.html
browser/devtools/webconsole/test/browser/test-bug-595934-canvas-css.js
browser/devtools/webconsole/test/browser/test-bug-595934-canvas.html
browser/devtools/webconsole/test/browser/test-bug-595934-canvas.js
browser/devtools/webconsole/test/browser/test-bug-595934-css-loader.css
browser/devtools/webconsole/test/browser/test-bug-595934-css-loader.css^headers^
browser/devtools/webconsole/test/browser/test-bug-595934-css-loader.html
browser/devtools/webconsole/test/browser/test-bug-595934-css-parser.css
browser/devtools/webconsole/test/browser/test-bug-595934-css-parser.html
browser/devtools/webconsole/test/browser/test-bug-595934-dom-events-external2.html
browser/devtools/webconsole/test/browser/test-bug-595934-dom-events-external2.js
browser/devtools/webconsole/test/browser/test-bug-595934-dom-events.html
browser/devtools/webconsole/test/browser/test-bug-595934-dom-html-external.html
browser/devtools/webconsole/test/browser/test-bug-595934-dom-html-external.js
browser/devtools/webconsole/test/browser/test-bug-595934-dom-html.html
browser/devtools/webconsole/test/browser/test-bug-595934-empty-getelementbyid.html
browser/devtools/webconsole/test/browser/test-bug-595934-empty-getelementbyid.js
browser/devtools/webconsole/test/browser/test-bug-595934-html.html
browser/devtools/webconsole/test/browser/test-bug-595934-image.html
browser/devtools/webconsole/test/browser/test-bug-595934-image.jpg
browser/devtools/webconsole/test/browser/test-bug-595934-imagemap.html
browser/devtools/webconsole/test/browser/test-bug-595934-malformedxml-external.html
browser/devtools/webconsole/test/browser/test-bug-595934-malformedxml-external.xml
browser/devtools/webconsole/test/browser/test-bug-595934-malformedxml.xhtml
browser/devtools/webconsole/test/browser/test-bug-595934-svg.xhtml
browser/devtools/webconsole/test/browser/test-bug-595934-workers.html
browser/devtools/webconsole/test/browser/test-bug-595934-workers.js
browser/devtools/webconsole/test/browser/test-bug-597136-external-script-errors.html
browser/devtools/webconsole/test/browser/test-bug-597136-external-script-errors.js
browser/devtools/webconsole/test/browser/test-bug-597756-reopen-closed-tab.html
browser/devtools/webconsole/test/browser/test-bug-599725-response-headers.sjs
browser/devtools/webconsole/test/browser/test-bug-600183-charset.html
browser/devtools/webconsole/test/browser/test-bug-600183-charset.html^headers^
browser/devtools/webconsole/test/browser/test-bug-601177-log-levels.html
browser/devtools/webconsole/test/browser/test-bug-601177-log-levels.js
browser/devtools/webconsole/test/browser/test-bug-603750-websocket.html
browser/devtools/webconsole/test/browser/test-bug-603750-websocket.js
browser/devtools/webconsole/test/browser/test-bug-613013-console-api-iframe.html
browser/devtools/webconsole/test/browser/test-bug-618078-network-exceptions.html
browser/devtools/webconsole/test/browser/test-bug-621644-jsterm-dollar.html
browser/devtools/webconsole/test/browser/test-bug-630733-response-redirect-headers.sjs
browser/devtools/webconsole/test/browser/test-bug-632275-getters.html
browser/devtools/webconsole/test/browser/test-bug-632347-iterators-generators.html
browser/devtools/webconsole/test/browser/test-bug-644419-log-limits.html
browser/devtools/webconsole/test/browser/test-bug-646025-console-file-location.html
browser/devtools/webconsole/test/browser/test-console-extras.html
browser/devtools/webconsole/test/browser/test-console-replaced-api.html
browser/devtools/webconsole/test/browser/test-console.html
browser/devtools/webconsole/test/browser/test-data.json
browser/devtools/webconsole/test/browser/test-duplicate-error.html
browser/devtools/webconsole/test/browser/test-encoding-ISO-8859-1.html
browser/devtools/webconsole/test/browser/test-error.html
browser/devtools/webconsole/test/browser/test-file-location.js
browser/devtools/webconsole/test/browser/test-filter.html
browser/devtools/webconsole/test/browser/test-image.png
browser/devtools/webconsole/test/browser/test-mutation.html
browser/devtools/webconsole/test/browser/test-network-request.html
browser/devtools/webconsole/test/browser/test-network.html
browser/devtools/webconsole/test/browser/test-observe-http-ajax.html
browser/devtools/webconsole/test/browser/test-own-console.html
browser/devtools/webconsole/test/browser/test-property-provider.html
browser/devtools/webconsole/test/browser/testscript.js
toolkit/components/console/hudservice/AutocompletePopup.jsm
toolkit/components/console/hudservice/HUDService.jsm
toolkit/components/console/hudservice/Makefile.in
toolkit/components/console/hudservice/NetworkHelper.jsm
toolkit/components/console/hudservice/NetworkPanel.xhtml
toolkit/components/console/hudservice/PropertyPanel.jsm
toolkit/components/console/hudservice/tests/Makefile.in
toolkit/components/console/hudservice/tests/browser/Makefile.in
toolkit/components/console/hudservice/tests/browser/browser_warn_user_about_replaced_api.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_abbreviate_source_url.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_578437_page_reload.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_579412_input_focus.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580001_closing_after_completion.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580400_groups.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580454_timestamp_l10n.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_581231_close_button.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_582201_duplicate_errors.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585237_line_limit.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585991_autocomplete_keys.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585991_autocomplete_popup.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_586388_select_all.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_587617_output_copy.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588342_document_focus.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588730_text_node_insertion.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588967_input_expansion.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_589162_css_filter.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_592442_closing_brackets.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_594477_clickable_output.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_594497_history_arrow_keys.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597136_external_script_errors.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597136_network_requests_from_chrome.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597460_filter_scroll.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_598357_jsterm_output.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_599725_response_headers.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_600183_charset.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601177_log_levels.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601352_scroll.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601667_filter_buttons.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601909_remember_height.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_602572_log_bodies_checkbox.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_603750_websocket.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_611795.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613013_console_api_iframe.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613280_jsterm_copy.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613642_maintain_scroll.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613642_prune_scroll.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_614793_jsterm_scroll.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618078_network_exceptions.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618311_close_panels.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618311_private_browsing.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_621644_jsterm_dollar.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_630733_response_redirect_headers.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632347_iterators_generators.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632817.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_642108_pruneTest.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_642615_autocomplete.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_644419_log_limits.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_646025_console_file_location.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_651501_document_body_autocomplete.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_660806_history_nav.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_663443_panel_title.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_chrome.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_completion.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_console_extras.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_console_logging_api.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_consoleonpage.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_execution_scope.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_history.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_hud_getters.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_and_output_styling.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_live_filtering_of_message_types.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_live_filtering_on_search_strings.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_log_node_classes.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_message_node_id.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_netlogging.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_network_panel.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_notifications.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_null_and_undefined_output.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_output_order.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_position_ui.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_property_panel.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_property_provider.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_registries.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_create_display.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_iteration.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_record_entry.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_record_many_entries.js
toolkit/components/console/hudservice/tests/browser/browser_webconsole_view_source.js
toolkit/components/console/hudservice/tests/browser/head.js
toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html
toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud-iframe.html
toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas-css.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas-css.js
toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas.js
toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-loader.css
toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-loader.css^headers^
toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-loader.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-parser.css
toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-parser.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external2.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external2.js
toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-html-external.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-html-external.js
toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-html.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-empty-getelementbyid.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-empty-getelementbyid.js
toolkit/components/console/hudservice/tests/browser/test-bug-595934-html.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-image.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-image.jpg
toolkit/components/console/hudservice/tests/browser/test-bug-595934-imagemap.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-malformedxml-external.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-malformedxml-external.xml
toolkit/components/console/hudservice/tests/browser/test-bug-595934-malformedxml.xhtml
toolkit/components/console/hudservice/tests/browser/test-bug-595934-svg.xhtml
toolkit/components/console/hudservice/tests/browser/test-bug-595934-workers.html
toolkit/components/console/hudservice/tests/browser/test-bug-595934-workers.js
toolkit/components/console/hudservice/tests/browser/test-bug-597136-external-script-errors.html
toolkit/components/console/hudservice/tests/browser/test-bug-597136-external-script-errors.js
toolkit/components/console/hudservice/tests/browser/test-bug-597756-reopen-closed-tab.html
toolkit/components/console/hudservice/tests/browser/test-bug-599725-response-headers.sjs
toolkit/components/console/hudservice/tests/browser/test-bug-600183-charset.html
toolkit/components/console/hudservice/tests/browser/test-bug-600183-charset.html^headers^
toolkit/components/console/hudservice/tests/browser/test-bug-601177-log-levels.html
toolkit/components/console/hudservice/tests/browser/test-bug-601177-log-levels.js
toolkit/components/console/hudservice/tests/browser/test-bug-603750-websocket.html
toolkit/components/console/hudservice/tests/browser/test-bug-603750-websocket.js
toolkit/components/console/hudservice/tests/browser/test-bug-613013-console-api-iframe.html
toolkit/components/console/hudservice/tests/browser/test-bug-618078-network-exceptions.html
toolkit/components/console/hudservice/tests/browser/test-bug-621644-jsterm-dollar.html
toolkit/components/console/hudservice/tests/browser/test-bug-630733-response-redirect-headers.sjs
toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
toolkit/components/console/hudservice/tests/browser/test-bug-632347-iterators-generators.html
toolkit/components/console/hudservice/tests/browser/test-bug-644419-log-limits.html
toolkit/components/console/hudservice/tests/browser/test-bug-646025-console-file-location.html
toolkit/components/console/hudservice/tests/browser/test-console-extras.html
toolkit/components/console/hudservice/tests/browser/test-console-replaced-api.html
toolkit/components/console/hudservice/tests/browser/test-console.html
toolkit/components/console/hudservice/tests/browser/test-data.json
toolkit/components/console/hudservice/tests/browser/test-duplicate-error.html
toolkit/components/console/hudservice/tests/browser/test-encoding-ISO-8859-1.html
toolkit/components/console/hudservice/tests/browser/test-error.html
toolkit/components/console/hudservice/tests/browser/test-file-location.js
toolkit/components/console/hudservice/tests/browser/test-filter.html
toolkit/components/console/hudservice/tests/browser/test-image.png
toolkit/components/console/hudservice/tests/browser/test-mutation.html
toolkit/components/console/hudservice/tests/browser/test-network-request.html
toolkit/components/console/hudservice/tests/browser/test-network.html
toolkit/components/console/hudservice/tests/browser/test-observe-http-ajax.html
toolkit/components/console/hudservice/tests/browser/test-own-console.html
toolkit/components/console/hudservice/tests/browser/test-property-provider.html
toolkit/components/console/hudservice/tests/browser/testscript.js
toolkit/content/license.html
--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -40,16 +40,17 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 PARALLEL_DIRS = \
   base \
   components \
+  devtools \
   fuel \
   locales \
   themes \
   $(NULL)
 
 DIRS = \
   app \
   $(NULL)
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -88,10 +88,8 @@ browser.jar:
 #endif
 *       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
 #ifdef XP_WIN
 *       content/browser/win6BrowserOverlay.xul        (content/win6BrowserOverlay.xul)
 #endif
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
-# XXXkhuey This really should live in browser/, but it's too late in the release cycle to move
-+       content/browser/NetworkPanel.xhtml            (/toolkit/components/console/hudservice/NetworkPanel.xhtml)
--- a/browser/build.mk
+++ b/browser/build.mk
@@ -42,18 +42,16 @@ endif
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 
-tier_app_dirs += toolkit/components/console/hudservice
-
 ifdef MOZ_SERVICES_SYNC
 tier_app_dirs += services
 endif
 
 tier_app_dirs += browser
 # Never add other tier_app_dirs after browser. They won't get packaged
 # properly on mac.
 
new file mode 100644
--- /dev/null
+++ b/browser/devtools/Makefile.in
@@ -0,0 +1,56 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Rob Campbell <rcampbell@mozilla.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH   = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+DIRS = \
+  webconsole \
+  $(NULL)
+
+ifdef ENABLE_TESTS
+# DIRS += test # no tests yet
+endif
+
+include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/browser/devtools/jar.mn
@@ -0,0 +1,2 @@
+browser.jar:
+    content/browser/NetworkPanel.xhtml            (webconsole/NetworkPanel.xhtml)
rename from toolkit/components/console/hudservice/AutocompletePopup.jsm
rename to browser/devtools/webconsole/AutocompletePopup.jsm
rename from toolkit/components/console/hudservice/HUDService.jsm
rename to browser/devtools/webconsole/HUDService.jsm
rename from toolkit/components/console/hudservice/Makefile.in
rename to browser/devtools/webconsole/Makefile.in
--- a/toolkit/components/console/hudservice/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -16,43 +16,45 @@
 #
 # The Initial Developer of the Original Code is Mozilla Corporation.
 # 
 # Portions created by the Initial Developer are Copyright (C) 2010
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   David Dahl <ddahl@mozilla.com>
+#   Rob Campbell <rcampbell@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = HUDService.jsm \
+EXTRA_JS_MODULES = \
+		HUDService.jsm \
 		PropertyPanel.jsm \
 		NetworkHelper.jsm \
 		AutocompletePopup.jsm \
 		$(NULL)
 
 ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
-	DIRS += tests
+	DIRS += test
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
rename from toolkit/components/console/hudservice/NetworkHelper.jsm
rename to browser/devtools/webconsole/NetworkHelper.jsm
rename from toolkit/components/console/hudservice/NetworkPanel.xhtml
rename to browser/devtools/webconsole/NetworkPanel.xhtml
rename from toolkit/components/console/hudservice/PropertyPanel.jsm
rename to browser/devtools/webconsole/PropertyPanel.jsm
rename from toolkit/components/console/hudservice/tests/Makefile.in
rename to browser/devtools/webconsole/test/Makefile.in
--- a/toolkit/components/console/hudservice/tests/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -31,20 +31,18 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= test_hudservice
-
 DIRS = browser
 
 include $(topsrcdir)/config/rules.mk
rename from toolkit/components/console/hudservice/tests/browser/Makefile.in
rename to browser/devtools/webconsole/test/browser/Makefile.in
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/browser/devtools/webconsole/test/browser/Makefile.in
@@ -16,36 +16,37 @@
 # The Initial Developer of the Original Code is Mozilla Foundation.
 # Portions created by the Initial Developer are Copyright (C) 2010
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #  David Dahl <ddahl@mozilla.com>
 #  Patrick Walton <pcwalton@mozilla.com>
 #  Mihai Șucan <mihai.sucan@gmail.com>
+#  Rob Campbell <rcampbell@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either of the GNU General Public License Version 2 or later (the "GPL"),
 # or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH			= ../../../../../..
+DEPTH			= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
-relativesrcdir  = toolkit/components/console/hudservice/tests/browser
+relativesrcdir  = browser/devtools/webconsole/test/browser
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
 	browser_webconsole_notifications.js \
 	browser_webconsole_message_node_id.js \
 	browser_webconsole_bug_580030_errors_after_page_reload.js \
rename from toolkit/components/console/hudservice/tests/browser/browser_warn_user_about_replaced_api.js
rename to browser/devtools/webconsole/test/browser/browser_warn_user_about_replaced_api.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_warn_user_about_replaced_api.js
+++ b/browser/devtools/webconsole/test/browser/browser_warn_user_about_replaced_api.js
@@ -32,17 +32,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_REPLACED_API_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console-replaced-api.html";
+const TEST_REPLACED_API_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console-replaced-api.html";
 
 function test() {
   waitForExplicitFinish();
 
   // First test that the warning does not appear on a normal page (about:blank)
   addTab("about:blank");
   browser.addEventListener("load", function() {
     browser.removeEventListener("load", arguments.callee, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_abbreviate_source_url.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_abbreviate_source_url.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_basic_net_logging.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_basic_net_logging.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_basic_net_logging.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the page's resources are displayed in the console as they're
 // loaded
 
-const TEST_NETWORK_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network.html" + "?_date=" + Date.now();
+const TEST_NETWORK_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-network.html" + "?_date=" + Date.now();
 
 function test() {
   addTab("data:text/html,Web Console basic network logging test");
   browser.addEventListener("load", onLoad, true);
 }
 
 function onLoad(aEvent) {
   browser.removeEventListener(aEvent.type, arguments.callee, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_578437_page_reload.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_578437_page_reload.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_578437_page_reload.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_578437_page_reload.js
@@ -34,17 +34,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the console object still exists after a page reload.
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
 
 function onLoad() {
   browser.removeEventListener("DOMContentLoaded", onLoad, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_579412_input_focus.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_579412_input_focus.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_579412_input_focus.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_579412_input_focus.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the input field is focused when the console is opened.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testInputFocus, false);
 }
 
 function testInputFocus() {
   browser.removeEventListener("DOMContentLoaded", testInputFocus, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580001_closing_after_completion.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_580001_closing_after_completion.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580001_closing_after_completion.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580001_closing_after_completion.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests to ensure that errors don't appear when the console is closed while a
 // completion is being performed.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testClosingAfterCompletion,
                            false);
 }
 
 function testClosingAfterCompletion() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580030_errors_after_page_reload.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that errors still show up in the Web Console after a page reload.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-error.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-error.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", onLoad, true);
 }
 
 // see bug 580030: the error handler fails silently after page reload.
 // https://bugzilla.mozilla.org/show_bug.cgi?id=580030
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580400_groups.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_580400_groups.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580400_groups.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580400_groups.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that console groups behave properly.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testGroups, false);
 }
 
 function testGroups() {
   browser.removeEventListener("DOMContentLoaded", testGroups, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580454_timestamp_l10n.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_580454_timestamp_l10n.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580454_timestamp_l10n.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_580454_timestamp_l10n.js
@@ -7,17 +7,17 @@
  *  Patrick Walton <pcwalton@mozilla.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that appropriately-localized timestamps are printed.
 
 Cu.import("resource:///modules/HUDService.jsm");
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testTimestamp, false);
 
   function testTimestamp()
   {
     browser.removeEventListener("DOMContentLoaded", testTimestamp, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_581231_close_button.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_581231_close_button.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_581231_close_button.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_581231_close_button.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Patrick Walton <pcwalton@mozilla.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the Web Console close button functions.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testCloseButton, false);
 }
 
 function testCloseButton() {
   browser.removeEventListener("DOMContentLoaded", testCloseButton, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_582201_duplicate_errors.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_582201_duplicate_errors.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_582201_duplicate_errors.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that exceptions thrown by content don't show up twice in the Web
 // Console.
 
-const TEST_DUPLICATE_ERROR_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-duplicate-error.html";
+const TEST_DUPLICATE_ERROR_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-duplicate-error.html";
 
 function test() {
   addTab(TEST_DUPLICATE_ERROR_URI);
   browser.addEventListener("DOMContentLoaded", testDuplicateErrors, false);
 }
 
 function testDuplicateErrors() {
   browser.removeEventListener("DOMContentLoaded", testDuplicateErrors,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_583816_tab_focus.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_583816_tab_focus.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_583816_tab_focus.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 let HUD, inputNode;
 
 function tabLoad(aEvent) {
   browser.removeEventListener(aEvent.type, arguments.callee, true);
 
   waitForFocus(function() {
     openConsole();
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585237_line_limit.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_585237_line_limit.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585237_line_limit.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_585237_line_limit.js
@@ -7,17 +7,17 @@
  *  Patrick Walton <pcwalton@mozilla.com>
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the Web Console limits the number of lines displayed according to
 // the user's preferences.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testLineLimit,
                                             false);
 }
 
 function testLineLimit() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_585956_console_trace.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_585956_console_trace.js
@@ -31,17 +31,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-585956-console-trace.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
 
 function tabLoaded() {
   browser.removeEventListener("load", tabLoaded, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585991_autocomplete_keys.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_keys.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585991_autocomplete_popup.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_585991_autocomplete_popup.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_586388_select_all.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_586388_select_all.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_587617_output_copy.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_587617_output_copy.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_587617_output_copy.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_587617_output_copy.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *  Patrick Walton <pcwalton@mozilla.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
 
 function tabLoaded() {
   browser.removeEventListener("load", tabLoaded, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588342_document_focus.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_588342_document_focus.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588730_text_node_insertion.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_588730_text_node_insertion.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588730_text_node_insertion.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_588730_text_node_insertion.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that adding text to one of the output labels doesn't cause errors.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testTextNodeInsertion,
                            false);
 }
 
 // Test for bug 588730: Adding a text node to an existing label element causes
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588967_input_expansion.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_588967_input_expansion.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588967_input_expansion.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_588967_input_expansion.js
@@ -31,17 +31,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testInputExpansion, false);
 }
 
 function testInputExpansion() {
   browser.removeEventListener("DOMContentLoaded", testInputExpansion, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_589162_css_filter.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_589162_css_filter.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_592442_closing_brackets.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_592442_closing_brackets.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
@@ -31,21 +31,21 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-593003-iframe-wrong-hud.html";
 
-const TEST_IFRAME_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud-iframe.html";
+const TEST_IFRAME_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-593003-iframe-wrong-hud-iframe.html";
 
-const TEST_DUMMY_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_DUMMY_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 let tab1, tab2;
 
 function test() {
   addTab(TEST_URI);
   tab1 = tab;
   browser.addEventListener("load", tab1Loaded, true);
 }
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_594477_clickable_output.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_594477_clickable_output.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_594477_clickable_output.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_594477_clickable_output.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 let HUD;
 
 let outputItem;
 
 function tabLoad1(aEvent) {
   browser.removeEventListener(aEvent.type, arguments.callee, true);
 
   openConsole();
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_594497_history_arrow_keys.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_594497_history_arrow_keys.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_595223_file_uri.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_595934_message_categories.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595934_message_categories.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_595934_message_categories.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TESTS_PATH = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/";
+const TESTS_PATH = "http://example.com/browser/browser/devtools/webconsole/test//browser/";
 const TESTS = [
   { // #0
     file: "test-bug-595934-css-loader.html",
     category: "CSS Loader",
     matchString: "text/css",
   },
   { // #1
     file: "test-bug-595934-dom-events.html",
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 let tab1, tab2, win1, win2;
 let noErrors = true;
 
 function tab1Loaded(aEvent) {
   browser.removeEventListener(aEvent.type, arguments.callee, true);
 
   win2 = OpenBrowserWindow();
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597136_external_script_errors.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597136_external_script_errors.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_external_script_errors.js
@@ -3,18 +3,18 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Patrick Walton <pcwalton@mozilla.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/" +
-                 "hudservice/tests/browser/test-bug-597136-external-script-" +
+const TEST_URI = "http://example.com/browser/browser/devtools/" +
+                 "webconsole/test/browser/test-bug-597136-external-script-" +
                  "errors.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
 
 function tabLoaded(aEvent) {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597136_network_requests_from_chrome.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_597136_network_requests_from_chrome.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597460_filter_scroll.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_597460_filter_scroll.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597460_filter_scroll.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597460_filter_scroll.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-network.html";
 
 function tabLoad(aEvent) {
   browser.removeEventListener(aEvent.type, arguments.callee, true);
 
   openConsole();
 
   let hudId = HUDService.getHudIdByWindow(content);
   hud = HUDService.hudReferences[hudId];
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_597756_reopen_closed_tab.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-597756-reopen-closed-tab.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-597756-reopen-closed-tab.html";
 
 let newTabIsOpen = false;
 
 function tabLoaded(aEvent) {
   gBrowser.selectedBrowser.removeEventListener(aEvent.type, arguments.callee, true);
 
   HUDService.activateHUDForContext(gBrowser.selectedTab);
 
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_598357_jsterm_output.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_598357_jsterm_output.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_598357_jsterm_output.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_598357_jsterm_output.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 let testEnded = false;
 let pos = -1;
 
 let dateNow = Date.now();
 
 let inputValues = [
   // [showsPropertyPanel?, input value, expected output format,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_599725_response_headers.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_599725_response_headers.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_599725_response_headers.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_599725_response_headers.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-599725-response-headers.sjs";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-599725-response-headers.sjs";
 
 let lastFinishedRequest = null;
 
 function requestDoneCallback(aHttpRequest)
 {
   lastFinishedRequest = aHttpRequest;
 }
 
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_600183_charset.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_600183_charset.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_600183_charset.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_600183_charset.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-600183-charset.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-600183-charset.html";
 
 let lastFinishedRequest = null;
 
 function requestDoneCallback(aHttpRequest)
 {
   lastFinishedRequest = aHttpRequest;
 }
 
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601177_log_levels.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601177_log_levels.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_601177_log_levels.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-601177-log-levels.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-601177-log-levels.html";
 
 let msgs;
 
 function onContentLoaded()
 {
   let hudId = HUDService.getHudIdByWindow(content);
   let HUD = HUDService.hudReferences[hudId];
   msgs = HUD.outputNode.querySelectorAll(".hud-msg-node");
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601352_scroll.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_601352_scroll.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601667_filter_buttons.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_601667_filter_buttons.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_601909_remember_height.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_601909_remember_height.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_602572_log_bodies_checkbox.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_602572_log_bodies_checkbox.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_603750_websocket.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_603750_websocket.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_603750_websocket.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_603750_websocket.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-603750-websocket.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-603750-websocket.html";
 const pref_ws = "network.websocket.enabled";
 const pref_block = "network.websocket.override-security-block";
 
 let errors = 0;
 let lastWindowId = 0;
 let oldPref_ws;
 
 let TestObserver = {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_611795.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_611795.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613013_console_api_iframe.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_613013_console_api_iframe.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613013_console_api_iframe.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_613013_console_api_iframe.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-613013-console-api-iframe.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-613013-console-api-iframe.html";
 
 let TestObserver = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
 
   observe: function test_observe(aMessage, aTopic, aData)
   {
     if (aTopic == "console-api-log-event") {
       executeSoon(performTest);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613280_jsterm_copy.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_613280_jsterm_copy.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613642_maintain_scroll.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_613642_maintain_scroll.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_613642_prune_scroll.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_613642_prune_scroll.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_614793_jsterm_scroll.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_614793_jsterm_scroll.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618078_network_exceptions.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618078_network_exceptions.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618078_network_exceptions.js
@@ -21,17 +21,17 @@
  *
  * Contributor(s):
  *   Mihai Sucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that network log messages bring up the network panel.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-618078-network-exceptions.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-618078-network-exceptions.html";
 
 let testEnded = false;
 
 let TestObserver = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
 
   observe: function test_observe(aSubject)
   {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618311_close_panels.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_618311_close_panels.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618311_close_panels.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618311_close_panels.js
@@ -31,17 +31,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", function() {
     browser.removeEventListener("load", arguments.callee, true);
 
     openConsole();
     content.location.reload();
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618311_private_browsing.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_618311_private_browsing.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_618311_private_browsing.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_618311_private_browsing.js
@@ -31,17 +31,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 let pb = Cc["@mozilla.org/privatebrowsing;1"].
          getService(Ci.nsIPrivateBrowsingService);
 
 function test() {
   addTab("data:text/html,Web Console test for bug 618311 (private browsing)");
 
   browser.addEventListener("load", function() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_621644_jsterm_dollar.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_621644_jsterm_dollar.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_621644_jsterm_dollar.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_621644_jsterm_dollar.js
@@ -2,17 +2,17 @@
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *   Mihai Sucan <mihai.sucan@gmail.com>
  */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-621644-jsterm-dollar.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-621644-jsterm-dollar.html";
 
 function tabLoad(aEvent) {
   browser.removeEventListener(aEvent.type, arguments.callee, true);
 
   waitForFocus(function () {
     openConsole();
 
     let hudId = HUDService.getHudIdByWindow(content);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_626484_output_copy_order.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_630733_response_redirect_headers.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_630733_response_redirect_headers.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_630733_response_redirect_headers.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_630733_response_redirect_headers.js
@@ -2,17 +2,17 @@
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *   Mihai Sucan <mihai.sucan@gmail.com>
  */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-630733-response-redirect-headers.sjs";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-630733-response-redirect-headers.sjs";
 
 let lastFinishedRequests = {};
 
 function requestDoneCallback(aHttpRequest)
 {
   let status = aHttpRequest.response.status.
                replace(/^HTTP\/\d\.\d (\d+).+$/, "$1");
   lastFinishedRequests[status] = aHttpRequest;
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_632275_getters_document_width.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_632275_getters_document_width.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-632275-getters.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
 
 function tabLoaded() {
   browser.removeEventListener("load", tabLoaded, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632347_iterators_generators.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_632347_iterators_generators.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632347_iterators_generators.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_632347_iterators_generators.js
@@ -31,17 +31,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632347-iterators-generators.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-632347-iterators-generators.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
 
 function tabLoaded() {
   browser.removeEventListener("load", tabLoaded, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632817.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_632817.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632817.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_632817.js
@@ -1,17 +1,17 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that network log messages bring up the network panel.
 
-const TEST_NETWORK_REQUEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network-request.html";
+const TEST_NETWORK_REQUEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-network-request.html";
 
-const TEST_IMG = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-image.png";
+const TEST_IMG = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-image.png";
 
 const TEST_DATA_JSON_CONTENT =
   '{ id: "test JSON data", myArray: [ "foo", "bar", "baz", "biff" ] }';
 
 let lastRequest = null;
 let requestCallback = null;
 
 function test()
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_642108_pruneTest.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_642108_pruneTest.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_642615_autocomplete.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_642615_autocomplete.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_644419_log_limits.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_644419_log_limits.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_644419_log_limits.js
@@ -2,18 +2,18 @@
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Tests that the Web Console limits the number of lines displayed according to
 // the limit set for each category.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/" +
-                 "hudservice/tests/browser/test-bug-644419-log-limits.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/" +
+                 "webconsole/test/browser/test-bug-644419-log-limits.html";
 
 var gOldPref, gHudId;
 
 function test() {
   addTab("data:text/html,Web Console test for bug 644419: Console should " +
          "have user-settable log limits for each message category");
   browser.addEventListener("load", onLoad, true);
 }
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_646025_console_file_location.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_646025_console_file_location.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_646025_console_file_location.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_bug_646025_console_file_location.js
@@ -37,18 +37,18 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that console logging methods display the method location along with
 // the output in the console.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/" +
-                 "hudservice/tests/browser/" +
+const TEST_URI = "http://example.com/browser/browser/devtools/" +
+                 "webconsole/test/browser/" +
                  "test-bug-646025-console-file-location.html";
 
 function test() {
   addTab("data:text/html,Web Console file location display test");
   browser.addEventListener("load", onLoad, true);
 }
 
 function onLoad(aEvent) {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_651501_document_body_autocomplete.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_651501_document_body_autocomplete.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_660806_history_nav.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_660806_history_nav.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_663443_panel_title.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_bug_663443_panel_title.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_chrome.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_chrome.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_completion.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_completion.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_completion.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_completion.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that code completion works properly.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testCompletion, false);
 }
 
 function testCompletion() {
   browser.removeEventListener("DOMContentLoaded", testCompletion, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_console_extras.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_console_extras.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_console_extras.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_console_extras.js
@@ -32,17 +32,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the basic console.log()-style APIs and filtering work.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console-extras.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console-extras.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
 
 function onLoad() {
   browser.removeEventListener("DOMContentLoaded", onLoad, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_console_logging_api.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_console_logging_api.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_console_logging_api.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_console_logging_api.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the basic console.log()-style APIs and filtering work.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
 
 function onLoad() {
   browser.removeEventListener("DOMContentLoaded", onLoad, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_consoleonpage.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_consoleonpage.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_consoleonpage.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_consoleonpage.js
@@ -4,17 +4,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *  Julian Viereck <jviereck@mozilla.com>
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-own-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-own-console.html";
 
 function test()
 {
   addTab(TEST_URI);
   browser.addEventListener("load", function() {
     browser.removeEventListener("load", arguments.callee, true);
     testOpenWebConsole();
   }, true);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_execution_scope.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_execution_scope.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_execution_scope.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_execution_scope.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that commands run by the user are executed in content space.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testExecutionScope, false);
 }
 
 function testExecutionScope() {
   browser.removeEventListener("DOMContentLoaded", testExecutionScope,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_history.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_history.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_history.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_history.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests the console history feature accessed via the up and down arrow keys.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 // Constants used for defining the direction of JSTerm input history navigation.
 const HISTORY_BACK = -1;
 const HISTORY_FORWARD = 1;
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testHistory, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_hud_getters.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_hud_getters.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_hud_getters.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_hud_getters.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the HUD can be accessed via the HUD references in the HUD
 // service.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testHUDGetters, false);
 }
 
 function testHUDGetters() {
   browser.removeEventListener("DOMContentLoaded", testHUDGetters, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_and_output_styling.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_js_input_and_output_styling.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_and_output_styling.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_js_input_and_output_styling.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the correct CSS styles are applied to the lines of console
 // output.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testJSInputAndOutputStyling,
                            false);
 }
 
 function testJSInputAndOutputStyling() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_js_input_expansion.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_js_input_expansion.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the input box expands as the user types long lines.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testJSInputExpansion, false);
 }
 
 function testJSInputExpansion() {
   browser.removeEventListener("DOMContentLoaded", testJSInputExpansion,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_jsterm.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_jsterm.js
@@ -34,17 +34,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 let jsterm;
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testJSTerm, false);
 }
 
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_live_filtering_of_message_types.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_live_filtering_of_message_types.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_live_filtering_of_message_types.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_live_filtering_of_message_types.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the message type filter checkboxes work.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded",
                               testLiveFilteringOfMessageTypes, false);
 }
 
 function testLiveFilteringOfMessageTypes() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_live_filtering_on_search_strings.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_live_filtering_on_search_strings.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_live_filtering_on_search_strings.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_live_filtering_on_search_strings.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the text filter box works.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded",
                            testLiveFilteringOnSearchStrings, false);
 }
 
 function testLiveFilteringOnSearchStrings() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_log_node_classes.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_log_node_classes.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_log_node_classes.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_log_node_classes.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that console logging via the console API produces nodes of the correct
 // CSS classes.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testLogNodeClasses, false);
 }
 
 function testLogNodeClasses() {
   browser.removeEventListener("DOMContentLoaded", testLogNodeClasses,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_message_node_id.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_message_node_id.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_message_node_id.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_message_node_id.js
@@ -30,17 +30,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
 
 function onLoad() {
   browser.removeEventListener("DOMContentLoaded", onLoad, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_netlogging.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_netlogging.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_netlogging.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_netlogging.js
@@ -7,19 +7,19 @@
  *  Julian Viereck <jviereck@mozilla.com>
  *  Patrick Walton <pcwalton@mozilla.com>
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that network log messages bring up the network panel.
 
-const TEST_NETWORK_REQUEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network-request.html";
+const TEST_NETWORK_REQUEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-network-request.html";
 
-const TEST_IMG = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-image.png";
+const TEST_IMG = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-image.png";
 
 const TEST_DATA_JSON_CONTENT =
   '{ id: "test JSON data", myArray: [ "foo", "bar", "baz", "biff" ] }';
 
 let lastRequest = null;
 let requestCallback = null;
 
 function test()
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_network_panel.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_network_panel.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_network_panel.js
@@ -36,19 +36,19 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the network panel works.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
-const TEST_IMG = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-image.png";
-const TEST_ENCODING_ISO_8859_1 = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-encoding-ISO-8859-1.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
+const TEST_IMG = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-image.png";
+const TEST_ENCODING_ISO_8859_1 = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-encoding-ISO-8859-1.html";
 
 let testDriver;
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testNetworkPanel, false);
 }
 
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_notifications.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_notifications.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_notifications.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_notifications.js
@@ -30,17 +30,17 @@
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   observer.init();
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
 
 function webConsoleCreated(aID)
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_null_and_undefined_output.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_null_and_undefined_output.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_null_and_undefined_output.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_null_and_undefined_output.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Test that JavaScript expressions that evaluate to null or undefined produce
 // meaningful output.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testNullAndUndefinedOutput,
                            false);
 }
 
 function testNullAndUndefinedOutput() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_output_order.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_output_order.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_output_order.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_output_order.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that any output created from calls to the console API comes after the
 // echoed JavaScript.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testOutputOrder, false);
 }
 
 function testOutputOrder() {
   browser.removeEventListener("DOMContentLoaded", testOutputOrder, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_position_ui.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_position_ui.js
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_property_panel.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_property_panel.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_property_panel.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_property_panel.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests the functionality of the "property panel", which allows JavaScript
 // objects and DOM nodes to be inspected.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testPropertyPanel, false);
 }
 
 function testPropertyPanel() {
   browser.removeEventListener("DOMContentLoaded", testPropertyPanel, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_property_provider.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_property_provider.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_property_provider.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_property_provider.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests the property provider, which is part of the code completion
 // infrastructure.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testPropertyProvider, false);
 }
 
 function testPropertyProvider() {
   browser.removeEventListener("DOMContentLoaded", testPropertyProvider,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_registries.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_registries.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_registries.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_registries.js
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the HUD service keeps an accurate registry of all the Web Console
 // instances.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testRegistries, false);
 }
 
 function testRegistries() {
   browser.removeEventListener("DOMContentLoaded", testRegistries, false);
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_create_display.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_storage_create_display.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_create_display.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_storage_create_display.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the console message store is initialized properly.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testStorageCreateDisplay,
                            false);
 }
 
 function testStorageCreateDisplay() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_iteration.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_storage_iteration.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_iteration.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_storage_iteration.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Test that the iterator API of the console message store works.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testStorageIteration, false);
 }
 
 function testStorageIteration() {
   browser.removeEventListener("DOMContentLoaded", testStorageIteration,
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_record_entry.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_storage_record_entry.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_record_entry.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_storage_record_entry.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the recordEntry() method of the console store works.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testStorageRecordEntry,
                               false);
 }
 
 function testStorageRecordEntry() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_record_many_entries.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_storage_record_many_entries.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_storage_record_many_entries.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_storage_record_many_entries.js
@@ -35,17 +35,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Test that the recordManyEntries() method of the console store works.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-console.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testStorageRecordManyEntries,
                            false);
 }
 
 function testStorageRecordManyEntries() {
rename from toolkit/components/console/hudservice/tests/browser/browser_webconsole_view_source.js
rename to browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_view_source.js
+++ b/browser/devtools/webconsole/test/browser/browser_webconsole_view_source.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that source URLs in the Web Console can be clicked to display the
 // standard View Source window.
 
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-error.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test//browser/test-error.html";
 
 function test() {
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testViewSource, false);
 }
 
 function testViewSource() {
   browser.removeEventListener("DOMContentLoaded", testViewSource, false);
rename from toolkit/components/console/hudservice/tests/browser/head.js
rename to browser/devtools/webconsole/test/browser/head.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html
rename to browser/devtools/webconsole/test/browser/test-bug-585956-console-trace.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud-iframe.html
rename to browser/devtools/webconsole/test/browser/test-bug-593003-iframe-wrong-hud-iframe.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud.html
rename to browser/devtools/webconsole/test/browser/test-bug-593003-iframe-wrong-hud.html
--- a/toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud.html
+++ b/browser/devtools/webconsole/test/browser/test-bug-593003-iframe-wrong-hud.html
@@ -3,11 +3,11 @@
   <head>
     <title>WebConsole test: iframe associated to the wrong HUD</title>
 <!-- Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/ -->
    </head>
    <body>
      <p>WebConsole test: iframe associated to the wrong HUD.</p>
      <iframe 
-       src="http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud-iframe.html"></iframe>
+       src="http://example.com/browser/browser/devtools/webconsole/test//browser/test-bug-593003-iframe-wrong-hud-iframe.html"></iframe>
    </body>
  </html>
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas-css.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-canvas-css.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas-css.js
rename to browser/devtools/webconsole/test/browser/test-bug-595934-canvas-css.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-canvas.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-canvas.js
rename to browser/devtools/webconsole/test/browser/test-bug-595934-canvas.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-loader.css
rename to browser/devtools/webconsole/test/browser/test-bug-595934-css-loader.css
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-loader.css^headers^
rename to browser/devtools/webconsole/test/browser/test-bug-595934-css-loader.css^headers^
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-loader.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-css-loader.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-parser.css
rename to browser/devtools/webconsole/test/browser/test-bug-595934-css-parser.css
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-css-parser.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-css-parser.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external2.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-dom-events-external2.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events-external2.js
rename to browser/devtools/webconsole/test/browser/test-bug-595934-dom-events-external2.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-events.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-dom-events.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-html-external.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-dom-html-external.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-html-external.js
rename to browser/devtools/webconsole/test/browser/test-bug-595934-dom-html-external.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-dom-html.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-dom-html.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-empty-getelementbyid.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-empty-getelementbyid.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-empty-getelementbyid.js
rename to browser/devtools/webconsole/test/browser/test-bug-595934-empty-getelementbyid.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-html.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-html.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-image.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-image.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-image.jpg
rename to browser/devtools/webconsole/test/browser/test-bug-595934-image.jpg
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-imagemap.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-imagemap.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-malformedxml-external.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-malformedxml-external.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-malformedxml-external.xml
rename to browser/devtools/webconsole/test/browser/test-bug-595934-malformedxml-external.xml
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-malformedxml.xhtml
rename to browser/devtools/webconsole/test/browser/test-bug-595934-malformedxml.xhtml
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-svg.xhtml
rename to browser/devtools/webconsole/test/browser/test-bug-595934-svg.xhtml
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-workers.html
rename to browser/devtools/webconsole/test/browser/test-bug-595934-workers.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-595934-workers.js
rename to browser/devtools/webconsole/test/browser/test-bug-595934-workers.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-597136-external-script-errors.html
rename to browser/devtools/webconsole/test/browser/test-bug-597136-external-script-errors.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-597136-external-script-errors.js
rename to browser/devtools/webconsole/test/browser/test-bug-597136-external-script-errors.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-597756-reopen-closed-tab.html
rename to browser/devtools/webconsole/test/browser/test-bug-597756-reopen-closed-tab.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-599725-response-headers.sjs
rename to browser/devtools/webconsole/test/browser/test-bug-599725-response-headers.sjs
rename from toolkit/components/console/hudservice/tests/browser/test-bug-600183-charset.html
rename to browser/devtools/webconsole/test/browser/test-bug-600183-charset.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-600183-charset.html^headers^
rename to browser/devtools/webconsole/test/browser/test-bug-600183-charset.html^headers^
rename from toolkit/components/console/hudservice/tests/browser/test-bug-601177-log-levels.html
rename to browser/devtools/webconsole/test/browser/test-bug-601177-log-levels.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-601177-log-levels.js
rename to browser/devtools/webconsole/test/browser/test-bug-601177-log-levels.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-603750-websocket.html
rename to browser/devtools/webconsole/test/browser/test-bug-603750-websocket.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-603750-websocket.js
rename to browser/devtools/webconsole/test/browser/test-bug-603750-websocket.js
rename from toolkit/components/console/hudservice/tests/browser/test-bug-613013-console-api-iframe.html
rename to browser/devtools/webconsole/test/browser/test-bug-613013-console-api-iframe.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-618078-network-exceptions.html
rename to browser/devtools/webconsole/test/browser/test-bug-618078-network-exceptions.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-621644-jsterm-dollar.html
rename to browser/devtools/webconsole/test/browser/test-bug-621644-jsterm-dollar.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-630733-response-redirect-headers.sjs
rename to browser/devtools/webconsole/test/browser/test-bug-630733-response-redirect-headers.sjs
rename from toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
rename to browser/devtools/webconsole/test/browser/test-bug-632275-getters.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-632347-iterators-generators.html
rename to browser/devtools/webconsole/test/browser/test-bug-632347-iterators-generators.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-644419-log-limits.html
rename to browser/devtools/webconsole/test/browser/test-bug-644419-log-limits.html
rename from toolkit/components/console/hudservice/tests/browser/test-bug-646025-console-file-location.html
rename to browser/devtools/webconsole/test/browser/test-bug-646025-console-file-location.html
rename from toolkit/components/console/hudservice/tests/browser/test-console-extras.html
rename to browser/devtools/webconsole/test/browser/test-console-extras.html
rename from toolkit/components/console/hudservice/tests/browser/test-console-replaced-api.html
rename to browser/devtools/webconsole/test/browser/test-console-replaced-api.html
rename from toolkit/components/console/hudservice/tests/browser/test-console.html
rename to browser/devtools/webconsole/test/browser/test-console.html
rename from toolkit/components/console/hudservice/tests/browser/test-data.json
rename to browser/devtools/webconsole/test/browser/test-data.json
rename from toolkit/components/console/hudservice/tests/browser/test-duplicate-error.html
rename to browser/devtools/webconsole/test/browser/test-duplicate-error.html
rename from toolkit/components/console/hudservice/tests/browser/test-encoding-ISO-8859-1.html
rename to browser/devtools/webconsole/test/browser/test-encoding-ISO-8859-1.html
rename from toolkit/components/console/hudservice/tests/browser/test-error.html
rename to browser/devtools/webconsole/test/browser/test-error.html
rename from toolkit/components/console/hudservice/tests/browser/test-file-location.js
rename to browser/devtools/webconsole/test/browser/test-file-location.js
rename from toolkit/components/console/hudservice/tests/browser/test-filter.html
rename to browser/devtools/webconsole/test/browser/test-filter.html
rename from toolkit/components/console/hudservice/tests/browser/test-image.png
rename to browser/devtools/webconsole/test/browser/test-image.png
rename from toolkit/components/console/hudservice/tests/browser/test-mutation.html
rename to browser/devtools/webconsole/test/browser/test-mutation.html
rename from toolkit/components/console/hudservice/tests/browser/test-network-request.html
rename to browser/devtools/webconsole/test/browser/test-network-request.html
--- a/toolkit/components/console/hudservice/tests/browser/test-network-request.html
+++ b/browser/devtools/webconsole/test/browser/test-network-request.html
@@ -22,14 +22,14 @@
         makeXhr('post', 'test-data.json', "Hello world!", aCallback);
       }
     // --></script>
   </head>
   <body>
     <h1>Heads Up Display HTTP Logging Testpage</h1>
     <h2>This page is used to test the HTTP logging.</h2>
 
-    <form action="http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network-request.html" method="post">
+    <form action="http://example.com/browser/browser/devtools/webconsole/test//browser/test-network-request.html" method="post">
       <input name="name" type="text" value="foo bar"><br>
       <input name="age" type="text" value="144"><br>
     </form>
   </body>
 </html>
rename from toolkit/components/console/hudservice/tests/browser/test-network.html
rename to browser/devtools/webconsole/test/browser/test-network.html
rename from toolkit/components/console/hudservice/tests/browser/test-observe-http-ajax.html
rename to browser/devtools/webconsole/test/browser/test-observe-http-ajax.html
rename from toolkit/components/console/hudservice/tests/browser/test-own-console.html
rename to browser/devtools/webconsole/test/browser/test-own-console.html
rename from toolkit/components/console/hudservice/tests/browser/test-property-provider.html
rename to browser/devtools/webconsole/test/browser/test-property-provider.html
rename from toolkit/components/console/hudservice/tests/browser/testscript.js
rename to browser/devtools/webconsole/test/browser/testscript.js
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -2332,17 +2332,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
 
 
     <hr>
 
     <h1><a name="firebug"></a>Firebug License</h1>
 
     <p>This license applies to the code
-    <span class="path">toolkit/components/console/hudservice/NetworkHelper.jsm</span>.</p>
+    <span class="path">browser/devtools/webconsole/NetworkHelper.jsm</span>.</p>
 
 <pre>
 Copyright (c) 2007, Parakey Inc.
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met: