Bug 912121 - Update misc. DevTools paths and comments. rs=devtools
authorJ. Ryan Stinnett <jryans@gmail.com>
Mon, 21 Sep 2015 12:07:31 -0500
changeset 263576 f5c50b4960f074ae1997da13bca56b724c332c99
parent 263575 7054f652e387755532a5ef48c4834533de1dd4ab
child 263577 ab023cef6c94e29a01c270bfbab7aa8461b37988
push id29414
push usercbook@mozilla.com
push dateTue, 22 Sep 2015 10:19:39 +0000
treeherdermozilla-central@f4f27148d24c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdevtools
bugs912121
milestone44.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 912121 - Update misc. DevTools paths and comments. rs=devtools
.gitignore
.hgignore
b2g/chrome/content/devtools/debugger.js
browser/base/content/test/general/test_no_mcb_on_http_site_font.css
build/dumbmake-dependencies
devtools/.eslintrc
devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
devtools/client/animationinspector/test/head.js
devtools/client/app-manager/content/template.js
devtools/client/app-manager/test/head.js
devtools/client/canvasdebugger/test/head.js
devtools/client/commandline/test/browser_cmd_appcache_invalid.js
devtools/client/commandline/test/browser_cmd_appcache_valid.js
devtools/client/commandline/test/browser_cmd_cookie.js
devtools/client/commandline/test/browser_cmd_cookie_host.js
devtools/client/commandline/test/browser_cmd_inject.js
devtools/client/commandline/test/browser_cmd_jsb.js
devtools/client/commandline/test/browser_cmd_listen.js
devtools/client/commandline/test/browser_cmd_media.js
devtools/client/commandline/test/browser_cmd_pagemod_export.js
devtools/client/commandline/test/browser_cmd_paintflashing.js
devtools/client/commandline/test/browser_cmd_screenshot.js
devtools/client/commandline/test/head.js
devtools/client/commandline/test/helpers.js
devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
devtools/client/debugger/test/mochitest/head.js
devtools/client/eyedropper/test/head.js
devtools/client/fontinspector/test/head.js
devtools/client/framework/gDevTools.jsm
devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
devtools/client/framework/test/browser_toolbox_theme_registration.js
devtools/client/framework/test/browser_toolbox_toggle.js
devtools/client/framework/test/head.js
devtools/client/framework/toolbox-highlighter-utils.js
devtools/client/framework/toolbox.js
devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
devtools/client/inspector/test/browser_inspector_navigation.js
devtools/client/inspector/test/head.js
devtools/client/layoutview/test/head.js
devtools/client/markupview/test/head.js
devtools/client/netmonitor/har/test/head.js
devtools/client/netmonitor/test/head.js
devtools/client/performance/modules/logic/jit.js
devtools/client/performance/modules/markers.js
devtools/client/performance/test/head.js
devtools/client/performance/views/optimizations-list.js
devtools/client/performance/views/overview.js
devtools/client/projecteditor/test/head.js
devtools/client/responsivedesign/test/browser_responsiveui_touch.js
devtools/client/scratchpad/test/browser_scratchpad_open.js
devtools/client/shadereditor/test/head.js
devtools/client/shared/browser-loader.js
devtools/client/shared/telemetry.js
devtools/client/shared/test/head.js
devtools/client/shared/test/test-actor-registry.js
devtools/client/shared/test/test-actor.js
devtools/client/sourceeditor/codemirror/README
devtools/client/sourceeditor/test/browser_codemirror.js
devtools/client/sourceeditor/test/browser_css_autocompletion.js
devtools/client/sourceeditor/test/browser_css_statemachine.js
devtools/client/sourceeditor/test/browser_editor_script_injection.js
devtools/client/sourceeditor/test/browser_vimemacs.js
devtools/client/storage/test/head.js
devtools/client/storage/test/storage-listings.html
devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
devtools/client/styleeditor/test/browser_styleeditor_opentab.js
devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
devtools/client/styleeditor/test/head.js
devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
devtools/client/styleinspector/test/doc_urls_clickable.css
devtools/client/styleinspector/test/head.js
devtools/client/themes/animationinspector.css
devtools/client/themes/common.css
devtools/client/themes/dark-theme.css
devtools/client/themes/light-theme.css
devtools/client/themes/netmonitor.css
devtools/client/themes/performance.css
devtools/client/webaudioeditor/test/browser_callwatcher-02.js
devtools/client/webaudioeditor/test/doc_buffer-and-array.html
devtools/client/webaudioeditor/test/head.js
devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js
devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js
devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js
devtools/client/webconsole/test/browser_cached_messages.js
devtools/client/webconsole/test/browser_console.js
devtools/client/webconsole/test/browser_console_clear_on_reload.js
devtools/client/webconsole/test/browser_console_click_focus.js
devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js
devtools/client/webconsole/test/browser_console_iframe_messages.js
devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
devtools/client/webconsole/test/browser_console_navigation_marker.js
devtools/client/webconsole/test/browser_console_optimized_out_vars.js
devtools/client/webconsole/test/browser_console_server_logging.js
devtools/client/webconsole/test/browser_console_variables_view.js
devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js
devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
devtools/client/webconsole/test/browser_longstring_hang.js
devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
devtools/client/webconsole/test/browser_result_format_as_string.js
devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
devtools/client/webconsole/test/browser_webconsole_assert.js
devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js
devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js
devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js
devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js
devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js
devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js
devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js
devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
devtools/client/webconsole/test/browser_webconsole_bug_632817.js
devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js
devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
devtools/client/webconsole/test/browser_webconsole_bug_704295.js
devtools/client/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js
devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
devtools/client/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js
devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js
devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
devtools/client/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
devtools/client/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js
devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
devtools/client/webconsole/test/browser_webconsole_column_numbers.js
devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
devtools/client/webconsole/test/browser_webconsole_console_extras.js
devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
devtools/client/webconsole/test/browser_webconsole_count.js
devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
devtools/client/webconsole/test/browser_webconsole_execution_scope.js
devtools/client/webconsole/test/browser_webconsole_for_of.js
devtools/client/webconsole/test/browser_webconsole_history.js
devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
devtools/client/webconsole/test/browser_webconsole_jsterm.js
devtools/client/webconsole/test/browser_webconsole_live_filtering_of_message_types.js
devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
devtools/client/webconsole/test/browser_webconsole_message_node_id.js
devtools/client/webconsole/test/browser_webconsole_netlogging.js
devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
devtools/client/webconsole/test/browser_webconsole_output_02.js
devtools/client/webconsole/test/browser_webconsole_output_03.js
devtools/client/webconsole/test/browser_webconsole_output_04.js
devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
devtools/client/webconsole/test/browser_webconsole_output_events.js
devtools/client/webconsole/test/browser_webconsole_output_order.js
devtools/client/webconsole/test/browser_webconsole_output_regexp.js
devtools/client/webconsole/test/browser_webconsole_output_table.js
devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
devtools/client/webconsole/test/browser_webconsole_view_source.js
devtools/client/webconsole/test/head.js
devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html
devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html
devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html
devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html
devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html
devtools/client/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html
devtools/client/webconsole/test/test-bug-869003-top-window.html
devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
devtools/client/webconsole/test/test-network-request.html
devtools/client/webide/test/browser_tabs.js
devtools/client/webide/test/head.js
devtools/client/webide/test/sidebars/browser_tabs.js
devtools/client/webide/test/templates.json
devtools/server/actors/animation.js
devtools/server/actors/common.js
devtools/server/actors/framerate.js
devtools/server/actors/highlighters.js
devtools/server/actors/memory.js
devtools/server/actors/performance-recording.js
devtools/server/actors/performance.js
devtools/server/actors/profiler.js
devtools/server/actors/timeline.js
devtools/server/docs/actor-hierarchy.md
devtools/server/docs/actor-registration.md
devtools/server/main.js
devtools/server/tests/browser/browser.ini
devtools/server/tests/browser/browser_animation_actors_10.js
devtools/server/tests/browser/browser_perf-samples-02.js
devtools/server/tests/browser/browser_storage_listings.js
devtools/server/tests/browser/head.js
devtools/server/tests/browser/storage-dynamic-windows.html
devtools/server/tests/browser/storage-listings.html
devtools/server/tests/mochitest/setup-in-child.js
devtools/server/tests/mochitest/test_inspector-resolve-url.html
devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
devtools/server/tests/mochitest/test_registerActor.html
devtools/server/tests/mochitest/test_setupInParentChild.html
devtools/server/tests/mochitest/test_unsafeDereference.html
devtools/shared/Loader.jsm
devtools/shared/acorn/UPGRADING.md
devtools/shared/apps/Simulator.jsm
devtools/shared/gcli/source/docs/index.md
devtools/shared/gcli/source/docs/writing-commands.md
devtools/shared/heapsnapshot/generate-core-dump-sources.sh
devtools/shared/jsbeautify/UPGRADING.md
devtools/shared/pretty-fast/UPGRADING.md
devtools/shared/shared/framerate.js
devtools/shared/shared/tests/unit/.eslintrc
devtools/shared/shared/timeline.js
devtools/shared/shared/worker.js
devtools/shared/sourcemap/UPGRADING.md
devtools/shared/tern/README
devtools/shared/webconsole/server-logger-monitor.js
devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
devtools/shared/webconsole/test/test_jsterm_last_result.html
devtools/shared/webconsole/test/test_network_get.html
devtools/shared/webconsole/test/test_network_longstring.html
devtools/shared/webconsole/test/test_network_post.html
devtools/shared/webconsole/test/test_network_security-hpkp.html
devtools/shared/webconsole/test/test_network_security-hsts.html
devtools/shared/webconsole/test/test_reflow.html
dom/base/ChromeUtils.h
js/public/ProfilingStack.h
js/src/asmjs/AsmJSFrameIterator.cpp
js/src/vm/SPSProfiler.cpp
mobile/android/chrome/content/RemoteDebugger.js
python/mozbuild/mozbuild/test/test_testing.py
testing/runtimes/mochitest-devtools-chrome.runtimes.json
testing/runtimes/mochitest-e10s-devtools-chrome.runtimes.json
toolkit/content/license.html
toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd
--- a/.gitignore
+++ b/.gitignore
@@ -52,18 +52,18 @@ parser/html/java/javaparser/
 .settings/
 
 # Python virtualenv artifacts.
 python/psutil/**/*.so
 python/psutil/**/*.pyd
 python/psutil/build/
 
 # Ignore chrome.manifest files from the devtools loader
-browser/devtools/chrome.manifest
-toolkit/devtools/chrome.manifest
+devtools/client/chrome.manifest
+devtools/shared/chrome.manifest
 
 # Tag files generated by GNU Global
 GTAGS
 GRTAGS
 GSYMS
 GPATH
 
 # Git clone directory for updating web-platform-tests
--- a/.hgignore
+++ b/.hgignore
@@ -59,18 +59,18 @@
 ^python/psutil/.*\.so
 ^python/psutil/.*\.pyd
 ^python/psutil/build/
 
 # Git repositories
 .git/
 
 # Ignore chrome.manifest files from the devtools loader
-^browser/devtools/chrome.manifest$
-^toolkit/devtools/chrome.manifest$
+^devtools/client/chrome.manifest$
+^devtools/shared/chrome.manifest$
 
 # git checkout of libstagefright
 ^media/libstagefright/android$
 
 # Tag files generated by GNU Global
 GTAGS
 GRTAGS
 GSYMS
--- a/b2g/chrome/content/devtools/debugger.js
+++ b/b2g/chrome/content/devtools/debugger.js
@@ -44,17 +44,17 @@ var RemoteDebugger = {
    *          },
    *          server: {
    *            host,
    *            port
    *          }
    *        }
    *        Specific authentication modes may include additional fields.  Check
    *        the different |allowConnection| methods in
-   *        toolkit/devtools/security/auth.js.
+   *        devtools/shared/security/auth.js.
    * @return An AuthenticationResult value.
    *         A promise that will be resolved to the above is also allowed.
    */
   allowConnection(session) {
     if (this._promptingForAllow) {
       // Don't stack connection prompts if one is already open
       return DebuggerServer.AuthenticationResult.DENY;
     }
--- a/browser/base/content/test/general/test_no_mcb_on_http_site_font.css
+++ b/browser/base/content/test/general/test_no_mcb_on_http_site_font.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: testFont;
-  src: url(http://example.com/browser/browser/devtools/fontinspector/test/browser_font.woff);
+  src: url(http://example.com/browser/devtools/client/fontinspector/test/browser_font.woff);
 }
 body {
   font-family: Arial;
 }
 div {
   font-family: testFont;
 }
--- a/build/dumbmake-dependencies
+++ b/build/dumbmake-dependencies
@@ -46,25 +46,25 @@ toolkit/library
     intl
   media
   profile
   services
   startupcache
 browser/app
   browser/base
   browser/components
-  browser/devtools
+  devtools/client
   browser/locales
   browser/modules
   browser/themes
   toolkit
   toolkit/components
   toolkit/components/jsdownloads
   toolkit/content
   toolkit/crashreporter
-  toolkit/devtools
+  devtools/shared
   toolkit/forgetaboutsite
   toolkit/identity
   toolkit/modules
   toolkit/mozapps/extensions
   toolkit/profile
   toolkit/themes
   toolkit/webapps
--- a/devtools/.eslintrc
+++ b/devtools/.eslintrc
@@ -323,17 +323,17 @@
     "spaced-line-comment": [1, "always"],
     // Require "use strict" to be defined globally in the script.
     "strict": [2, "global"],
     // Disallow comparisons with the value NaN.
     "use-isnan": 2,
     // Warn about invalid JSDoc comments.
     // Disabled for now because of https://github.com/eslint/eslint/issues/2270
     // The rule fails on some jsdoc comments like in:
-    // browser/devtools/webconsole/console-output.js
+    // devtools/client/webconsole/console-output.js
     "valid-jsdoc": 0,
     // Ensure that the results of typeof are compared against a valid string.
     "valid-typeof": 2,
     // Allow vars to be declared anywhere in the scope.
     "vars-on-top": 0,
     // Don't require immediate function invocation to be wrapped in parentheses.
     "wrap-iife": 0,
     // Don't require regex literals to be wrapped in parentheses (which
--- a/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
+++ b/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
@@ -2,17 +2,17 @@
 /* Any copyright is dedicated to the Public Domain.
  http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Test that the main toggle button actually toggles animations.
 // This test doesn't need to be extra careful about checking that *all*
 // animations have been paused (including inside iframes) because there's an
-// actor test in /toolkit/devtools/server/tests/browser/ that does this.
+// actor test in /devtools/server/tests/browser/ that does this.
 
 add_task(function*() {
   yield addTab(TEST_URL_ROOT + "doc_simple_animation.html");
   let {panel} = yield openAnimationInspector();
 
   info("Click the toggle button");
   yield panel.toggleAll();
   yield checkState("paused");
--- a/devtools/client/animationinspector/test/head.js
+++ b/devtools/client/animationinspector/test/head.js
@@ -11,17 +11,17 @@ const promise = require("promise");
 const {TargetFactory} = require("devtools/client/framework/target");
 const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
 const {ViewHelpers} = Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm", {});
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 // All tests are asynchronous
 waitForExplicitFinish();
 
-const TEST_URL_ROOT = "http://example.com/browser/browser/devtools/animationinspector/test/";
+const TEST_URL_ROOT = "http://example.com/browser/devtools/client/animationinspector/test/";
 const ROOT_TEST_DIR = getRootDirectory(gTestPath);
 const FRAME_SCRIPT_URL = ROOT_TEST_DIR + "doc_frame_script.js";
 const COMMON_FRAME_SCRIPT_URL = "chrome://devtools/content/shared/frame-script-utils.js";
 const NEW_UI_PREF = "devtools.inspector.animationInspectorV3";
 const TAB_NAME = "animationinspector";
 
 // Auto clean-up when a test ends
 registerCleanupFunction(function*() {
--- a/devtools/client/app-manager/content/template.js
+++ b/devtools/client/app-manager/content/template.js
@@ -7,17 +7,17 @@
  *
  * The data used to expand the templates comes from
  * a ObjectEmitter object. The templates are automatically
  * updated as the ObjectEmitter is updated (via the "set"
  * event). See documentation in observable-object.js.
  *
  * Templates are used this way:
  *
- * (See examples in browser/devtools/app-manager/content/*.xhtml)
+ * (See examples in devtools/client/app-manager/content/*.xhtml)
  *
  * <div template="{JSON Object}">
  *
  * {
  *  type: "attribute"
  *  name: name of the attribute
  *  path: location of the attribute value in the ObjectEmitter
  * }
--- a/devtools/client/app-manager/test/head.js
+++ b/devtools/client/app-manager/test/head.js
@@ -9,17 +9,17 @@ const {Promise: promise} =
 const {require} =
   Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 
 const {AppProjects} = require("devtools/client/app-manager/app-projects");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 const APP_MANAGER_URL = "about:app-manager";
 const TEST_BASE =
-  "chrome://mochitests/content/browser/browser/devtools/app-manager/test/";
+  "chrome://mochitests/content/browser/devtools/client/app-manager/test/";
 const HOSTED_APP_MANIFEST = TEST_BASE + "hosted_app.manifest";
 
 const PACKAGED_APP_DIR_PATH = getTestFilePath(".");
 
 DevToolsUtils.testing = true;
 SimpleTest.registerCleanupFunction(() => {
   DevToolsUtils.testing = false;
 });
--- a/devtools/client/canvasdebugger/test/head.js
+++ b/devtools/client/canvasdebugger/test/head.js
@@ -24,17 +24,17 @@ var { CanvasFront } = require("devtools/
 var { setTimeout } = require("sdk/timers");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var TiltGL = require("devtools/client/tilt/tilt-gl");
 var { TargetFactory } = require("devtools/client/framework/target");
 var { Toolbox } = require("devtools/client/framework/toolbox");
 var mm = null
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js";
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/canvasdebugger/test/";
+const EXAMPLE_URL = "http://example.com/browser/devtools/client/canvasdebugger/test/";
 const SET_TIMEOUT_URL = EXAMPLE_URL + "doc_settimeout.html";
 const NO_CANVAS_URL = EXAMPLE_URL + "doc_no-canvas.html";
 const RAF_NO_CANVAS_URL = EXAMPLE_URL + "doc_raf-no-canvas.html";
 const SIMPLE_CANVAS_URL = EXAMPLE_URL + "doc_simple-canvas.html";
 const SIMPLE_BITMASKS_URL = EXAMPLE_URL + "doc_simple-canvas-bitmasks.html";
 const SIMPLE_CANVAS_TRANSPARENT_URL = EXAMPLE_URL + "doc_simple-canvas-transparent.html";
 const SIMPLE_CANVAS_DEEP_STACK_URL = EXAMPLE_URL + "doc_simple-canvas-deep-stack.html";
 const WEBGL_ENUM_URL = EXAMPLE_URL + "doc_webgl-enum.html";
--- a/devtools/client/commandline/test/browser_cmd_appcache_invalid.js
+++ b/devtools/client/commandline/test/browser_cmd_appcache_invalid.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the appcache validate works as they should with an invalid
 // manifest.
 
-const TEST_URI = "http://sub1.test1.example.com/browser/browser/devtools/commandline/" +
+const TEST_URI = "http://sub1.test1.example.com/browser/devtools/client/commandline/" +
                  "test/browser_cmd_appcache_invalid_index.html";
 
 function test() {
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
 function* spawnTest() {
   let lines = [
@@ -39,19 +39,19 @@ function* spawnTest() {
     'http://example.com/scene.jpg points to a resource that is not available at line 29.',
     '/section1/blockedbyfallback.html points to a resource that is not available at line 30.',
     'http://example.com/images/world.jpg points to a resource that is not available at line 31.',
     '/section2/blockedbyfallback.html points to a resource that is not available at line 32.',
     '/main/home points to a resource that is not available at line 34.',
     'main/app.js points to a resource that is not available at line 35.',
     '/settings/home points to a resource that is not available at line 37.',
     '/settings/app.js points to a resource that is not available at line 38.',
-    'The file http://sub1.test1.example.com/browser/browser/devtools/' +
+    'The file http://sub1.test1.example.com/browser/devtools/client/' +
       'commandline/test/browser_cmd_appcache_invalid_page3.html was modified ' +
-      'after http://sub1.test1.example.com/browser/browser/devtools/' +
+      'after http://sub1.test1.example.com/browser/devtools/client/' +
       'commandline/test/browser_cmd_appcache_invalid_appcache.appcache. Unless ' +
       'the text in the manifest file is changed the cached version will be used ' +
       'instead at line 39.',
     'browser_cmd_appcache_invalid_page3.html has cache-control set to no-store. ' +
       'This will prevent the application cache from storing the file at line 39.',
     'http://example.com/logo.png points to a resource that is not available at line 40.',
     'http://example.com/check.png points to a resource that is not available at line 41.',
     'Spaces in URIs need to be replaced with % at line 42.',
--- a/devtools/client/commandline/test/browser_cmd_appcache_valid.js
+++ b/devtools/client/commandline/test/browser_cmd_appcache_valid.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the appcache commands works as they should
 
-const TEST_URI = "http://sub1.test2.example.com/browser/browser/devtools/" +
+const TEST_URI = "http://sub1.test2.example.com/browser/devtools/client/" +
                  "commandline/test/browser_cmd_appcache_valid_index.html";
 
 function test() {
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
 function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
@@ -105,17 +105,17 @@ function* spawnTest() {
         output: [ /successfully/ ]
       },
     },
 
     {
       setup: 'appcache validate ' + TEST_URI,
       check: {
         input:  'appcache validate ' + TEST_URI,
-              // appcache validate http://sub1.test2.example.com/browser/browser/devtools/commandline/test/browser_cmd_appcache_valid_index.html
+              // appcache validate http://sub1.test2.example.com/browser/devtools/client/commandline/test/browser_cmd_appcache_valid_index.html
         markup: 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV',
         status: 'VALID',
         args: {
           uri: {
             value: TEST_URI
           },
         }
       },
@@ -155,17 +155,17 @@ function* spawnTest() {
         ok(!text.includes("page3"), "page1 is not contained in output");
       }
     },
 
     {
       setup: 'appcache viewentry --key ' + TEST_URI,
       check: {
         input:  'appcache viewentry --key ' + TEST_URI,
-              // appcache viewentry --key http://sub1.test2.example.com/browser/browser/devtools/commandline/test/browser_cmd_appcache_valid_index.html
+              // appcache viewentry --key http://sub1.test2.example.com/browser/devtools/client/commandline/test/browser_cmd_appcache_valid_index.html
         markup: 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV',
         status: 'VALID',
         args: {}
       },
     },
   ]);
 
   yield helpers.closeToolbar(options);
--- a/devtools/client/commandline/test/browser_cmd_cookie.js
+++ b/devtools/client/commandline/test/browser_cmd_cookie.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the cookie commands works as they should
 
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/"+
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/"+
                  "test/browser_cmd_cookie.html";
 
 function test() {
   helpers.addTabWithToolbar(TEST_URI, function(options) {
     return helpers.audit(options, [
       {
         setup: 'cookie',
         check: {
--- a/devtools/client/commandline/test/browser_cmd_cookie_host.js
+++ b/devtools/client/commandline/test/browser_cmd_cookie_host.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the cookie command works for host with a port specified
 
-const TEST_URI = "http://mochi.test:8888/browser/browser/devtools/commandline/"+
+const TEST_URI = "http://mochi.test:8888/browser/devtools/client/commandline/"+
                  "test/browser_cmd_cookie.html";
 
 function test() {
   helpers.addTabWithToolbar(TEST_URI, function(options) {
     return helpers.audit(options, [
         {
           setup: 'cookie list',
           exec: {
--- a/devtools/client/commandline/test/browser_cmd_inject.js
+++ b/devtools/client/commandline/test/browser_cmd_inject.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the inject commands works as they should
 
-const TEST_URI = 'http://example.com/browser/browser/devtools/commandline/'+
+const TEST_URI = 'http://example.com/browser/devtools/client/commandline/'+
                  'test/browser_cmd_inject.html';
 
 function test() {
   helpers.addTabWithToolbar(TEST_URI, function(options) {
     return helpers.audit(options, [
       {
         setup:    'inject',
         check: {
@@ -38,19 +38,19 @@ function test() {
             library: {
               value: undefined,
               status: 'INCOMPLETE'
             }
           }
         }
       },
       {
-        setup:    'inject http://example.com/browser/browser/devtools/commandline/test/browser_cmd_inject.js',
+        setup:    'inject http://example.com/browser/devtools/client/commandline/test/browser_cmd_inject.js',
         check: {
-          input:  'inject http://example.com/browser/browser/devtools/commandline/test/browser_cmd_inject.js',
+          input:  'inject http://example.com/browser/devtools/client/commandline/test/browser_cmd_inject.js',
           markup: 'VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV',
           hints:                                                                                            '',
           status: 'VALID',
           args: {
             library: {
               value: function(library) {
                 is(library.type, 'url', 'inject type name');
                 is(library.url.origin, 'http://example.com', 'inject url hostname');
--- a/devtools/client/commandline/test/browser_cmd_jsb.js
+++ b/devtools/client/commandline/test/browser_cmd_jsb.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the jsb command works as it should
 
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/" +
                  "test/browser_cmd_jsb_script.jsi";
 
 function test() {
   return Task.spawn(testTask).then(finish, helpers.handleError);
 }
 
 function* testTask() {
   let options = yield helpers.openTab("about:blank");
--- a/devtools/client/commandline/test/browser_cmd_listen.js
+++ b/devtools/client/commandline/test/browser_cmd_listen.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the listen/unlisten commands work as they should.
 
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/"+
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/"+
                  "test/browser_cmd_cookie.html";
 
 function test() {
   return Task.spawn(testTask).then(finish, helpers.handleError);
 }
 
 var tests = {
   testInput: function(options) {
--- a/devtools/client/commandline/test/browser_cmd_media.js
+++ b/devtools/client/commandline/test/browser_cmd_media.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test that screenshot command works properly
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/" +
                  "test/browser_cmd_media.html";
 var tests = {
   testInput: function(options) {
     return helpers.audit(options, [
       {
         setup: "media emulate braille",
         check: {
           input:  "media emulate braille",
--- a/devtools/client/commandline/test/browser_cmd_pagemod_export.js
+++ b/devtools/client/commandline/test/browser_cmd_pagemod_export.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the inspect command works as it should
 
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/"+
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/"+
                  "test/browser_cmd_pagemod_export.html";
 
 function test() {
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
 function* spawnTest() {
   let options = yield helpers.openTab(TEST_URI);
--- a/devtools/client/commandline/test/browser_cmd_paintflashing.js
+++ b/devtools/client/commandline/test/browser_cmd_paintflashing.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
 * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the paintflashing command correctly sets its state.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/" +
                  "test/browser_cmd_cookie.html";
 
 function test() {
   return Task.spawn(testTask).then(finish, helpers.handleError);
 }
 
 var tests = {
   testInput: function(options) {
--- a/devtools/client/commandline/test/browser_cmd_screenshot.js
+++ b/devtools/client/commandline/test/browser_cmd_screenshot.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test that screenshot command works properly
-const TEST_URI = "http://example.com/browser/browser/devtools/commandline/" +
+const TEST_URI = "http://example.com/browser/devtools/client/commandline/" +
                  "test/browser_cmd_screenshot.html";
 
 var FileUtils = (Cu.import("resource://gre/modules/FileUtils.jsm", {})).FileUtils;
 
 function test() {
   return Task.spawn(spawnTest).then(finish, helpers.handleError);
 }
 
--- a/devtools/client/commandline/test/head.js
+++ b/devtools/client/commandline/test/head.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/commandline/test/";
-const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/commandline/test/";
+const TEST_BASE_HTTP = "http://example.com/browser/devtools/client/commandline/test/";
+const TEST_BASE_HTTPS = "https://example.com/browser/devtools/client/commandline/test/";
 
 var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 var { console } = require("resource://gre/modules/devtools/shared/Console.jsm");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 // Import the GCLI test helper
 var testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 Services.scriptloader.loadSubScript(testDir + "/helpers.js", this);
--- a/devtools/client/commandline/test/helpers.js
+++ b/devtools/client/commandline/test/helpers.js
@@ -405,17 +405,17 @@ helpers.runTests = function(options, tes
   return testDone.then(function() {
     info("SHUTDOWN");
     return (tests.shutdown != null) ?
         Promise.resolve(tests.shutdown(options)) :
         Promise.resolve();
   }, recover);
 };
 
-const MOCK_COMMANDS_URI = "chrome://mochitests/content/browser/browser/devtools/commandline/test/mockCommands.js";
+const MOCK_COMMANDS_URI = "chrome://mochitests/content/browser/devtools/client/commandline/test/mockCommands.js";
 
 const defer = function() {
   const deferred = { };
   deferred.promise = new Promise(function(resolve, reject) {
     deferred.resolve = resolve;
     deferred.reject = reject;
   });
   return deferred;
--- a/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Check extension-added global actor API.
  */
 
-const CHROME_URL = "chrome://mochitests/content/browser/browser/devtools/debugger/test/mochitest/"
+const CHROME_URL = "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/"
 const ACTORS_URL = CHROME_URL + "testactors.js";
 
 function test() {
   let gClient;
 
   if (!DebuggerServer.initialized) {
     DebuggerServer.init();
     DebuggerServer.addBrowserActors();
--- a/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Check extension-added tab actor lifetimes.
  */
 
-const CHROME_URL = "chrome://mochitests/content/browser/browser/devtools/debugger/test/mochitest/"
+const CHROME_URL = "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/"
 const ACTORS_URL = CHROME_URL + "testactors.js";
 const TAB_URL = EXAMPLE_URL + "doc_empty-tab-01.html";
 
 var gClient;
 
 function test() {
   if (!DebuggerServer.initialized) {
     DebuggerServer.init();
--- a/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Check extension-added tab actor lifetimes.
  */
 
-const CHROME_URL = "chrome://mochitests/content/browser/browser/devtools/debugger/test/mochitest/"
+const CHROME_URL = "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/"
 const ACTORS_URL = CHROME_URL + "testactors.js";
 const TAB_URL = EXAMPLE_URL + "doc_empty-tab-01.html";
 
 var gClient;
 
 function test() {
   if (!DebuggerServer.initialized) {
     DebuggerServer.init();
--- a/devtools/client/debugger/test/mochitest/head.js
+++ b/devtools/client/debugger/test/mochitest/head.js
@@ -21,17 +21,17 @@ var { BrowserToolboxProcess } = Cu.impor
 var { DebuggerServer } = require("devtools/server/main");
 var { DebuggerClient, ObjectClient } = require("devtools/shared/client/main");
 var { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
 var EventEmitter = require("devtools/shared/event-emitter");
 const { promiseInvoke } = require("devtools/shared/async-utils");
 var { TargetFactory } = require("devtools/client/framework/target");
 var { Toolbox } = require("devtools/client/framework/toolbox")
 
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/debugger/test/mochitest/";
+const EXAMPLE_URL = "http://example.com/browser/devtools/client/debugger/test/mochitest/";
 const FRAME_SCRIPT_URL = getRootDirectory(gTestPath) + "code_frame-script.js";
 
 DevToolsUtils.testing = true;
 SimpleTest.registerCleanupFunction(() => {
   DevToolsUtils.testing = false;
 });
 
 // All tests are asynchronous.
--- a/devtools/client/eyedropper/test/head.js
+++ b/devtools/client/eyedropper/test/head.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // shared-head.js handles imports, constants, and utility functions
-Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/browser/devtools/framework/test/shared-head.js", this);
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
 Services.scriptloader.loadSubScript(TEST_DIR + "../../../commandline/test/helpers.js", this);
 
 const { Eyedropper, EyedropperManager } = require("devtools/client/eyedropper/eyedropper");
 
 function waitForClipboard(setup, expected) {
   let deferred = promise.defer();
   SimpleTest.waitForClipboard(expected, setup, deferred.resolve, deferred.reject);
   return deferred.promise;
--- a/devtools/client/fontinspector/test/head.js
+++ b/devtools/client/fontinspector/test/head.js
@@ -1,18 +1,18 @@
  /* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 // shared-head.js handles imports, constants, and utility functions
-Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/browser/devtools/framework/test/shared-head.js", this);
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
 
-const BASE_URI = "http://mochi.test:8888/browser/browser/devtools/fontinspector/test/"
+const BASE_URI = "http://mochi.test:8888/browser/devtools/client/fontinspector/test/"
 
 /**
  * Open the toolbox, with the inspector tool visible.
  * @param {Function} cb Optional callback, if you don't want to use the returned
  * promise
  * @return a promise that resolves when the inspector is ready
  */
 var openInspector = Task.async(function*(cb) {
--- a/devtools/client/framework/gDevTools.jsm
+++ b/devtools/client/framework/gDevTools.jsm
@@ -72,17 +72,17 @@ DevTools.prototype = {
    * - visibilityswitch: Property name to allow us to hide this tool from the
    *                     DevTools Toolbox.
    *                     A falsy value indicates that it cannot be hidden.
    * - icon: URL pointing to a graphic which will be used as the src for an
    *         16x16 img tag (string|required)
    * - invertIconForLightTheme: The icon can automatically have an inversion
    *         filter applied (default is false).  All builtin tools are true, but
    *         addons may omit this to prevent unwanted changes to the `icon`
-   *         image. See browser/themes/shared/devtools/filters.svg#invert for
+   *         image. See devtools/client/themes/filters.svg#invert for
    *         the filter being applied to the images (boolean|optional)
    * - url: URL pointing to a XUL/XHTML document containing the user interface
    *        (string|required)
    * - label: Localized name for the tool to be displayed to the user
    *          (string|required)
    * - hideInOptions: Boolean indicating whether or not this tool should be
                       shown in toolbox options or not. Defaults to false.
    *                  (boolean)
--- a/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
+++ b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
  http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// A helper frame-script for browser/devtools/framework service worker tests.
+// A helper frame-script for devtools/client/framework service worker tests.
 
 "use strict";
 
 addMessageListener("devtools:sw-test:register", function(msg) {
   content.navigator.serviceWorker.register("serviceworker.js")
     .then(swr => {
       sendAsyncMessage("devtools:sw-test:register", {success: true});
     }, error => {
--- a/devtools/client/framework/test/browser_toolbox_theme_registration.js
+++ b/devtools/client/framework/test/browser_toolbox_theme_registration.js
@@ -1,13 +1,13 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const CHROME_URL = "chrome://mochitests/content/browser/browser/devtools/framework/test/";
+const CHROME_URL = "chrome://mochitests/content/browser/devtools/client/framework/test/";
 
 var toolbox;
 
 function test()
 {
   gBrowser.selectedTab = gBrowser.addTab();
   let target = TargetFactory.forTab(gBrowser.selectedTab);
 
--- a/devtools/client/framework/test/browser_toolbox_toggle.js
+++ b/devtools/client/framework/test/browser_toolbox_toggle.js
@@ -7,17 +7,17 @@
 // and detached (window) modes.
 
 const URL = "data:text/html;charset=utf-8,Toggling devtools using shortcuts";
 
 var {Toolbox} = require("devtools/client/framework/toolbox");
 
 add_task(function*() {
   // Test with ACCEL+SHIFT+I / ACCEL+ALT+I (MacOSX) ; modifiers should match :
-  // - toolbox-key-toggle in browser/devtools/framework/toolbox-window.xul
+  // - toolbox-key-toggle in devtools/client/framework/toolbox-window.xul
   // - key_devToolboxMenuItem in browser/base/content/browser.xul
   info("Test toggle using CTRL+SHIFT+I/CMD+ALT+I");
   yield testToggle("I", {
     accelKey: true,
     shiftKey: !navigator.userAgent.match(/Mac/),
     altKey: navigator.userAgent.match(/Mac/)
   });
 
--- a/devtools/client/framework/test/head.js
+++ b/devtools/client/framework/test/head.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // shared-head.js handles imports, constants, and utility functions
-Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/browser/devtools/framework/test/shared-head.js", this);
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
 
 function toggleAllTools(state) {
   for (let [, tool] of gDevTools._tools) {
     if (!tool.visibilityswitch) {
       continue;
     }
     if (state) {
       Services.prefs.setBoolPref(tool.visibilityswitch, true);
--- a/devtools/client/framework/toolbox-highlighter-utils.js
+++ b/devtools/client/framework/toolbox-highlighter-utils.js
@@ -191,17 +191,17 @@ exports.getHighlighterUtils = function(t
   function onPickerNodeCanceled() {
     stopPicker();
     toolbox.frame.focus();
   }
 
   /**
    * Show the box model highlighter on a node in the content page.
    * The node needs to be a NodeFront, as defined by the inspector actor
-   * @see toolkit/devtools/server/actors/inspector.js
+   * @see devtools/server/actors/inspector.js
    * @param {NodeFront} nodeFront The node to highlight
    * @param {Object} options
    * @return A promise that resolves when the node has been highlighted
    */
   let highlightNodeFront = exported.highlightNodeFront = requireInspector(
   function*(nodeFront, options={}) {
     if (!nodeFront) {
       return;
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -2089,43 +2089,43 @@ Toolbox.prototype = {
    * Returns gViewSourceUtils for viewing source.
    */
   get gViewSourceUtils() {
     return this.frame.contentWindow.gViewSourceUtils;
   },
 
   /**
    * Opens source in style editor. Falls back to plain "view-source:".
-   * @see browser/devtools/shared/source-utils.js
+   * @see devtools/client/shared/source-utils.js
    */
   viewSourceInStyleEditor: function(sourceURL, sourceLine) {
     return sourceUtils.viewSourceInStyleEditor(this, sourceURL, sourceLine);
   },
 
   /**
    * Opens source in debugger. Falls back to plain "view-source:".
-   * @see browser/devtools/shared/source-utils.js
+   * @see devtools/client/shared/source-utils.js
    */
   viewSourceInDebugger: function(sourceURL, sourceLine) {
     return sourceUtils.viewSourceInDebugger(this, sourceURL, sourceLine);
   },
 
   /**
    * Opens source in scratchpad. Falls back to plain "view-source:".
    * TODO The `sourceURL` for scratchpad instances are like `Scratchpad/1`.
    * If instances are scoped one-per-browser-window, then we should be able
    * to infer the URL from this toolbox, or use the built in scratchpad IN
    * the toolbox.
    *
-   * @see browser/devtools/shared/source-utils.js
+   * @see devtools/client/shared/source-utils.js
    */
   viewSourceInScratchpad: function(sourceURL, sourceLine) {
     return sourceUtils.viewSourceInScratchpad(sourceURL, sourceLine);
   },
 
   /**
    * Opens source in plain "view-source:".
-   * @see browser/devtools/shared/source-utils.js
+   * @see devtools/client/shared/source-utils.js
    */
   viewSource: function(sourceURL, sourceLine) {
     return sourceUtils.viewSource(this, sourceURL, sourceLine);
   },
 };
--- a/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
+++ b/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
@@ -8,17 +8,17 @@
 Bug 1014547 - CSS transforms highlighter
 Test that the highlighter elements created have the right size and coordinates.
 
 Note that instead of hard-coding values here, the assertions are made by
 comparing with the result of getAdjustedQuads.
 
 There's a separate test for checking that getAdjustedQuads actually returns
 sensible values
-(browser/devtools/shared/test/browser_layoutHelpers-getBoxQuads.js),
+(devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.js),
 so the present test doesn't care about that, it just verifies that the css
 transform highlighter applies those values correctly to the SVG elements
 */
 
 const TEST_URL = TEST_URL_ROOT + "doc_inspector_highlighter_csstransform.html";
 
 add_task(function*() {
   let {inspector, toolbox, testActor} = yield openInspectorForURL(TEST_URL);
--- a/devtools/client/inspector/test/browser_inspector_navigation.js
+++ b/devtools/client/inspector/test/browser_inspector_navigation.js
@@ -2,17 +2,17 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 // Test that inspector updates when page is navigated.
 
-const TEST_URL_FILE = "browser/browser/devtools/inspector/test/" +
+const TEST_URL_FILE = "browser/devtools/client/inspector/test/" +
   "doc_inspector_breadcrumbs.html";
 
 const TEST_URL_1 = "http://test1.example.org/" + TEST_URL_FILE;
 const TEST_URL_2 = "http://test2.example.org/" + TEST_URL_FILE;
 
 add_task(function* () {
   let { inspector, toolbox, testActor } = yield openInspectorForURL(TEST_URL_1);
   let markuploaded = inspector.once("markuploaded");
--- a/devtools/client/inspector/test/head.js
+++ b/devtools/client/inspector/test/head.js
@@ -12,17 +12,17 @@ const CC = Components.Constructor;
 // Services.prefs.setBoolPref("devtools.debugger.log", true);
 // SimpleTest.registerCleanupFunction(() => {
 //   Services.prefs.clearUserPref("devtools.debugger.log");
 // });
 
 // Uncomment this pref to dump all devtools emitted events to the console.
 // Services.prefs.setBoolPref("devtools.dump.emit", true);
 
-var TEST_URL_ROOT = "http://example.com/browser/browser/devtools/inspector/test/";
+var TEST_URL_ROOT = "http://example.com/browser/devtools/client/inspector/test/";
 var ROOT_TEST_DIR = getRootDirectory(gTestPath);
 
 // All test are asynchronous
 waitForExplicitFinish();
 
 var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 var {TargetFactory} = require("devtools/client/framework/target");
 var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
--- a/devtools/client/layoutview/test/head.js
+++ b/devtools/client/layoutview/test/head.js
@@ -10,17 +10,17 @@ var {require} = Cu.import("resource://gr
 var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
 var {TargetFactory} = require("devtools/client/framework/target");
 var promise = require("promise");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 // All test are asynchronous
 waitForExplicitFinish();
 
-const TEST_URL_ROOT = "http://example.com/browser/browser/devtools/layoutview/test/";
+const TEST_URL_ROOT = "http://example.com/browser/devtools/client/layoutview/test/";
 
 // Uncomment this pref to dump all devtools emitted events to the console.
 // Services.prefs.setBoolPref("devtools.dump.emit", true);
 
 // Services.prefs.setBoolPref("devtools.debugger.log", true);
 
 // Set the testing flag on DevToolsUtils and reset it when the test ends
 DevToolsUtils.testing = true;
--- a/devtools/client/markupview/test/head.js
+++ b/devtools/client/markupview/test/head.js
@@ -43,18 +43,18 @@ registerCleanupFunction(function*() {
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   yield gDevTools.closeToolbox(target);
 
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
 });
 
-const TEST_URL_ROOT = "http://mochi.test:8888/browser/browser/devtools/markupview/test/";
-const CHROME_BASE = "chrome://mochitests/content/browser/browser/devtools/markupview/test/";
+const TEST_URL_ROOT = "http://mochi.test:8888/browser/devtools/client/markupview/test/";
+const CHROME_BASE = "chrome://mochitests/content/browser/devtools/client/markupview/test/";
 const COMMON_FRAME_SCRIPT_URL = "chrome://devtools/content/shared/frame-script-utils.js";
 const MARKUPVIEW_FRAME_SCRIPT_URL = CHROME_BASE + "frame-script-utils.js";
 
 /**
  * Add a new test tab in the browser and load the given url.
  * @param {String} url The url to be loaded in the new tab
  * @return a promise that resolves to the tab object when the url is loaded
  */
--- a/devtools/client/netmonitor/har/test/head.js
+++ b/devtools/client/netmonitor/har/test/head.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 var { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 
 // Load the NetMonitor head.js file to share its API.
-var netMonitorHead = "chrome://mochitests/content/browser/browser/devtools/netmonitor/test/head.js";
+var netMonitorHead = "chrome://mochitests/content/browser/devtools/client/netmonitor/test/head.js";
 Services.scriptloader.loadSubScript(netMonitorHead, this);
 
 // Directory with HAR related test files.
-const HAR_EXAMPLE_URL = "http://example.com/browser/browser/devtools/netmonitor/har/test/";
+const HAR_EXAMPLE_URL = "http://example.com/browser/devtools/client/netmonitor/har/test/";
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -10,17 +10,17 @@ var { gDevTools } = Cu.import("resource:
 var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 var { CurlUtils } = Cu.import("resource:///modules/devtools/client/shared/Curl.jsm", {});
 var promise = require("promise");
 var NetworkHelper = require("devtools/shared/webconsole/network-helper");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { TargetFactory } = require("devtools/client/framework/target");
 var { Toolbox } = require("devtools/client/framework/toolbox");
 
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/netmonitor/test/";
+const EXAMPLE_URL = "http://example.com/browser/devtools/client/netmonitor/test/";
 
 const API_CALLS_URL = EXAMPLE_URL + "html_api-calls-test-page.html";
 const SIMPLE_URL = EXAMPLE_URL + "html_simple-test-page.html";
 const NAVIGATE_URL = EXAMPLE_URL + "html_navigate-test-page.html";
 const CONTENT_TYPE_URL = EXAMPLE_URL + "html_content-type-test-page.html";
 const CONTENT_TYPE_WITHOUT_CACHE_URL = EXAMPLE_URL + "html_content-type-without-cache-test-page.html";
 const CYRILLIC_URL = EXAMPLE_URL + "html_cyrillic-test-page.html";
 const STATUS_CODES_URL = EXAMPLE_URL + "html_status-codes-test-page.html";
@@ -43,17 +43,17 @@ const CURL_URL = EXAMPLE_URL + "html_cop
 const CURL_UTILS_URL = EXAMPLE_URL + "html_curl-utils.html";
 const SEND_BEACON_URL = EXAMPLE_URL + "html_send-beacon.html";
 
 const SIMPLE_SJS = EXAMPLE_URL + "sjs_simple-test-server.sjs";
 const CONTENT_TYPE_SJS = EXAMPLE_URL + "sjs_content-type-test-server.sjs";
 const STATUS_CODES_SJS = EXAMPLE_URL + "sjs_status-codes-test-server.sjs";
 const SORTING_SJS = EXAMPLE_URL + "sjs_sorting-test-server.sjs";
 const HTTPS_REDIRECT_SJS = EXAMPLE_URL + "sjs_https-redirect-test-server.sjs";
-const CORS_SJS_PATH = "/browser/browser/devtools/netmonitor/test/sjs_cors-test-server.sjs";
+const CORS_SJS_PATH = "/browser/devtools/client/netmonitor/test/sjs_cors-test-server.sjs";
 
 const TEST_IMAGE = EXAMPLE_URL + "test-image.png";
 const TEST_IMAGE_DATA_URI = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==";
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js"
 
 DevToolsUtils.testing = true;
 SimpleTest.registerCleanupFunction(() => {
--- a/devtools/client/performance/modules/logic/jit.js
+++ b/devtools/client/performance/modules/logic/jit.js
@@ -18,17 +18,17 @@ const SUCCESSFUL_OUTCOMES = [
  * FrameNode may contain many different optimization sites. One sample may
  * pick up optimization X on line Y in the frame, with the next sample
  * containing optimization Z on line W in the same frame, as each frame is
  * only function.
  *
  * An OptimizationSite contains a record of how many times the
  * RawOptimizationSite was sampled, as well as the unique id based off of the
  * original profiler array, and the RawOptimizationSite itself as a reference.
- * @see browser/devtools/performance/modules/logic/tree-model.js
+ * @see devtools/client/performance/modules/logic/tree-model.js
  *
  * @struct RawOptimizationSite
  * A structure describing a location in a script that was attempted to be optimized.
  * Contains all the IonTypes observed, and the sequence of OptimizationAttempts that
  * were attempted, and the line and column in the script. This is retrieved from the
  * profiler after a recording, and our base data structure. Should always be referenced,
  * and unmodified.
  *
--- a/devtools/client/performance/modules/markers.js
+++ b/devtools/client/performance/modules/markers.js
@@ -16,17 +16,17 @@ const { Formatters } = require("devtools
  *          string or just a function that accepts the marker and returns a
  *          string, if you want to use a dynamic property for the main label.
  *          If you use a function for a label, it *must* handle the case where
  *          no marker is provided for a main label to describe all markers of
  *          this type.
  * - colorName: The label of the DevTools color used for this marker. If
  *              adding a new color, be sure to check that there's an entry
  *              for `.marker-details-bullet.{COLORNAME}` for the equivilent
- *              entry in ./browser/themes/shared/devtools/performance.inc.css
+ *              entry in ./devtools/client/themes/performance.inc.css
  *              https://developer.mozilla.org/en-US/docs/Tools/DevToolsColors
  * - collapsible: Whether or not this marker can contain other markers it
  *                eclipses, and becomes collapsible to reveal its nestable children.
  *                Defaults to true.
  * - nestable: Whether or not this marker can be nested inside an eclipsing
  *             collapsible marker. Defaults to true.
  * - fields: An optional array of marker properties you wish to display in the
  *           marker details view. For example, a field in the array such as
--- a/devtools/client/performance/test/head.js
+++ b/devtools/client/performance/test/head.js
@@ -20,17 +20,17 @@ var RecordingUtils = require("devtools/s
 var {
   PMM_loadFrameScripts, PMM_isProfilerActive, PMM_stopProfiler,
   sendProfilerCommand, consoleMethod
 } = require("devtools/shared/performance/process-communication");
 
 var mm = null;
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js"
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/performance/test/";
+const EXAMPLE_URL = "http://example.com/browser/devtools/client/performance/test/";
 const SIMPLE_URL = EXAMPLE_URL + "doc_simple-test.html";
 const MARKERS_URL = EXAMPLE_URL + "doc_markers.html";
 const ALLOCS_URL = EXAMPLE_URL + "doc_allocs.html";
 
 const MEMORY_SAMPLE_PROB_PREF = "devtools.performance.memory.sample-probability";
 const MEMORY_MAX_LOG_LEN_PREF = "devtools.performance.memory.max-log-length";
 const PROFILER_BUFFER_SIZE_PREF = "devtools.performance.profiler.buffer-size";
 const PROFILER_SAMPLE_RATE_PREF = "devtools.performance.profiler.sample-frequency-khz";
--- a/devtools/client/performance/views/optimizations-list.js
+++ b/devtools/client/performance/views/optimizations-list.js
@@ -7,17 +7,17 @@ const URL_LABEL_TOOLTIP = L10N.getStr("t
 const OPTIMIZATION_FAILURE = L10N.getStr("jit.optimizationFailure");
 const JIT_SAMPLES = L10N.getStr("jit.samples");
 const JIT_EMPTY_TEXT = L10N.getStr("jit.empty");
 const PROPNAME_MAX_LENGTH = 4;
 
 /**
  * View for rendering a list of all optmizations found in a frame.
  * The terminology and types used here can be referenced:
- * @see browser/devtools/performance/modules/logic/jit.js
+ * @see devtools/client/performance/modules/logic/jit.js
  */
 
 var OptimizationsListView = {
 
   _currentFrame: null,
 
   /**
    * Initialization function called when the tool starts up.
@@ -242,31 +242,31 @@ var OptimizationsListView = {
     node.appendChild(column);
 
     return node;
   },
 
   /**
    * Creates an element for insertion in the raw view for an IonType.
    *
-   * @see browser/devtools/performance/modules/logic/jit.js
+   * @see devtools/client/performance/modules/logic/jit.js
    * @param {IonType} ionType
    * @return {Element}
    */
   _createIonNode: function (ionType) {
     let node = document.createElement("span");
     node.textContent = `${ionType.site} : ${ionType.mirType}`;
     node.className = "opt-ion-type";
     return node;
   },
 
   /**
    * Creates an element for insertion in the raw view for an ObservedType.
    *
-   * @see browser/devtools/performance/modules/logic/jit.js
+   * @see devtools/client/performance/modules/logic/jit.js
    * @param {ObservedType} type
    * @return {Element}
    */
   _createObservedTypeNode: function (type) {
     let node = document.createElement("span");
     let typeNode = document.createElement("span");
 
     typeNode.textContent = `${type.keyedBy}` + (type.name ? ` → ${type.name}` : "");
@@ -295,17 +295,17 @@ var OptimizationsListView = {
       node.appendChild(line);
     }
     return node;
   },
 
   /**
    * Creates an element for insertion in the raw view for an OptimizationAttempt.
    *
-   * @see browser/devtools/performance/modules/logic/jit.js
+   * @see devtools/client/performance/modules/logic/jit.js
    * @param {OptimizationAttempt} attempt
    * @return {Element}
    */
   _createAttemptNode: function (attempt) {
     let node = document.createElement("span");
     let strategyNode = document.createElement("span");
     let outcomeNode = document.createElement("span");
 
--- a/devtools/client/performance/views/overview.js
+++ b/devtools/client/performance/views/overview.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 // No sense updating the overview more often than receiving data from the
 // backend. Make sure this isn't lower than DEFAULT_TIMELINE_DATA_PULL_TIMEOUT
-// in toolkit/devtools/server/actors/timeline.js
+// in devtools/server/actors/timeline.js
 const OVERVIEW_UPDATE_INTERVAL = 200; // ms
 const FRAMERATE_GRAPH_LOW_RES_INTERVAL = 100; // ms
 const FRAMERATE_GRAPH_HIGH_RES_INTERVAL = 16; // ms
 const GRAPH_REQUIREMENTS = {
   timeline: {
     features: ["withMarkers"]
   },
   framerate: {
--- a/devtools/client/projecteditor/test/head.js
+++ b/devtools/client/projecteditor/test/head.js
@@ -7,17 +7,17 @@ const {require} = Cu.import("resource://
 const {TargetFactory} = require("devtools/client/framework/target");
 const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
 const promise = require("promise");
 const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
 const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 const ProjectEditor = require("devtools/client/projecteditor/lib/projecteditor");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
-const TEST_URL_ROOT = "http://mochi.test:8888/browser/browser/devtools/projecteditor/test/";
+const TEST_URL_ROOT = "http://mochi.test:8888/browser/devtools/client/projecteditor/test/";
 const SAMPLE_WEBAPP_URL = TEST_URL_ROOT + "/helper_homepage.html";
 var TEMP_PATH;
 var TEMP_FOLDER_NAME = "ProjectEditor" + (new Date().getTime());
 
 // All test are asynchronous
 waitForExplicitFinish();
 
 // Uncomment this pref to dump all devtools emitted events to the console.
--- a/devtools/client/responsivedesign/test/browser_responsiveui_touch.js
+++ b/devtools/client/responsivedesign/test/browser_responsiveui_touch.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const TEST_URI = "http://mochi.test:8888/browser/browser/devtools/" +
+const TEST_URI = "http://mochi.test:8888/browser/devtools/client/" +
                  "responsivedesign/test/touch.html";
 
 add_task(function*() {
   yield addTab(TEST_URI);
   let mgr = ResponsiveUI.ResponsiveUIManager;
   let mgrOn = once(mgr, "on");
   mgr.toggle(window, gBrowser.selectedTab);
   yield mgrOn;
--- a/devtools/client/scratchpad/test/browser_scratchpad_open.js
+++ b/devtools/client/scratchpad/test/browser_scratchpad_open.js
@@ -77,17 +77,17 @@ function testOpenInvalidState()
 }
 
 function testOpenTestFile()
 {
   let win = openScratchpad(function(win) {
     ok(win, "scratchpad opened for file open");
     try {
       win.Scratchpad.importFromFile(
-        "http://example.com/browser/browser/devtools/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt",
+        "http://example.com/browser/devtools/client/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt",
         "silent",
         function (aStatus, content) {
           let nb = win.document.querySelector('#scratchpad-notificationbox');
           is(nb.querySelectorAll('notification').length, 1, "There is just one notification");
           let cn = nb.currentNotification;
           is(cn.priority, nb.PRIORITY_WARNING_HIGH, "notification priority is correct");
           is(cn.value, "file-import-convert-failed", "notification value is corrent");
           is(cn.type, "warning", "notification type is correct");
--- a/devtools/client/shadereditor/test/head.js
+++ b/devtools/client/shadereditor/test/head.js
@@ -20,17 +20,17 @@ var { DebuggerServer } = require("devtoo
 var { WebGLFront } = require("devtools/server/actors/webgl");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var TiltGL = require("devtools/client/tilt/tilt-gl");
 var {TargetFactory} = require("devtools/client/framework/target");
 var {Toolbox} = require("devtools/client/framework/toolbox");
 var mm = null;
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js"
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/shadereditor/test/";
+const EXAMPLE_URL = "http://example.com/browser/devtools/client/shadereditor/test/";
 const SIMPLE_CANVAS_URL = EXAMPLE_URL + "doc_simple-canvas.html";
 const SHADER_ORDER_URL = EXAMPLE_URL + "doc_shader-order.html";
 const MULTIPLE_CONTEXTS_URL = EXAMPLE_URL + "doc_multiple-contexts.html";
 const OVERLAPPING_GEOMETRY_CANVAS_URL = EXAMPLE_URL + "doc_overlapping-geometry.html";
 const BLENDED_GEOMETRY_CANVAS_URL = EXAMPLE_URL + "doc_blended-geometry.html";
 
 // All tests are asynchronous.
 waitForExplicitFinish();
--- a/devtools/client/shared/browser-loader.js
+++ b/devtools/client/shared/browser-loader.js
@@ -33,17 +33,17 @@ const VENDOR_CONTENT_URL = "resource:///
  * browser APIs available to modules by default, like a normal browser
  * environment, but modules are still evaluated in their own scope.
  *
  * Another very important feature of this loader is that it *only*
  * deals with modules loaded from under `baseURI`. Anything loaded
  * outside of that path will still be loaded from the devtools loader,
  * so all system modules are still shared and cached across instances.
  * An exception to this is anything under
- * `browser/devtools/shared/content`, which is where shared libraries
+ * `devtools/client/shared/content`, which is where shared libraries
  * live that should be evaluated in a browser environment.
  *
  * @param string baseURI
  *        Base path to load modules from.
  * @param Object window
  *        The window instance to evaluate modules within
  * @return Object
  *         An object with two properties:
--- a/devtools/client/shared/telemetry.js
+++ b/devtools/client/shared/telemetry.js
@@ -6,17 +6,17 @@
  * Telemetry.
  *
  * To add metrics for a tool:
  *
  * 1. Create boolean, flag and exponential entries in
  *    toolkit/components/telemetry/Histograms.json. Each type is optional but it
  *    is best if all three can be included.
  *
- * 2. Add your chart entries to browser/devtools/shared/telemetry.js
+ * 2. Add your chart entries to devtools/client/shared/telemetry.js
  *    (Telemetry.prototype._histograms):
  *    mytoolname: {
  *      histogram: "DEVTOOLS_MYTOOLNAME_OPENED_BOOLEAN",
  *      userHistogram: "DEVTOOLS_MYTOOLNAME_OPENED_PER_USER_FLAG",
  *      timerHistogram: "DEVTOOLS_MYTOOLNAME_TIME_ACTIVE_SECONDS"
  *    },
  *
  * 3. Include this module at the top of your tool. Use:
--- a/devtools/client/shared/test/head.js
+++ b/devtools/client/shared/test/head.js
@@ -11,17 +11,17 @@ const {Hosts} = require("devtools/client
 const {defer} = require("promise");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 DevToolsUtils.testing = true;
 SimpleTest.registerCleanupFunction(() => {
   DevToolsUtils.testing = false;
 });
 
-const TEST_URI_ROOT = "http://example.com/browser/browser/devtools/shared/test/";
+const TEST_URI_ROOT = "http://example.com/browser/devtools/client/shared/test/";
 const OPTIONS_VIEW_URL = TEST_URI_ROOT + "doc_options-view.xul";
 
 /**
  * Open a new tab at a URL and call a callback on load
  */
 function addTab(aURL, aCallback)
 {
   waitForExplicitFinish();
--- a/devtools/client/shared/test/test-actor-registry.js
+++ b/devtools/client/shared/test/test-actor-registry.js
@@ -9,17 +9,17 @@ var Cu = Components.utils;
 var Ci = Components.interfaces;
 var Cc = Components.classes;
 var CC = Components.Constructor;
 
 var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 var { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 var promise = require("promise");
 
-var TEST_URL_ROOT = "http://example.com/browser/browser/devtools/shared/test/";
+var TEST_URL_ROOT = "http://example.com/browser/devtools/client/shared/test/";
 var ACTOR_URL = TEST_URL_ROOT + "test-actor.js";
 
 // Register a test actor that can operate on the remote document
 exports.registerTestActor = Task.async(function* (client) {
   // First, instanciate ActorRegistryFront to be able to dynamically
   // register an actor
   let deferred = promise.defer();
   client.listTabs(deferred.resolve);
--- a/devtools/client/shared/test/test-actor.js
+++ b/devtools/client/shared/test/test-actor.js
@@ -23,17 +23,17 @@ var dumpn = msg => {
   dump(msg + "\n");
 }
 
 /**
  * Get the instance of CanvasFrameAnonymousContentHelper used by a given
  * highlighter actor.
  * The instance provides methods to get/set attributes/text/style on nodes of
  * the highlighter, inserted into the nsCanvasFrame.
- * @see /toolkit/devtools/server/actors/highlighters.js
+ * @see /devtools/server/actors/highlighters.js
  * @param {String} actorID
  */
 function getHighlighterCanvasFrameHelper(conn, actorID) {
   let actor = conn.getActor(actorID);
   if (actor && actor._highlighter) {
     return actor._highlighter.markup;
   }
 }
--- a/devtools/client/sourceeditor/codemirror/README
+++ b/devtools/client/sourceeditor/codemirror/README
@@ -87,19 +87,19 @@ in the LICENSE file:
  * test/cm_search_test.js
  * test/cm_test.js
  * test/cm_sublime_test.js
  * test/cm_vim_test.js
  * test/cm_emacs_test.js
 
 # Localization patches
 
-diff --git a/browser/devtools/sourceeditor/codemirror/search/search.js b/browser/devtools/sourceeditor/codemirror/search/search.js
---- a/browser/devtools/sourceeditor/codemirror/search/search.js
-+++ b/browser/devtools/sourceeditor/codemirror/search/search.js
+diff --git a/devtools/client/sourceeditor/codemirror/search/search.js b/devtools/client/sourceeditor/codemirror/search/search.js
+--- a/devtools/client/sourceeditor/codemirror/search/search.js
++++ b/devtools/client/sourceeditor/codemirror/search/search.js
 @@ -62,19 +62,31 @@
      if (isRE) {
        query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
        if (query.test("")) query = /x^/;
      } else if (query == "") {
        query = /x^/;
      }
      return query;
@@ -130,12 +130,12 @@ diff --git a/browser/devtools/sourceedit
          if (!query || state.query) return;
          state.query = parseQuery(query);
          cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
          state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
 
 # Footnotes
 
 [1] http://codemirror.net
-[2] browser/devtools/sourceeditor/codemirror
-[3] browser/devtools/sourceeditor/test/browser_codemirror.js
-[4] browser/devtools/jar.mn
-[5] browser/devtools/sourceeditor/editor.js
+[2] devtools/client/sourceeditor/codemirror
+[3] devtools/client/sourceeditor/test/browser_codemirror.js
+[4] devtools/client/jar.mn
+[5] devtools/client/sourceeditor/editor.js
--- a/devtools/client/sourceeditor/test/browser_codemirror.js
+++ b/devtools/client/sourceeditor/test/browser_codemirror.js
@@ -1,16 +1,16 @@
 /* vim: set ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const HOST = 'mochi.test:8888';
-const URI  = "http://" + HOST + "/browser/browser/devtools/sourceeditor/test/codemirror.html";
+const URI  = "http://" + HOST + "/browser/devtools/client/sourceeditor/test/codemirror.html";
 loadHelperScript("helper_codemirror_runner.js");
 
 function test() {
   requestLongerTimeout(3);
   waitForExplicitFinish();
 
   let tab = gBrowser.addTab();
   gBrowser.selectedTab = tab;
--- a/devtools/client/sourceeditor/test/browser_css_autocompletion.js
+++ b/devtools/client/sourceeditor/test/browser_css_autocompletion.js
@@ -4,19 +4,19 @@
 
 "use strict";
 
 const cssAutoCompleter  = require("devtools/client/sourceeditor/css-autocompleter");
 const {InspectorFront} = require("devtools/server/actors/inspector");
 const {TargetFactory} = require("devtools/client/framework/target");
 const { Cc, Ci } = require("chrome");
 
-const CSS_URI = "http://mochi.test:8888/browser/browser/devtools/sourceeditor" +
+const CSS_URI = "http://mochi.test:8888/browser/devtools/client/sourceeditor" +
                 "/test/css_statemachine_testcases.css";
-const TESTS_URI = "http://mochi.test:8888/browser/browser/devtools/sourceeditor" +
+const TESTS_URI = "http://mochi.test:8888/browser/devtools/client/sourceeditor" +
                   "/test/css_autocompletion_tests.json";
 
 const source = read(CSS_URI);
 const tests = eval(read(TESTS_URI));
 
 const TEST_URI = "data:text/html;charset=UTF-8," + encodeURIComponent(
   ["<!DOCTYPE html>",
    "<html>",
--- a/devtools/client/sourceeditor/test/browser_css_statemachine.js
+++ b/devtools/client/sourceeditor/test/browser_css_statemachine.js
@@ -2,19 +2,19 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const cssAutoCompleter  = require("devtools/client/sourceeditor/css-autocompleter");
 const { Cc, Ci } = require("chrome");
 
-const CSS_URI = "http://mochi.test:8888/browser/browser/devtools/sourceeditor" +
+const CSS_URI = "http://mochi.test:8888/browser/devtools/client/sourceeditor" +
                 "/test/css_statemachine_testcases.css";
-const TESTS_URI = "http://mochi.test:8888/browser/browser/devtools/sourceeditor" +
+const TESTS_URI = "http://mochi.test:8888/browser/devtools/client/sourceeditor" +
                   "/test/css_statemachine_tests.json";
 
 const source = read(CSS_URI);
 const tests = eval(read(TESTS_URI));
 
 const TEST_URI = "data:text/html;charset=UTF-8," + encodeURIComponent(
   ["<!DOCTYPE html>",
    "<html>",
--- a/devtools/client/sourceeditor/test/browser_editor_script_injection.js
+++ b/devtools/client/sourceeditor/test/browser_editor_script_injection.js
@@ -6,17 +6,17 @@
 
 "use strict";
 
 add_task(function*() {
   yield runTest();
 });
 
 function* runTest() {
-  const baseURL = "chrome://mochitests/content/browser/browser/devtools/sourceeditor/test"
+  const baseURL = "chrome://mochitests/content/browser/devtools/client/sourceeditor/test"
   const injectedText = "Script successfully injected !";
 
   let {ed, win} = yield setup(null, {
     mode: "ruby",
     externalScripts: [`${baseURL}/cm_script_injection_test.js`,
                       `${baseURL}/cm_mode_ruby.js`]
   });
 
--- a/devtools/client/sourceeditor/test/browser_vimemacs.js
+++ b/devtools/client/sourceeditor/test/browser_vimemacs.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const HOST = 'mochi.test:8888';
-const URI  = "http://" + HOST + "/browser/browser/devtools/sourceeditor/test/vimemacs.html";
+const URI  = "http://" + HOST + "/browser/devtools/client/sourceeditor/test/vimemacs.html";
 loadHelperScript("helper_codemirror_runner.js");
 
 function test() {
   requestLongerTimeout(3);
   waitForExplicitFinish();
 
   let tab = gBrowser.addTab();
   gBrowser.selectedTab = tab;
--- a/devtools/client/storage/test/head.js
+++ b/devtools/client/storage/test/head.js
@@ -9,17 +9,17 @@ var { require } = Cu.import("resource://
 var { TargetFactory } = require("devtools/client/framework/target");
 var promise = require("promise");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 const SPLIT_CONSOLE_PREF = "devtools.toolbox.splitconsoleEnabled";
 const STORAGE_PREF = "devtools.storage.enabled";
 const DUMPEMIT_PREF = "devtools.dump.emit";
 const DEBUGGERLOG_PREF = "devtools.debugger.log";
-const PATH = "browser/browser/devtools/storage/test/";
+const PATH = "browser/devtools/client/storage/test/";
 const MAIN_DOMAIN = "http://test1.example.org/" + PATH;
 const ALT_DOMAIN = "http://sectest1.example.org/" + PATH;
 const ALT_DOMAIN_SECURED = "https://sectest1.example.org:443/" + PATH;
 
 waitForExplicitFinish();
 
 var gToolbox, gPanelWindow, gWindow, gUI;
 
--- a/devtools/client/storage/test/storage-listings.html
+++ b/devtools/client/storage/test/storage-listings.html
@@ -3,18 +3,18 @@
 <!--
 Bug 970517 - Storage inspector front end - tests
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
-<iframe src="http://sectest1.example.org/browser/browser/devtools/storage/test/storage-unsecured-iframe.html"></iframe>
-<iframe src="https://sectest1.example.org:443/browser/browser/devtools/storage/test/storage-secured-iframe.html"></iframe>
+<iframe src="http://sectest1.example.org/browser/devtools/client/storage/test/storage-unsecured-iframe.html"></iframe>
+<iframe src="https://sectest1.example.org:443/browser/devtools/client/storage/test/storage-secured-iframe.html"></iframe>
 <script type="application/javascript;version=1.7">
 "use strict";
 let partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 let cookieExpiresTime1 = 2000000000000;
 let cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
--- a/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Tests that the edit command works
 
-const TEST_URI = "http://example.com/browser/browser/devtools/styleeditor/" +
+const TEST_URI = "http://example.com/browser/devtools/client/styleeditor/" +
                  "test/browser_styleeditor_cmd_edit.html";
 
 add_task(function* () {
   let options = yield helpers.openTab(TEST_URI);
   yield helpers.openToolbar(options);
 
   yield helpers.audit(options, [
     {
@@ -51,17 +51,17 @@ add_task(function* () {
           line: { status: "VALID" },
         }
       },
     },
     {
       setup: "edit http",
       check: {
         input: "edit http",
-        hints: "://example.com/browser/browser/devtools/styleeditor/test/" +
+        hints: "://example.com/browser/devtools/client/styleeditor/test/" +
                "resources_inpage1.css [line]",
         markup: "VVVVVIIII",
         status: "ERROR",
         args: {
           resource: {
             arg: " http",
             status: "INCOMPLETE",
             message: "Value required for \'resource\'."
@@ -69,17 +69,17 @@ add_task(function* () {
           line: { status: "VALID" },
         }
       },
     },
     {
       setup: "edit page1",
       check: {
         input: "edit page1",
-        hints: " [line] -> http://example.com/browser/browser/devtools/" +
+        hints: " [line] -> http://example.com/browser/devtools/client/" +
                "styleeditor/test/resources_inpage1.css",
         markup: "VVVVVIIIII",
         status: "ERROR",
         args: {
           resource: {
             arg: " page1",
             status: "INCOMPLETE",
             message: 'Value required for \'resource\'.'
@@ -87,17 +87,17 @@ add_task(function* () {
           line: { status: 'VALID' },
         }
       },
     },
     {
       setup: "edit page2",
       check: {
         input: "edit page2",
-        hints: " [line] -> http://example.com/browser/browser/devtools/" +
+        hints: " [line] -> http://example.com/browser/devtools/client/" +
                "styleeditor/test/resources_inpage2.css",
         markup: "VVVVVIIIII",
         status: "ERROR",
         args: {
           resource: {
             arg: " page2",
             status: "INCOMPLETE",
             message: "Value required for \'resource\'."
--- a/devtools/client/styleeditor/test/browser_styleeditor_opentab.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_opentab.js
@@ -12,17 +12,17 @@ add_task(function*() {
   let { ui } = yield openStyleEditorForURL(TESTCASE_URI);
 
   yield rightClickStyleSheet(ui, ui.editors[0]);
   is(ui._openLinkNewTabItem.getAttribute("disabled"), "false",
     "The menu item is not disabled");
   is(ui._openLinkNewTabItem.getAttribute("hidden"), "false",
     "The menu item is not hidden");
 
-  let url = "https://example.com/browser/browser/devtools/styleeditor/test/" +
+  let url = "https://example.com/browser/devtools/client/styleeditor/test/" +
     "simple.css";
   is(ui._contextMenuStyleSheet.href, url, "Correct URL for sheet");
 
   let originalOpenUILinkIn = ui._window.openUILinkIn;
   let tabOpenedDefer = promise.defer();
 
   ui._window.openUILinkIn = newUrl => {
     // Reset the actual openUILinkIn function before proceeding.
--- a/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // This test makes sure that the style editor does not store any
 // content CSS files in the permanent cache when opened from PB mode.
 
-const TEST_URL = "http://" + TEST_HOST + "/browser/browser/devtools/" +
+const TEST_URL = "http://" + TEST_HOST + "/browser/devtools/client/" +
   "styleeditor/test/test_private.html";
 const {LoadContextInfo} =
   Cu.import("resource://gre/modules/LoadContextInfo.jsm", {});
 const cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"]
   .getService(Ci.nsICacheStorageService);
 
 add_task(function* () {
   info("Opening a new private window");
--- a/devtools/client/styleeditor/test/head.js
+++ b/devtools/client/styleeditor/test/head.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js"
-const TEST_BASE = "chrome://mochitests/content/browser/browser/devtools/styleeditor/test/";
-const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/styleeditor/test/";
-const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/styleeditor/test/";
+const TEST_BASE = "chrome://mochitests/content/browser/devtools/client/styleeditor/test/";
+const TEST_BASE_HTTP = "http://example.com/browser/devtools/client/styleeditor/test/";
+const TEST_BASE_HTTPS = "https://example.com/browser/devtools/client/styleeditor/test/";
 const TEST_HOST = 'mochi.test:8888';
 
 var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 var {TargetFactory} = require("devtools/client/framework/target");
 var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
 var promise = require("promise");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
--- a/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
+++ b/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
@@ -126,17 +126,17 @@ add_task(function*() {
         copySelector: false,
         copyRule: false
       }
     },
     {
       desc: "Test Copy Location",
       node: ruleEditor.source,
       menuItem: contextmenu.menuitemCopyLocation,
-      expectedPattern: "http://example.com/browser/browser/devtools/" +
+      expectedPattern: "http://example.com/browser/devtools/client/" +
                        "styleinspector/test/doc_copystyles.css",
       hidden: {
         copyLocation: false,
         copyPropertyDeclaration: true,
         copyPropertyName: true,
         copyPropertyValue: true,
         copySelector: true,
         copyRule: false
--- a/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
+++ b/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
@@ -2,17 +2,17 @@
 /* Any copyright is dedicated to the Public Domain.
  http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Check stylesheets on HMTL and XUL document
 
 // FIXME: this test opens the devtools for nothing, it should be changed into a
-// toolkit/devtools/server/tests/mochitest/test_css-logic-...something...html
+// devtools/server/tests/mochitest/test_css-logic-...something...html
 // test
 
 const TEST_URI_HTML = TEST_URL_ROOT + "doc_content_stylesheet.html";
 const TEST_URI_XUL = TEST_URL_ROOT + "doc_content_stylesheet.xul";
 const XUL_URI = Cc["@mozilla.org/network/io-service;1"]
                 .getService(Ci.nsIIOService)
                 .newURI(TEST_URI_XUL, null, null);
 var ssm = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
--- a/devtools/client/styleinspector/test/doc_urls_clickable.css
+++ b/devtools/client/styleinspector/test/doc_urls_clickable.css
@@ -1,9 +1,9 @@
 .relative1 {
     background-image: url(./doc_test_image.png);
 }
 .absolute {
-    background: url("http://example.com/browser/browser/devtools/styleinspector/test/doc_test_image.png");
+    background: url("http://example.com/browser/devtools/client/styleinspector/test/doc_test_image.png");
 }
 .base64 {
     background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==');
 }
\ No newline at end of file
--- a/devtools/client/styleinspector/test/head.js
+++ b/devtools/client/styleinspector/test/head.js
@@ -17,19 +17,19 @@ var {editableField, getInplaceEditorForS
   require("devtools/client/shared/inplace-editor");
 var {console} =
   Components.utils.import("resource://gre/modules/devtools/shared/Console.jsm", {});
 
 // All tests are asynchronous
 waitForExplicitFinish();
 
 const TEST_URL_ROOT =
-  "http://example.com/browser/browser/devtools/styleinspector/test/";
+  "http://example.com/browser/devtools/client/styleinspector/test/";
 const TEST_URL_ROOT_SSL =
-  "https://example.com/browser/browser/devtools/styleinspector/test/";
+  "https://example.com/browser/devtools/client/styleinspector/test/";
 const ROOT_TEST_DIR = getRootDirectory(gTestPath);
 const FRAME_SCRIPT_URL = ROOT_TEST_DIR + "doc_frame_script.js";
 
 // Auto clean-up when a test ends
 registerCleanupFunction(function*() {
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   yield gDevTools.closeToolbox(target);
 
--- a/devtools/client/themes/animationinspector.css
+++ b/devtools/client/themes/animationinspector.css
@@ -149,17 +149,17 @@ body {
 
 /* Animation timeline component */
 
 .animation-timeline {
   height: 100%;
   overflow: hidden;
   position: relative;
   /* The timeline gets its background-image from a canvas element created in
-     /browser/devtools/animationinspector/utils.js drawGraphElementBackground
+     /devtools/client/animationinspector/utils.js drawGraphElementBackground
      thanks to document.mozSetImageElement("time-graduations", canvas)
      This is done so that the background can be built dynamically from script */
   background-image: -moz-element(#time-graduations);
   background-repeat: repeat-y;
   /* The animations are drawn 150px from the left edge so that animated nodes
      can be displayed in a sidebar */
   background-position: var(--timeline-sidebar-width) 0;
   display: flex;
@@ -188,17 +188,17 @@ body {
 }
 
 .animation-timeline .time-header {
   margin-left: var(--timeline-sidebar-width);
   min-height: var(--toolbar-height);
   overflow: hidden;
   position: relative;
   /* This is the same color as the time graduations in
-     browser/devtools/animationinspector/utils.js */
+     devtools/client/animationinspector/utils.js */
   border-bottom: 1px solid rgba(128, 136, 144, .5);
   cursor: col-resize;
   -moz-user-select: none;
 }
 
 .animation-timeline .time-header .time-tick {
   position: absolute;
   top: 3px;
--- a/devtools/client/themes/common.css
+++ b/devtools/client/themes/common.css
@@ -148,17 +148,17 @@
 .devtools-autocomplete-listbox:focus.light-theme > richlistitem[selected] > .initial-value {
   color: #222;
 }
 
 .devtools-autocomplete-listbox.light-theme > richlistitem > label {
   color: #666;
 }
 
-/* Tooltip widget (see browser/devtools/shared/widgets/Tooltip.js) */
+/* Tooltip widget (see devtools/client/shared/widgets/Tooltip.js) */
 
 .devtools-tooltip .panel-arrowcontent {
   padding: 4px;
 }
 
 .devtools-tooltip .panel-arrowcontainer {
   /* Reseting the transition used when panels are shown */
   transition: none;
--- a/devtools/client/themes/dark-theme.css
+++ b/devtools/client/themes/dark-theme.css
@@ -336,17 +336,17 @@ div.CodeMirror span.eval-text {
 }
 
 @media (min-resolution: 1.1dppx) {
   .theme-twisty, .theme-checkbox {
     background-image: url("chrome://devtools/skin/themes/images/controls@2x.png");
   }
 }
 
-/* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */
+/* XUL panel styling (see devtools/client/shared/widgets/Tooltip.js) */
 
 .theme-tooltip-panel .panel-arrowcontent {
   padding: 5px;
   background: rgba(19, 28, 38, .9);
   border-radius: 5px;
   box-shadow: none;
   border: 3px solid #434850;
 }
--- a/devtools/client/themes/light-theme.css
+++ b/devtools/client/themes/light-theme.css
@@ -345,17 +345,17 @@ div.CodeMirror span.eval-text {
 }
 
 @media (min-resolution: 1.1dppx) {
   .theme-twisty, .theme-checkbox {
     background-image: url("chrome://devtools/skin/themes/images/controls@2x.png");
   }
 }
 
-/* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */
+/* XUL panel styling (see devtools/client/shared/widgets/Tooltip.js) */
 
 .theme-tooltip-panel .panel-arrowcontent {
   padding: 4px;
   background: rgba(255, 255, 255, .9);
   border-radius: 5px;
   box-shadow: none;
   border: 3px solid #d9e1e8;
 }
--- a/devtools/client/themes/netmonitor.css
+++ b/devtools/client/themes/netmonitor.css
@@ -295,17 +295,17 @@ box.requests-menu-status[code^="5"] {
 }
 
 /* Network requests table: waterfall items */
 
 .requests-menu-subitem.requests-menu-waterfall {
   -moz-padding-start: 0px;
   -moz-padding-end: 4px;
   /* Background created on a <canvas> in js. */
-  /* @see browser/devtools/netmonitor/netmonitor-view.js */
+  /* @see devtools/client/netmonitor/netmonitor-view.js */
   background-image: -moz-element(#waterfall-background);
   background-repeat: repeat-y;
   background-position: -1px center;
 }
 
 .requests-menu-subitem.requests-menu-waterfall:-moz-locale-dir(rtl) {
   background-position: right center;
 }
--- a/devtools/client/themes/performance.css
+++ b/devtools/client/themes/performance.css
@@ -371,17 +371,17 @@
 }
 
 .waterfall-header-tick:not(:first-child) {
   -moz-margin-start: -100px !important; /* Don't affect layout. */
 }
 
 .waterfall-background-ticks {
   /* Background created on a <canvas> in js. */
-  /* @see browser/devtools/timeline/widgets/waterfall.js */
+  /* @see devtools/client/timeline/widgets/waterfall.js */
   background-image: -moz-element(#waterfall-background);
   background-repeat: repeat-y;
   background-position: -1px center;
 }
 
 /**
  * Markers waterfall breakdown
  */
--- a/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
+++ b/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
@@ -22,23 +22,23 @@ add_task(function*() {
 
   let error = yield evalInDebuggee("throwError()");
   is(error.lineNumber, 21, "error has correct lineNumber");
   is(error.columnNumber, 11, "error has correct columnNumber");
   is(error.name, "TypeError", "error has correct name");
   is(error.message, "Argument 1 is not valid for any of the 2-argument overloads of AudioNode.connect.", "error has correct message");
   is(error.stringified, "TypeError: Argument 1 is not valid for any of the 2-argument overloads of AudioNode.connect.", "error is stringified correctly");
   is(error.instanceof, true, "error is correctly an instanceof TypeError");
-  is(error.fileName, "http://example.com/browser/browser/devtools/webaudioeditor/test/doc_bug_1112378.html", "error has correct fileName");
+  is(error.fileName, "http://example.com/browser/devtools/client/webaudioeditor/test/doc_bug_1112378.html", "error has correct fileName");
 
   error = yield evalInDebuggee("throwDOMException()");
   is(error.lineNumber, 37, "exception has correct lineNumber");
   is(error.columnNumber, 0, "exception has correct columnNumber");
   is(error.code, 9, "exception has correct code");
   is(error.result, 2152923145, "exception has correct result");
   is(error.name, "NotSupportedError", "exception has correct name");
   is(error.message, "Operation is not supported", "exception has correct message");
   is(error.stringified, "NotSupportedError: Operation is not supported", "exception is stringified correctly");
   is(error.instanceof, true, "exception is correctly an instance of DOMException");
-  is(error.filename, "http://example.com/browser/browser/devtools/webaudioeditor/test/doc_bug_1112378.html", "exception has correct filename");
+  is(error.filename, "http://example.com/browser/devtools/client/webaudioeditor/test/doc_bug_1112378.html", "exception has correct filename");
 
   yield teardown(target);
 });
--- a/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
+++ b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
@@ -8,17 +8,17 @@
     <title>Web Audio Editor test page</title>
   </head>
 
   <body>
 
     <script type="text/javascript;version=1.8">
       "use strict";
 
-      let audioURL = "http://example.com/browser/browser/devtools/webaudioeditor/test/440hz_sine.ogg";
+      let audioURL = "http://example.com/browser/devtools/client/webaudioeditor/test/440hz_sine.ogg";
 
       let ctx = new AudioContext();
       let bufferNode = ctx.createBufferSource();
       let shaperNode = ctx.createWaveShaper();
       shaperNode.curve = generateWaveShapingCurve();
 
       let xhr = getBuffer(audioURL, () => {
         ctx.decodeAudioData(xhr.response, (buffer) => {
--- a/devtools/client/webaudioeditor/test/head.js
+++ b/devtools/client/webaudioeditor/test/head.js
@@ -20,17 +20,17 @@ var { generateUUID } = Cc["@mozilla.org/
 
 var Promise = require("promise");
 var { WebAudioFront } = require("devtools/server/actors/webaudio");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var audioNodes = require("devtools/server/actors/utils/audionodes.json");
 var mm = null;
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js";
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/webaudioeditor/test/";
+const EXAMPLE_URL = "http://example.com/browser/devtools/client/webaudioeditor/test/";
 const SIMPLE_CONTEXT_URL = EXAMPLE_URL + "doc_simple-context.html";
 const COMPLEX_CONTEXT_URL = EXAMPLE_URL + "doc_complex-context.html";
 const SIMPLE_NODES_URL = EXAMPLE_URL + "doc_simple-node-creation.html";
 const MEDIA_NODES_URL = EXAMPLE_URL + "doc_media-node-creation.html";
 const BUFFER_AND_ARRAY_URL = EXAMPLE_URL + "doc_buffer-and-array.html";
 const DESTROY_NODES_URL = EXAMPLE_URL + "doc_destroy-nodes.html";
 const CONNECT_PARAM_URL = EXAMPLE_URL + "doc_connect-param.html";
 const CONNECT_MULTI_PARAM_URL = EXAMPLE_URL + "doc_connect-multi-param.html";
--- a/devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js
+++ b/devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js
@@ -9,17 +9,17 @@
  * This directive is not supported, hence we confirm that
  * the according message is displayed in the web console.
  */
 
 "use strict";
 
 const EXPECTED_RESULT = "Not supporting directive 'reflected-xss'. Directive " +
                         "and values will be ignored.";
-const TEST_FILE = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/" +
                   "test/test_bug1045902_console_csp_ignore_reflected_xss_" +
                   "message.html";
 
 var hud = undefined;
 
 var TEST_URI = "data:text/html;charset=utf8,Web Console CSP ignoring " +
                "reflected XSS (bug 1045902)";
 
--- a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
@@ -5,19 +5,19 @@
 
 // Tests if the JSTerm sandbox is updated when the user navigates from one
 // domain to another, in order to avoid permission denied errors with a sandbox
 // created for a different origin.
 
 "use strict";
 
 var test = asyncTest(function* () {
-  const TEST_URI1 = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI1 = "http://example.com/browser/devtools/client/webconsole/" +
                     "test/test-console.html";
-  const TEST_URI2 = "http://example.org/browser/browser/devtools/webconsole/" +
+  const TEST_URI2 = "http://example.org/browser/devtools/client/webconsole/" +
                     "test/test-console.html";
 
   yield loadTab(TEST_URI1);
   let hud = yield openConsole();
 
   hud.jsterm.clearOutput();
   hud.jsterm.execute("window.location.href");
 
--- a/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
+++ b/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Test for the "Copy link location" context menu item shown when you right
 // click network requests in the output.
 
 "use strict";
 
 var test = asyncTest(function* () {
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
     "test/test-console.html?_date=" + Date.now();
   const COMMAND_NAME = "consoleCmd_copyURL";
   const CONTEXT_MENU_ID = "#menu_copyURL";
 
   registerCleanupFunction(() => {
     Services.prefs.clearUserPref("devtools.webconsole.filter.networkinfo");
   });
 
--- a/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
+++ b/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that makes sure messages are not considered repeated when console.log()
 // is invoked with different objects, see bug 865288.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-repeated-messages.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
 
   info("waiting for 3 console.log objects");
 
--- a/devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js
+++ b/devtools/client/webconsole/test/browser_bug_865871_variables_view_close_on_esc_key.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that the variables view sidebar can be closed by pressing Escape in the
 // web console.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-eval-in-stackframe.html";
 
 function test() {
   let hud;
 
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
--- a/devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js
+++ b/devtools/client/webconsole/test/browser_bug_869003_inspect_cross_domain_object.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that users can inspect objects logged from cross-domain iframes -
 // bug 869003.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-869003-top-window.html";
 
 var test = asyncTest(function* () {
   // This test is slightly more involved: it opens the web console, then the
   // variables view for a given object, it updates a property in the view and
   // checks the result. We can get a timeout with debug builds on slower
   // machines.
   requestLongerTimeout(2);
--- a/devtools/client/webconsole/test/browser_cached_messages.js
+++ b/devtools/client/webconsole/test/browser_cached_messages.js
@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Test to see if the cached messages are displayed when the console UI is
 // opened.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-webconsole-error-observer.html";
 
 // On e10s, the exception is triggered in child process
 // and is ignored by test harness
 if (!Services.appinfo.browserTabsRemoteAutostart) {
   expectUncaughtException();
 }
 
--- a/devtools/client/webconsole/test/browser_console.js
+++ b/devtools/client/webconsole/test/browser_console.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test the basic features of the Browser Console, bug 587757.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html?" + Date.now();
 
 const TEST_XHR_ERROR_URI = `http://example.com/404.html?${Date.now()}`;
 
 "use strict";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_console_clear_on_reload.js
+++ b/devtools/client/webconsole/test/browser_console_clear_on_reload.js
@@ -5,17 +5,17 @@
 
 // Check that clear output on page reload works - bug 705921.
 // Check that clear output and page reload remove the sidebar - bug 971967.
 
 "use strict";
 
 var test = asyncTest(function*() {
   const PREF = "devtools.webconsole.persistlog";
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-console.html";
 
   Services.prefs.setBoolPref(PREF, false);
   registerCleanupFunction(() => Services.prefs.clearUserPref(PREF));
 
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_console_click_focus.js
+++ b/devtools/client/webconsole/test/browser_console_click_focus.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the input field is focused when the console is opened.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
 
   let [result] = yield waitForMessages({
     webconsole: hud,
--- a/devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js
+++ b/devtools/client/webconsole/test/browser_console_copy_entire_message_context_menu.js
@@ -6,17 +6,17 @@
 // Test copying of the entire console message when right-clicked
 // with no other text selected. See Bug 1100562.
 
 function test() {
   let hud;
   let outputNode;
   let contextMenu;
 
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-console.html";
 
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
     const {tab} = yield loadTab(TEST_URI);
     hud = yield openConsole(tab);
     outputNode = hud.outputNode;
--- a/devtools/client/webconsole/test/browser_console_iframe_messages.js
+++ b/devtools/client/webconsole/test/browser_console_iframe_messages.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that cached messages from nested iframes are displayed in the
 // Web/Browser Console.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-consoleiframes.html";
 
 const expectedMessages = [
   {
     text: "main file",
     category: CATEGORY_WEBDEV,
     severity: SEVERITY_LOG,
   },
--- a/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
+++ b/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that basic keyboard shortcuts work in the web console.
 
 "use strict";
 
 var test = asyncTest(function*() {
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-console.html";
 
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
   ok(hud, "Web Console opened");
 
   info("dump some spew into the console for scrolling");
--- a/devtools/client/webconsole/test/browser_console_navigation_marker.js
+++ b/devtools/client/webconsole/test/browser_console_navigation_marker.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that the navigation marker shows on page reload - bug 793996.
 
 "use strict";
 
 const PREF = "devtools.webconsole.persistlog";
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var hud;
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref(PREF, true);
 
   let { browser } = yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_console_optimized_out_vars.js
+++ b/devtools/client/webconsole/test/browser_console_optimized_out_vars.js
@@ -3,17 +3,17 @@
 
 // Check that inspecting an optimized out variable works when execution is
 // paused.
 
 "use strict";
 
 function test() {
   Task.spawn(function* () {
-    const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+    const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                      "test/test-closure-optimized-out.html";
     let {tab} = yield loadTab(TEST_URI);
     let hud = yield openConsole(tab);
     let { toolbox, panel, panelWin } = yield openDebugger();
 
     yield waitForThreadEvents(panel, "resumed");
     ok(true, "Debugger resumed");
 
@@ -44,17 +44,17 @@ function test() {
           });
 
     finishTest();
   }).then(null, aError => {
     ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
   });
 }
 
-// Debugger helper functions stolen from browser/devtools/debugger/test/head.js.
+// Debugger helper functions stolen from devtools/client/debugger/test/head.js.
 
 function ensureThreadClientState(aPanel, aState) {
   let thread = aPanel.panelWin.gThreadClient;
   let state = thread.state;
 
   info("Thread is: '" + state + "'.");
 
   if (state == aState) {
--- a/devtools/client/webconsole/test/browser_console_server_logging.js
+++ b/devtools/client/webconsole/test/browser_console_server_logging.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // Check that server log appears in the console panel - bug 1168872
 var test = asyncTest(function* () {
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console-server-logging.sjs";
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/test-console-server-logging.sjs";
 
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   // Set logging filter and wait till it's set on the backend
   hud.setFilterState("serverlog", true);
   yield updateServerLoggingListener(hud);
--- a/devtools/client/webconsole/test/browser_console_variables_view.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that variables view works as expected in the web console.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-eval-in-stackframe.html";
 
 var gWebConsole, gJSTerm, gVariablesView;
 
 var hud;
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that variables view is linked to the inspector for highlighting and
 // selecting DOM nodes
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-952277-highlight-nodes-in-vview.html";
 
 var gWebConsole, gJSTerm, gVariablesView, gToolbox;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(hud => {
       consoleOpened(hud);
--- a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
@@ -4,17 +4,17 @@
  */
 
 // Test that makes sure web console eval happens in the user-selected stackframe
 // from the js debugger, when changing the value of a property in the variables
 // view.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-eval-in-stackframe.html";
 
 var gWebConsole, gJSTerm, gDebuggerWin, gThread, gDebuggerController,
     gStackframes, gVariablesView;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
--- a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that makes sure web console eval works while the js debugger paused the
 // page, and while the inspector is active. See bug 886137.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-eval-in-stackframe.html";
 
 var gWebConsole, gJSTerm, gDebuggerWin, gThread, gDebuggerController,
     gStackframes, gVariablesView;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
--- a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that makes sure web console eval happens in the user-selected stackframe
 // from the js debugger.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-eval-in-stackframe.html";
 
 var gWebConsole, gJSTerm, gDebuggerWin, gThread, gDebuggerController;
 var gStackframes;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
--- a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
+++ b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
@@ -4,17 +4,17 @@
  */
 
 // Test to make sure that web console commands can fire while paused at a
 // breakpoint that was triggered from a JS call.  Relies on asynchronous js
 // evaluation over the protocol - see Bug 1088861.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-eval-in-stackframe.html";
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
 
   info("open the web console");
   let hud = yield openConsole();
   let {jsterm} = hud;
 
--- a/devtools/client/webconsole/test/browser_longstring_hang.js
+++ b/devtools/client/webconsole/test/browser_longstring_hang.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/ */
 
 // Test that very long strings do not hang the browser.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-859170-longstring-hang.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   info("wait for the initial long string");
--- a/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
+++ b/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
@@ -5,17 +5,17 @@
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Test that the netmonitor " +
                  "displays requests that have been recorded in the " +
                  "web console, even if the netmonitor hadn't opened yet.";
 
 const TEST_FILE = "test-network-request.html";
-const TEST_PATH = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
                   "test/" + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.networkinfo";
 Services.prefs.setBoolPref(NET_PREF, true);
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref(NET_PREF);
 });
 
--- a/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
+++ b/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
@@ -5,17 +5,17 @@
  */
 
 // Test that makes sure messages are not considered repeated when coming from
 // different lines of code, or from different severities, etc.
 // See bugs 720180 and 800510.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-repeated-messages.html";
 const PREF = "devtools.webconsole.persistlog";
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref(PREF, true);
 
   let { browser } = yield loadTab(TEST_URI);
 
--- a/devtools/client/webconsole/test/browser_result_format_as_string.js
+++ b/devtools/client/webconsole/test/browser_result_format_as_string.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/ */
 
 // Make sure that JS eval result are properly formatted as strings.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-result-format-as-string.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   hud.jsterm.clearOutput(true);
--- a/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
+++ b/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
@@ -1,18 +1,18 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_REPLACED_API_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_REPLACED_API_URI = "http://example.com/browser/devtools/client/" +
                               "webconsole/test/test-console-replaced-api.html";
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/testscript.js";
 const PREF = "devtools.webconsole.persistlog";
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref(PREF, true);
 
   let { browser } = yield loadTab(TEST_URI);
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
@@ -6,17 +6,17 @@
 // It then checks that the loading mixed content warning messages
 // are logged to the console and have the correct "Learn More"
 // url appended to them.
 // Bug 875456 - Log mixed content messages from the Mixed Content
 // Blocker to the Security Pane in the Web Console
 
 "use strict";
 
-const TEST_URI = "https://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
                  "test/test-mixedcontent-securityerrors.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Security/" +
                        "MixedContent";
 
 var test = asyncTest(function* () {
   yield pushPrefEnv();
 
   yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_webconsole_assert.js
+++ b/devtools/client/webconsole/test/browser_webconsole_assert.js
@@ -2,17 +2,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test that console.assert() works as expected (i.e. outputs only on falsy
 // asserts). See bug 760193.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-assert.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
   yield consoleOpened(hud);
 });
--- a/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
@@ -4,17 +4,17 @@
 // Test that autocomplete doesn't break when trying to reach into objects from
 // a different domain, bug 989025.
 
 "use strict";
 
 function test() {
   let hud;
 
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-bug-989025-iframe-parent.html";
 
   Task.spawn(function*() {
     const {tab} = yield loadTab(TEST_URI);
     hud = yield openConsole(tab);
 
     hud.jsterm.execute("document.title");
 
--- a/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that makes sure web console autocomplete happens in the user-selected
 // stackframe from the js debugger.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-autocomplete-in-stackframe.html";
 
 var testDriver, gStackframes;
 
 function test() {
   requestLongerTimeout(2);
   loadTab(TEST_URI).then(() => {
     openConsole().then((hud) => {
--- a/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
+++ b/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the page's resources are displayed in the console as they're
 // loaded
 
 "use strict";
 
-const TEST_NETWORK_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_NETWORK_URI = "http://example.com/browser/devtools/client/" +
                          "webconsole/test/test-network.html" + "?_date=" +
                          Date.now();
 
 var test = asyncTest(function* () {
   yield loadTab("data:text/html;charset=utf-8,Web Console basic network " +
                 "logging test");
   let hud = yield openConsole();
 
--- a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
@@ -9,17 +9,17 @@
 // a second test that overrides the mixed content blocker settings
 // by clicking on the doorhanger shield and validates that the
 // appropriate messages are logged to console.
 // Bug 875456 - Log mixed content messages from the Mixed Content
 // Blocker to the Security Pane in the Web Console
 
 "use strict";
 
-const TEST_URI = "https://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
                  "test/test-mixedcontent-securityerrors.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Security/" +
                        "MixedContent";
 
 var test = asyncTest(function* () {
   yield pushPrefEnv();
 
   let { browser } = yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
@@ -14,17 +14,17 @@ So we expect a warning (image has been b
 The expected console messages in the constants CSP_VIOLATION_MSG and
 CSP_REPORT_MSG are confirmed to be found in the console messages.
 */
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console CSP report only " +
                  "test (bug 1010953)";
-const TEST_VIOLATION = "http://example.com/browser/browser/devtools/" +
+const TEST_VIOLATION = "http://example.com/browser/devtools/client/" +
                        "webconsole/test/test_bug_1010953_cspro.html";
 const CSP_VIOLATION_MSG = "Content Security Policy: The page's settings " +
                           "blocked the loading of a resource at " +
                           "http://some.example.com/test.png " +
                           "(\"img-src http://example.com\").";
 const CSP_REPORT_MSG = "Content Security Policy: The page\'s settings " +
                        "observed the loading of a resource at " +
                        "http://some.example.com/test_bug_1010953_cspro.js " +
--- a/devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that clicking on a function displays its source in the debugger.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug_1050691_click_function_to_source.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
 
   yield testWithoutDebuggerOpen(hud);
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the console object still exists after a page reload.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var browser;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then((tab) => {
       browser = tab.browser;
--- a/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the input field is focused when the console is opened.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
 
   let inputNode = hud.jsterm.inputNode;
--- a/devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests to ensure that errors don't appear when the console is closed while a
 // completion is being performed.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function* () {
   let { browser } = yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
   yield testClosingAfterCompletion(hud, browser);
 });
--- a/devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_580030_errors_after_page_reload.js
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that errors still show up in the Web Console after a page reload.
 // See bug 580030: the error handler fails silently after page reload.
 // https://bugzilla.mozilla.org/show_bug.cgi?id=580030
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-error.html";
 
 function test() {
   Task.spawn(function*() {
     const {tab} = yield loadTab(TEST_URI);
     const hud = yield openConsole(tab);
     info("console opened");
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
+++ b/devtools/client/webconsole/test/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.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   const TEST_TIMESTAMP = 12345678;
   let date = new Date(TEST_TIMESTAMP);
   let localizedString = WCUL10n.timestampString(TEST_TIMESTAMP);
   isnot(localizedString.indexOf(date.getHours()), -1, "the localized " +
--- a/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that exceptions thrown by content don't show up twice in the Web
 // Console.
 
 "use strict";
 
 const INIT_URI = "data:text/html;charset=utf8,hello world";
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-duplicate-error.html";
 
 var test = asyncTest(function* () {
   yield loadTab(INIT_URI);
 
   let hud = yield openConsole();
 
   // On e10s, the exception is triggered in child process
--- a/devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/browser/test-console.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
   testCompletion(hud);
 });
--- a/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_URI = "http://example.com/browser/devtools/client/" +
                  "webconsole/test/test-bug-585956-console-trace.html";
 
 function test() {
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
     let {tab} = yield loadTab("data:text/html;charset=utf8,<p>hello");
     let hud = yield openConsole(tab);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
@@ -5,17 +5,17 @@
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *  Patrick Walton <pcwalton@mozilla.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var HUD, outputNode;
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_588730_text_node_insertion.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that adding text to one of the output labels doesn't cause errors.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   yield testTextNodeInsertion(hud);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   testInputExpansion(hud);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js
@@ -1,23 +1,23 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-593003-iframe-wrong-hud.html";
 
-const TEST_IFRAME_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/" +
                         "webconsole/test/test-bug-593003-iframe-wrong-" +
                         "hud-iframe.html";
 
-const TEST_DUMMY_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/" +
                        "webconsole/test/test-console.html";
 
 var tab1, tab2;
 
 function test() {
   loadTab(TEST_URI).then(({tab}) => {
     tab1 = tab;
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
@@ -7,17 +7,17 @@
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
                  "bug 595934 - message categories coverage.";
-const TESTS_PATH = "http://example.com/browser/browser/devtools/webconsole/" +
+const TESTS_PATH = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/";
 const TESTS = [
   {
     // #0
     file: "test-bug-595934-css-loader.html",
     category: "CSS Loader",
     matchString: "text/css",
   },
--- a/devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var tab1, tab2, win1, win2;
 var noErrors = true;
 
 function tab1Loaded() {
   win2 = OpenBrowserWindow();
   whenDelayedStartupFinished(win2, win2Loaded);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_597136_external_script_errors.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Patrick Walton <pcwalton@mozilla.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_URI = "http://example.com/browser/devtools/client/" +
                  "webconsole/test/test-bug-597136-external-script-" +
                  "errors.html";
 
 function test() {
   Task.spawn(function* () {
     const {tab} = yield loadTab(TEST_URI);
     const hud = yield openConsole(tab);
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-network.html";
 const PREF = "devtools.webconsole.persistlog";
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref(PREF, true);
 
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-597756-reopen-closed-tab.html";
 
 var HUD;
 
 var test = asyncTest(function* () {
   // On e10s, the exception is triggered in child process
   // and is ignored by test harness
   if (!Services.appinfo.browserTabsRemoteAutostart) {
--- a/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
@@ -6,17 +6,17 @@
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
 const INIT_URI = "data:text/plain;charset=utf8,hello world";
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-599725-response-headers.sjs";
 
 var loads = 0;
 function performTest(request, console) {
   let deferred = promise.defer();
 
   let headers = null;
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
@@ -6,17 +6,17 @@
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
 const INIT_URI = "data:text/html;charset=utf-8,Web Console - bug 600183 test";
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-600183-charset.html";
 
 function performTest(lastFinishedRequest, console) {
   let deferred = promise.defer();
 
   ok(lastFinishedRequest, "charset test page was loaded and logged");
   HUDService.lastFinishedRequest.callback = null;
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
@@ -7,17 +7,17 @@
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
                  "bug 601177: log levels";
-const TEST_URI2 = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" +
                   "test/test-bug-601177-log-levels.html";
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref("javascript.options.strict", true);
 
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-603750-websocket.html";
 const TEST_URI2 = "data:text/html;charset=utf-8,Web Console test for " +
                   "bug 603750: Web Socket errors";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI2);
 
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_613013_console_api_iframe.js
@@ -5,17 +5,17 @@
  *
  * Contributor(s):
  *  Mihai Șucan <mihai.sucan@gmail.com>
  *
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-613013-console-api-iframe.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   BrowserReload();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that we report JS exceptions in event handlers coming from
 // network requests, like onreadystate for XHR. See bug 618078.
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 618078";
-const TEST_URI2 = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" +
                   "test/test-bug-618078-network-exceptions.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   // On e10s, the exception is triggered in child process
--- a/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
@@ -4,17 +4,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  *
  * Contributor(s):
  *   Mihai Sucan <mihai.sucan@gmail.com>
  */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-621644-jsterm-dollar.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   yield test$(hud);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_630733_response_redirect_headers.js
@@ -6,17 +6,17 @@
  * Contributor(s):
  *   Mihai Sucan <mihai.sucan@gmail.com>
  */
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,<p>Web Console test for " +
                  "bug 630733";
-const TEST_URI2 = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" +
                   "test/test-bug-630733-response-redirect-headers.sjs";
 
 var lastFinishedRequests = {};
 var webConsoleClient;
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-632275-getters.html";
 
 var getterValue = null;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
   });
--- a/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-632347-iterators-generators.html";
 
 function test() {
   requestLongerTimeout(6);
 
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
   });
--- a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_632817.js
@@ -4,17 +4,17 @@
 
 // Tests that network log messages bring up the network panel.
 
 "use strict";
 
 const TEST_NETWORK_REQUEST_URI = "https://example.com/browser/browser/" +
                                  "devtools/webconsole/test/test-network-request.html";
 
-const TEST_IMG = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_IMG = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-image.png";
 
 const TEST_DATA_JSON_CONTENT =
   '{ id: "test JSON data", myArray: [ "foo", "bar", "baz", "biff" ] }';
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console network logging " +
                  "tests";
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
@@ -8,17 +8,17 @@
 // the limit set for each category.
 
 "use strict";
 
 const INIT_URI = "data:text/html;charset=utf-8,Web Console test for " +
                  "bug 644419: Console should " +
                  "have user-settable log limits for each message category";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/" +
+const TEST_URI = "http://example.com/browser/devtools/client/" +
                  "webconsole/test/test-bug-644419-log-limits.html";
 
 var hud, outputNode;
 
 var test = asyncTest(function* () {
   let { browser } = yield loadTab(INIT_URI);
 
   hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_646025_console_file_location.js
@@ -5,17 +5,17 @@
 
 // Tests that console logging methods display the method location along with
 // the output in the console.
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console file location " +
                  "display test";
-const TEST_URI2 = "http://example.com/browser/browser/devtools/" +
+const TEST_URI2 = "http://example.com/browser/devtools/client/" +
                  "webconsole/test/" +
                  "test-bug-646025-console-file-location.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
@@ -3,17 +3,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Tests that the Console API implements the time() and timeEnd() methods.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-658368-time-methods.html";
 
 const TEST_URI2 = "data:text/html;charset=utf-8,<script>" +
                   "console.timeEnd('bTimer');</script>";
 
 const TEST_URI3 = "data:text/html;charset=utf-8,<script>" +
                   "console.time('bTimer');</script>";
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_704295.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_704295.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests for bug 704295
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   testCompletion(hud);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/browser/test-console.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   let jsterm = hud.jsterm;
--- a/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
@@ -8,17 +8,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the Web Console Mixed Content messages are displayed
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console mixed content test";
-const TEST_HTTPS_URI = "https://example.com/browser/browser/devtools/" +
+const TEST_HTTPS_URI = "https://example.com/browser/devtools/client/" +
                        "webconsole/test/test-bug-737873-mixedcontent.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Security/" +
                        "MixedContent";
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref("security.mixed_content.block_display_content",
                              false);
   Services.prefs.setBoolPref("security.mixed_content.block_active_content",
--- a/devtools/client/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js
@@ -1,24 +1,24 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that warnings about ineffective iframe sandboxing are logged to the
 // web console when necessary (and not otherwise).
 
 "use strict";
 
-const TEST_URI_WARNING = "http://example.com/browser/browser/devtools/" +
+const TEST_URI_WARNING = "http://example.com/browser/devtools/client/" +
                          "webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning0.html";
 const TEST_URI_NOWARNING = [
-  "http://example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning1.html",
-  "http://example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning2.html",
-  "http://example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html",
-  "http://example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html",
-  "http://example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html"
+  "http://example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning1.html",
+  "http://example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning2.html",
+  "http://example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html",
+  "http://example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html",
+  "http://example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html"
 ];
 
 const INEFFECTIVE_IFRAME_SANDBOXING_MSG = "An iframe which has both " +
   "allow-scripts and allow-same-origin for its sandbox attribute can remove " +
   "its sandboxing.";
 const SENTINEL_MSG = "testing ineffective sandboxing message";
 
 function test() {
--- a/devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js
@@ -2,17 +2,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 /*
  * Tests that errors about insecure passwords are logged
  * to the web console
  */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-762593-insecure-passwords-about-blank-web-console-warning.html";
 const INSECURE_PASSWORD_MSG = "Password fields present on an insecure " +
   "(http://) page. This is a security risk that allows user login " +
   "credentials to be stolen.";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
@@ -2,17 +2,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 /*
  * Tests that errors about insecure passwords are logged
  * to the web console
  */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-762593-insecure-passwords-web-" +
                  "console-warning.html";
 const INSECURE_PASSWORD_MSG = "Password fields present on an insecure " +
                  "(http://) page. This is a security risk that allows user " +
                  "login credentials to be stolen.";
 const INSECURE_FORM_ACTION_MSG = "Password fields present in a form with an " +
                  "insecure (http://) form action. This is a security risk " +
                  "that allows user login credentials to be stolen.";
--- a/devtools/client/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // This is a test for the Open URL context menu item
 // that is shown for network requests
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 const COMMAND_NAME = "consoleCmd_openURL";
 const CONTEXT_MENU_ID = "#menu_openURL";
 
 var HUD = null, outputNode = null, contextMenu = null;
 
 var test = asyncTest(function* () {
   Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", true);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_766001_JS_Console_in_Debugger.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that message source links for js errors and console API calls open in
 // the jsdebugger when clicked.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test" +
                  "/test-bug-766001-js-console-links.html";
 
 function test() {
   let hud;
 
   requestLongerTimeout(2);
   Task.spawn(runner).then(finishTest);
 
--- a/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
@@ -5,17 +5,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Tests that the Web Console CSP messages are displayed
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console CSP violation test";
-const TEST_VIOLATION = "https://example.com/browser/browser/devtools/" +
+const TEST_VIOLATION = "https://example.com/browser/devtools/client/" +
                        "webconsole/test/test_bug_770099_violation.html";
 const CSP_VIOLATION_MSG = "Content Security Policy: The page's settings " +
                           "blocked the loading of a resource at " +
                           "http://some.example.com/test.png (\"default-src " +
                             "https://example.com\").";
 
 var test = asyncTest(function* () {
   let { browser } = yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js
@@ -1,17 +1,17 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* ***** BEGIN LICENSE BLOCK *****
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  * ***** END LICENSE BLOCK ***** */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test" +
                  "/test-bug-782653-css-errors.html";
 
 var nodes, hud, StyleEditorUI;
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const TEST_URI = "https://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug-837351-security-errors.html";
 
 var test = asyncTest(function* () {
   yield pushPrefEnv();
 
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
@@ -3,17 +3,17 @@
 
 // Test that the cd() jsterm helper function works as expected. See bug 609872.
 
 "use strict";
 
 function test() {
   let hud;
 
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-bug-609872-cd-iframe-parent.html";
 
   const parentMessages = [{
     name: "document.title in parent iframe",
     text: "bug 609872 - iframe parent",
     category: CATEGORY_OUTPUT,
   }, {
     name: "paragraph content",
--- a/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
+++ b/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the Web Console shows weak crypto warnings (SHA-1 Certificate, SSLv3, and RC4)
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console weak crypto " +
                  "warnings test";
-const TEST_URI_PATH = "/browser/browser/devtools/webconsole/test/" +
+const TEST_URI_PATH = "/browser/devtools/client/webconsole/test/" +
                       "test-certificate-messages.html";
 
 var gWebconsoleTests = [
   {url: "https://sha1ee.example.com" + TEST_URI_PATH,
    name: "SHA1 warning displayed successfully",
    warning: ["SHA-1"], nowarning: ["SSL 3.0", "RC4"]},
   {url: "https://rc4.example.com" + TEST_URI_PATH,
    name: "RC4 warning displayed successfully",
--- a/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
+++ b/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Check that inspecting a closure in the variables view sidebar works when
 // execution is paused.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-closures.html";
 
 var gWebConsole, gJSTerm, gVariablesView;
 
 function test() {
   registerCleanupFunction(() => {
     gWebConsole = gJSTerm = gVariablesView = null;
   });
--- a/devtools/client/webconsole/test/browser_webconsole_column_numbers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_column_numbers.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
  // Check if console provides the right column number alongside line number
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-column.html";
 
 var hud;
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
   });
--- a/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
@@ -4,17 +4,17 @@
 "use strict";
 
 // Test that the console API messages for console.error()/exception()/assert()
 // include a stackframe. See bug 920116.
 
 function test() {
   let hud;
 
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-console-api-stackframe.html";
   const TEST_FILE = TEST_URI.substr(TEST_URI.lastIndexOf("/"));
 
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
     const {tab} = yield loadTab(TEST_URI);
     hud = yield openConsole(tab);
--- a/devtools/client/webconsole/test/browser_webconsole_console_extras.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_extras.js
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Test that window.console functions that are not implemented yet do not
 // output anything in the web console and they do not throw any exceptions.
 // See bug 614350.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-extras.html";
 
 function test() {
   loadTab(TEST_URI).then(() => {
     openConsole().then(consoleOpened);
   });
 }
 
--- a/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the basic console.log()-style APIs and filtering work.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
 
   let outputNode = hud.outputNode;
--- a/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the basic console.log()-style APIs and filtering work for
 // sharedWorkers
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-workers.html";
 
 function pushPrefEnv() {
   let deferred = promise.defer();
   let options = {
     set: [["dom.workers.sharedWorkers.enabled", true]]
   };
   SpecialPowers.pushPrefEnv(options, deferred.resolve);
--- a/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 function test() {
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-bug_939783_console_trace_duplicates.html";
 
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
     const {tab} = yield loadTab("data:text/html;charset=utf8,<p>hello");
     const hud = yield openConsole(tab);
 
--- a/devtools/client/webconsole/test/browser_webconsole_count.js
+++ b/devtools/client/webconsole/test/browser_webconsole_count.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/ */
 
 // Test that console.count() counts as expected. See bug 922208.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-count.html";
 
 function test() {
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
     const {tab} = yield loadTab(TEST_URI);
     const hud = yield openConsole(tab);
--- a/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
+++ b/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
@@ -13,17 +13,17 @@ function test() {
   registerCleanupFunction(() => {
     Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo",
                                originalNetPref);
   });
   Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", true);
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
-    const TEST_PAGE_URI = "http://example.com/browser/browser/devtools/" +
+    const TEST_PAGE_URI = "http://example.com/browser/devtools/client/" +
                           "webconsole/test/test-console.html" + "?_uniq=" +
                           Date.now();
 
     const {tab} = yield loadTab("data:text/html;charset=utf8,<p>hello</p>");
     const hud = yield openConsole(tab);
 
     content.location = TEST_PAGE_URI;
 
--- a/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
@@ -10,17 +10,17 @@
 // and is ignored by test harness
 if (!Services.appinfo.browserTabsRemoteAutostart) {
   expectUncaughtException();
 }
 
 function test() {
   let hud;
 
-  const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                    "test/test-exception-stackframe.html";
   const TEST_FILE = TEST_URI.substr(TEST_URI.lastIndexOf("/"));
 
   Task.spawn(runner).then(finishTest);
 
   function* runner() {
     const {tab} = yield loadTab(TEST_URI);
     hud = yield openConsole(tab);
--- a/devtools/client/webconsole/test/browser_webconsole_execution_scope.js
+++ b/devtools/client/webconsole/test/browser_webconsole_execution_scope.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that commands run by the user are executed in content space.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
   hud.jsterm.execute("window.location.href;");
 
--- a/devtools/client/webconsole/test/browser_webconsole_for_of.js
+++ b/devtools/client/webconsole/test/browser_webconsole_for_of.js
@@ -1,16 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // A for-of loop in Web Console code can loop over a content NodeList.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-for-of.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
   yield testForOf(hud);
 });
--- a/devtools/client/webconsole/test/browser_webconsole_history.js
+++ b/devtools/client/webconsole/test/browser_webconsole_history.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests the console history feature accessed via the up and down arrow keys.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 // Constants used for defining the direction of JSTerm input history navigation.
 const HISTORY_BACK = -1;
 const HISTORY_FORWARD = 1;
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
@@ -2,17 +2,17 @@
   * http://creativecommons.org/publicdomain/zero/1.0/ */
 /* Tests that errors about invalid HPKP security headers are logged
  *  to the web console */
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console HPKP invalid " +
                  "header test";
-const SJS_URL = "https://example.com/browser/browser/devtools/webconsole/" +
+const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" +
                 "test/test_hpkp-invalid-headers.sjs";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" +
                        "Public_Key_Pinning";
 const NON_BUILTIN_ROOT_PREF = "security.cert_pinning.process_headers_from_" +
                               "non_builtin_roots";
 
 var test = asyncTest(function* () {
   registerCleanupFunction(() => {
--- a/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
@@ -2,17 +2,17 @@
   * http://creativecommons.org/publicdomain/zero/1.0/ */
 /* Tests that errors about invalid HSTS security headers are logged
  *  to the web console */
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console HSTS invalid " +
                  "header test";
-const SJS_URL = "https://example.com/browser/browser/devtools/webconsole/" +
+const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" +
                 "test/test_hsts-invalid-headers.sjs";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Security/" +
                        "HTTP_Strict_Transport_Security";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
+++ b/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the input box expands as the user types long lines.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
 
   let input = hud.jsterm.inputNode;
--- a/devtools/client/webconsole/test/browser_webconsole_jsterm.js
+++ b/devtools/client/webconsole/test/browser_webconsole_jsterm.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var jsterm;
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   jsterm = hud.jsterm;
--- a/devtools/client/webconsole/test/browser_webconsole_live_filtering_of_message_types.js
+++ b/devtools/client/webconsole/test/browser_webconsole_live_filtering_of_message_types.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the message type filter checkboxes work.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
 
   let console = content.console;
--- a/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
+++ b/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
@@ -2,17 +2,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that the text filter box works.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
 
   let console = content.console;
--- a/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
+++ b/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
@@ -2,17 +2,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the text filter box works to filter based on filenames
 // where the logs were generated.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-bug_923281_console_log_filter.html";
 
 var hud;
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   hud = yield openConsole();
--- a/devtools/client/webconsole/test/browser_webconsole_message_node_id.js
+++ b/devtools/client/webconsole/test/browser_webconsole_message_node_id.js
@@ -1,16 +1,16 @@
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
 
   hud.jsterm.execute("console.log('a log message')");
 
--- a/devtools/client/webconsole/test/browser_webconsole_netlogging.js
+++ b/devtools/client/webconsole/test/browser_webconsole_netlogging.js
@@ -15,17 +15,17 @@
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console network " +
                  "logging tests";
 
 const TEST_NETWORK_REQUEST_URI = "http://example.com/browser/browser/" +
                  "devtools/webconsole/test/test-network-request.html";
 
-const TEST_IMG = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_IMG = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-image.png";
 
 const TEST_DATA_JSON_CONTENT =
   '{ id: "test JSON data", myArray: [ "foo", "bar", "baz", "biff" ] }';
 
 var lastRequest = null;
 var requestCallback = null;
 var browser, hud;
--- a/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
+++ b/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
@@ -5,17 +5,17 @@
 // Tests that if a link without an onclick callback is clicked the link is
 // opened in a new tab and no exception occurs (bug 999236).
 
 "use strict";
 
 function test() {
   function* runner() {
     const TEST_EVAL_STRING = "document";
-    const TEST_PAGE_URI = "http://example.com/browser/browser/devtools/" +
+    const TEST_PAGE_URI = "http://example.com/browser/devtools/client/" +
                           "webconsole/test/test-console.html";
     const {tab} = yield loadTab(TEST_PAGE_URI);
     const hud = yield openConsole(tab);
 
     hud.jsterm.execute(TEST_EVAL_STRING);
 
     const EXPECTED_OUTPUT = new RegExp("HTMLDocument \.+");
 
--- a/devtools/client/webconsole/test/browser_webconsole_output_02.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_02.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test the webconsole output for various types of objects.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-02.html";
 
 var inputTests = [
   // 0 - native named function
   {
     input: "document.getElementById",
     output: "function getElementById()",
     printOutput: "function getElementById() {\n    [native code]\n}",
--- a/devtools/client/webconsole/test/browser_webconsole_output_03.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_03.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test the webconsole output for various types of objects.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-03.html";
 
 var inputTests = [
 
   // 0
   {
     input: "document",
     output: "HTMLDocument \u2192 " + TEST_URI,
--- a/devtools/client/webconsole/test/browser_webconsole_output_04.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_04.js
@@ -8,17 +8,17 @@
 //
 
 "use strict";
 
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("null");
 
 // Test the webconsole output for various types of objects.
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-04.html";
 
 var inputTests = [
   // 0
   {
     input: "testTextNode()",
     output: '#text "hello world!"',
     printOutput: "[object Text]",
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
@@ -8,17 +8,17 @@
 
 "use strict";
 
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed(null);
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.toolbox is null");
 
 // Test the webconsole output for various types of DOM Nodes.
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-dom-elements.html";
 
 var inputTests = [
   {
     input: "testBodyNode()",
     output: '<body id="body-id" class="body-class">',
     printOutput: "[object HTMLBodyElement]",
     inspectable: true,
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test the inspector links in the webconsole output for DOM Nodes actually
 // open the inspector and select the right node
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-dom-elements.html";
 
 const TEST_DATA = [
   {
     // The first test shouldn't be returning the body element as this is the
     // default selected node, so re-selecting it won't fire the
     // inspector-updated event
     input: "testNode()",
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that inspector links in webconsole outputs for DOM Nodes highlight
 // the actual DOM Nodes on hover
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-dom-elements.html";
 
 function test() {
   Task.spawn(function*() {
     let {tab} = yield loadTab(TEST_URI);
     let hud = yield openConsole(tab);
     let toolbox = gDevTools.getToolbox(hud.target);
 
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
@@ -3,17 +3,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test that inspector links in the webconsole output for DOM Nodes do not try
 // to highlight or select nodes once they have been detached
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-dom-elements.html";
 
 const TEST_DATA = [
   {
     // The first test shouldn't be returning the body element as this is the
     // default selected node, so re-selecting it won't fire the
     // inspector-updated event
     input: "testNode()",
--- a/devtools/client/webconsole/test/browser_webconsole_output_events.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_events.js
@@ -7,17 +7,17 @@
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 
 "use strict";
 
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("null");
 
 // Test the webconsole output for DOM events.
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-events.html";
 
 var test = asyncTest(function* () {
   yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
   hud.jsterm.clearOutput();
--- a/devtools/client/webconsole/test/browser_webconsole_output_order.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_order.js
@@ -3,17 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests that any output created from calls to the console API comes after the
 // echoed JavaScript.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console.html";
 
 var test = asyncTest(function*() {
   yield loadTab(TEST_URI);
   let hud = yield openConsole();
 
   let jsterm = hud.jsterm;
 
--- a/devtools/client/webconsole/test/browser_webconsole_output_regexp.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_regexp.js
@@ -2,17 +2,17 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // Test the webconsole output for various types of objects.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-output-regexp.html";
 
 var dateNow = Date.now();
 
 var inputTests = [
   // 0
   {
     input: "/foo/igym",
--- a/devtools/client/webconsole/test/browser_webconsole_output_table.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_table.js
@@ -1,17 +1,17 @@
  /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
  /* Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that console.table() works as intended.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-console-table.html";
 
 const TEST_DATA = [
   {
     command: "console.table(languages1)",
     data: [
         { _index: 0, name: "\"JavaScript\"", fileExtension: "Array[1]" },
         { _index: 1, name: "Object", fileExtension: "\".ts\"" },
--- a/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
@@ -5,17 +5,17 @@
  */
 
 // Ensure non-toplevel security errors are displayed
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console subresource STS " +
                  "warning test";
-const TEST_DOC = "https://example.com/browser/browser/devtools/webconsole/" +
+const TEST_DOC = "https://example.com/browser/devtools/client/webconsole/" +
                  "test/test_bug1092055_shouldwarn.html";
 const SAMPLE_MSG = "specified a header that could not be parsed successfully.";
 
 var test = asyncTest(function* () {
   let { browser } = yield loadTab(TEST_URI);
 
   let hud = yield openConsole();
 
--- a/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -5,17 +5,17 @@
 
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Test that the web console " +
                  "displays requests that have been recorded in the " +
                  "netmonitor, even if the console hadn't opened yet.";
 
 const TEST_FILE = "test-network-request.html";
-const TEST_PATH = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
                   "test/" + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.networkinfo";
 Services.prefs.setBoolPref(NET_PREF, true);
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref(NET_PREF);
 });
 
--- a/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Load a page with tracking elements that get blocked and make sure that a
 // 'learn more' link shows up in the webconsole.
 
 "use strict";
 
-const TEST_URI = "http://tracking.example.org/browser/browser/devtools/webconsole/test/test-trackingprotection-securityerrors.html";
+const TEST_URI = "http://tracking.example.org/browser/devtools/client/webconsole/test/test-trackingprotection-securityerrors.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/Firefox/Privacy/Tracking_Protection";
 const PREF = "privacy.trackingprotection.enabled";
 const {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});
 
 registerCleanupFunction(function() {
   Services.prefs.clearUserPref(PREF);
   UrlClassifierTestUtils.cleanupTestTrackers();
 });
--- a/devtools/client/webconsole/test/browser_webconsole_view_source.js
+++ b/devtools/client/webconsole/test/browser_webconsole_view_source.js
@@ -1,17 +1,17 @@
 /* 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.
 
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/" +
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
                  "test/test-error.html";
 
 var getItemForAttachment;
 var Sources;
 var getItemInvoked = false;
 
 add_task(function*() {
   yield loadTab(TEST_URI);
--- a/devtools/client/webconsole/test/head.js
+++ b/devtools/client/webconsole/test/head.js
@@ -1282,17 +1282,17 @@ function waitForMessages(options) {
   function onMessagesAdded(event, newMessages) {
     for (let msg of newMessages) {
       let elem = msg.node;
       let location = elem.querySelector(".message-location");
       if (location) {
         let url = location.title;
         // Prevent recursion with the browser console and any potential
         // messages coming from head.js.
-        if (url.indexOf("browser/devtools/webconsole/test/head.js") != -1) {
+        if (url.indexOf("devtools/client/webconsole/test/head.js") != -1) {
           continue;
         }
       }
 
       for (let rule of rules) {
         if (rule._ruleMatched) {
           continue;
         }
--- a/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
+++ b/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
@@ -4,11 +4,11 @@
     <meta charset="utf-8">
     <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/browser/devtools/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html"></iframe>
+       src="http://example.com/browser/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud-iframe.html"></iframe>
    </body>
  </html>
--- a/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html
+++ b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html
@@ -4,11 +4,11 @@
     <meta charset="utf8">
     <title>Bug 752559 - print warning to error console when iframe sandbox
       is being used ineffectively</title>
       <!-- Any copyright is dedicated to the Public Domain.
         http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html
+++ b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html
@@ -4,11 +4,11 @@
     <meta charset="utf8">
     <title>Bug 752559 - print warning to error console when iframe sandbox
       is being used ineffectively</title>
       <!-- Any copyright is dedicated to the Public Domain.
         http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html
+++ b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning3.html
@@ -4,11 +4,11 @@
     <meta charset="utf8">
     <title>Bug 752559 - print warning to error console when iframe sandbox
       is being used ineffectively (allow-scripts, allow-same-origin)</title>
       <!-- Any copyright is dedicated to the Public Domain.
         http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html
+++ b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning4.html
@@ -4,11 +4,11 @@
     <meta charset="utf8">
     <title>Bug 752559 - print warning to error console when iframe sandbox
       is being used ineffectively (allow-scripts, allow-same-origin, nested)</title>
       <!-- Any copyright is dedicated to the Public Domain.
         http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested1.html" sandbox="allow-scripts allow-same-origin"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html
+++ b/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning5.html
@@ -4,11 +4,11 @@
     <meta charset="utf8">
     <title>Bug 752559 - print warning to error console when iframe sandbox
       is being used ineffectively (nested, allow-scripts, allow-same-origin)</title>
       <!-- Any copyright is dedicated to the Public Domain.
         http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/browser/devtools/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/test-bug-752559-ineffective-iframe-sandbox-warning-nested2.html"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html
+++ b/devtools/client/webconsole/test/test-bug-762593-insecure-passwords-web-console-warning.html
@@ -5,12 +5,12 @@
     <title>Bug 762593 - Add warning/error Message to Web Console when the
       page includes Insecure Password fields</title>
     <!-- Any copyright is dedicated to the Public Domain.
     http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <p>This page is served with an iframe with insecure password field.</p>
     <iframe src
-      ="http://example.com/browser/browser/devtools/webconsole/test/test-iframe-762593-insecure-frame.html">
+      ="http://example.com/browser/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html">
     </iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-869003-top-window.html
+++ b/devtools/client/webconsole/test/test-bug-869003-top-window.html
@@ -4,11 +4,11 @@
     <meta charset="utf-8">
     <title>Web Console test for bug 869003</title>
     <!-- Any copyright is dedicated to the Public Domain.
        - http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <p>Make sure users can inspect objects from cross-domain iframes.</p>
     <p>Top window.</p>
-    <iframe src="http://example.org/browser/browser/devtools/webconsole/test/test-bug-869003-iframe.html"></iframe>
+    <iframe src="http://example.org/browser/devtools/client/webconsole/test/test-bug-869003-iframe.html"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
+++ b/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
@@ -3,11 +3,11 @@
   <head>
     <meta charset="utf-8">
     <title>test for bug 989025 - iframe parent</title>
     <!-- Any copyright is dedicated to the Public Domain.
          http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <p>test for bug 989025 - iframe parent</p>
-    <iframe src="http://mochi.test:8888/browser/browser/devtools/webconsole/test/test-bug-609872-cd-iframe-child.html"></iframe>
+    <iframe src="http://mochi.test:8888/browser/devtools/client/webconsole/test/test-bug-609872-cd-iframe-child.html"></iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
+++ b/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
@@ -4,12 +4,12 @@
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
     <!-- Any copyright is dedicated to the Public Domain.
     http://creativecommons.org/publicdomain/zero/1.0/ -->
   </head>
   <body>
     <h1>iframe 1</h1>
     <p>This frame is served with an insecure password field.</p>
     <iframe src=
-      "http://example.com/browser/browser/devtools/webconsole/test/test-iframe-762593-insecure-form-action.html">
+      "http://example.com/browser/devtools/client/webconsole/test/test-iframe-762593-insecure-form-action.html">
     </iframe>
   </body>
 </html>
--- a/devtools/client/webconsole/test/test-network-request.html
+++ b/devtools/client/webconsole/test/test-network-request.html
@@ -15,26 +15,26 @@
         xmlhttp.send(aRequestBody);
       }
 
       function testXhrGet(aCallback) {
         makeXhr('get', 'test-data.json', null, aCallback);
       }
 
       function testXhrWarn(aCallback) {
-        makeXhr('get', 'http://example.com/browser/browser/devtools/netmonitor/test/sjs_cors-test-server.sjs', null, aCallback);
+        makeXhr('get', 'http://example.com/browser/devtools/client/netmonitor/test/sjs_cors-test-server.sjs', null, aCallback);
       }
 
       function testXhrPost(aCallback) {
         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="https://example.com/browser/browser/devtools/webconsole/test/test-network-request.html" method="post">
+    <form action="https://example.com/browser/devtools/client/webconsole/test/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>
--- a/devtools/client/webide/test/browser_tabs.js
+++ b/devtools/client/webide/test/browser_tabs.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webide/test/doc_tabs.html";
+const TEST_URI = "http://example.com/browser/devtools/client/webide/test/doc_tabs.html";
 
 function test() {
   waitForExplicitFinish();
   requestCompleteLog();
 
   Task.spawn(function*() {
     const { DebuggerServer } = require("devtools/server/main");
 
--- a/devtools/client/webide/test/head.js
+++ b/devtools/client/webide/test/head.js
@@ -13,19 +13,19 @@ const {require} = Cu.import("resource://
 const {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
 const promise = require("promise");
 const {AppProjects} = require("devtools/client/app-manager/app-projects");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 DevToolsUtils.testing = true;
 
 var TEST_BASE;
 if (window.location === "chrome://browser/content/browser.xul") {
-  TEST_BASE = "chrome://mochitests/content/browser/browser/devtools/webide/test/";
+  TEST_BASE = "chrome://mochitests/content/browser/devtools/client/webide/test/";
 } else {
-  TEST_BASE = "chrome://mochitests/content/chrome/browser/devtools/webide/test/";
+  TEST_BASE = "chrome://mochitests/content/chrome/devtools/client/webide/test/";
 }
 
 Services.prefs.setBoolPref("devtools.webide.enabled", true);
 Services.prefs.setBoolPref("devtools.webide.enableLocalRuntime", true);
 Services.prefs.setBoolPref("devtools.webide.sidebars", true);
 
 Services.prefs.setCharPref("devtools.webide.addonsURL", TEST_BASE + "addons/simulators.json");
 Services.prefs.setCharPref("devtools.webide.simulatorAddonsURL", TEST_BASE + "addons/fxos_#SLASHED_VERSION#_simulator-#OS#.xpi");
--- a/devtools/client/webide/test/sidebars/browser_tabs.js
+++ b/devtools/client/webide/test/sidebars/browser_tabs.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-const TEST_URI = "http://example.com/browser/browser/devtools/webide/test/doc_tabs.html";
+const TEST_URI = "http://example.com/browser/devtools/client/webide/test/doc_tabs.html";
 
 function test() {
   waitForExplicitFinish();
   requestCompleteLog();
 
   Task.spawn(function*() {
     const { DebuggerServer } = require("devtools/server/main");
 
--- a/devtools/client/webide/test/templates.json
+++ b/devtools/client/webide/test/templates.json
@@ -1,14 +1,14 @@
 [
   {
-    "file": "chrome://mochitests/content/chrome/browser/devtools/webide/test/app.zip?1",
+    "file": "chrome://mochitests/content/chrome/devtools/client/webide/test/app.zip?1",
     "icon": "ximgx1",
     "name": "app name 1",
     "description": "app description 1"
   },
   {
-    "file": "chrome://mochitests/content/chrome/browser/devtools/webide/test/app.zip?2",
+    "file": "chrome://mochitests/content/chrome/devtools/client/webide/test/app.zip?2",
     "icon": "ximgx2",
     "name": "app name 2",
     "description": "app description 2"
   }
 ]
--- a/devtools/server/actors/animation.js
+++ b/devtools/server/actors/animation.js
@@ -561,17 +561,17 @@ var AnimationsActor = exports.Animations
   disconnect: function() {
     this.destroy();
   },
 
   /**
    * Retrieve the list of AnimationPlayerActor actors for currently running
    * animations on a node and its descendants.
    * @param {NodeActor} nodeActor The NodeActor as defined in
-   * /toolkit/devtools/server/actors/inspector
+   * /devtools/server/actors/inspector
    */
   getAnimationPlayersForNode: method(function(nodeActor) {
     let animations = [
       ...nodeActor.rawNode.getAnimations(),
       ...this.getAllAnimations(nodeActor.rawNode)
     ];
 
     // No care is taken here to destroy the previously stored actors because it
--- a/devtools/server/actors/common.js
+++ b/devtools/server/actors/common.js
@@ -522,17 +522,17 @@ function expectState(expectedState, meth
 exports.expectState = expectState;
 
 /**
  * Proxies a call from an actor to an underlying module, stored
  * as `bridge` on the actor. This allows a module to be defined in one
  * place, usable by other modules/actors on the server, but a separate
  * module defining the actor/RDP definition.
  *
- * @see Framerate implementation: toolkit/devtools/shared/framerate.js
- * @see Framerate actor definition: toolkit/devtools/server/actors/framerate.js
+ * @see Framerate implementation: devtools/shared/shared/framerate.js
+ * @see Framerate actor definition: devtools/server/actors/framerate.js
  */
 function actorBridge (methodName, definition={}) {
   return method(function () {
     return this.bridge[methodName].apply(this.bridge, arguments);
   }, definition);
 }
 exports.actorBridge = actorBridge;
--- a/devtools/server/actors/framerate.js
+++ b/devtools/server/actors/framerate.js
@@ -8,17 +8,17 @@ const { actorBridge } = require("devtool
 const { method, custom, Arg, Option, RetVal } = protocol;
 const { on, once, off, emit } = require("sdk/event/core");
 const { Framerate } = require("devtools/shared/shared/framerate");
 
 /**
  * An actor wrapper around Framerate. Uses exposed
  * methods via bridge and provides RDP definitions.
  *
- * @see toolkit/devtools/shared/framerate.js for documentation.
+ * @see devtools/shared/shared/framerate.js for documentation.
  */
 var FramerateActor = exports.FramerateActor = protocol.ActorClass({
   typeName: "framerate",
   initialize: function (conn, tabActor) {
     protocol.Actor.prototype.initialize.call(this, conn);
     this.bridge = new Framerate(tabActor);
   },
   destroy: function(conn) {
--- a/devtools/server/actors/highlighters.js
+++ b/devtools/server/actors/highlighters.js
@@ -465,17 +465,17 @@ let CustomHighlighterActor = exports.Cus
 
   /**
    * Show the highlighter.
    * This calls through to the highlighter instance's |show(node, options)|
    * method.
    *
    * Most custom highlighters are made to highlight DOM nodes, hence the first
    * NodeActor argument (NodeActor as in
-   * toolkit/devtools/server/actor/inspector).
+   * devtools/server/actor/inspector).
    * Note however that some highlighters use this argument merely as a context
    * node: the RectHighlighter for instance uses it to calculate the absolute
    * position of the provided rect. The SelectHighlighter uses it as a base node
    * to run the provided CSS selector on.
    *
    * @param {NodeActor} The node to be highlighted
    * @param {Object} Options for the custom highlighter
    * @return {Boolean} True, if the highlighter has been successfully shown
--- a/devtools/server/actors/memory.js
+++ b/devtools/server/actors/memory.js
@@ -35,20 +35,20 @@ types.addDictType("AllocationsRecordingO
 });
 
 /**
  * An actor that returns memory usage data for its parent actor's window.
  * A tab-scoped instance of this actor will measure the memory footprint of its
  * parent tab. A global-scoped instance however, will measure the memory
  * footprint of the chrome window referenced by the root actor.
  *
- * This actor wraps the Memory module at toolkit/devtools/shared/memory.js
+ * This actor wraps the Memory module at devtools/shared/shared/memory.js
  * and provides RDP definitions.
  *
- * @see toolkit/devtools/shared/memory.js for documentation.
+ * @see devtools/shared/shared/memory.js for documentation.
  */
 var MemoryActor = exports.MemoryActor = protocol.ActorClass({
   typeName: "memory",
 
   /**
    * The set of unsolicited events the MemoryActor emits that will be sent over
    * the RDP (by protocol.js).
    */
--- a/devtools/server/actors/performance-recording.js
+++ b/devtools/server/actors/performance-recording.js
@@ -14,20 +14,20 @@ loader.lazyRequireGetter(this, "merge", 
 loader.lazyRequireGetter(this, "PerformanceIO",
   "devtools/shared/performance/io");
 loader.lazyRequireGetter(this, "RecordingUtils",
   "devtools/shared/performance/utils");
 loader.lazyRequireGetter(this, "PerformanceRecordingCommon",
   "devtools/shared/performance/recording-common", true);
 
 /**
- * This actor wraps the Performance module at toolkit/devtools/shared/performance.js
+ * This actor wraps the Performance module at devtools/shared/shared/performance.js
  * and provides RDP definitions.
  *
- * @see toolkit/devtools/shared/performance.js for documentation.
+ * @see devtools/shared/shared/performance.js for documentation.
  */
 var PerformanceRecordingActor = exports.PerformanceRecordingActor = protocol.ActorClass(merge({
   typeName: "performance-recording",
 
   form: function(detail) {
     if (detail === "actorid") {
       return this.actorID;
     }
--- a/devtools/server/actors/performance.js
+++ b/devtools/server/actors/performance.js
@@ -30,20 +30,20 @@ const PIPE_TO_FRONT_EVENTS = new Set([
   "profiler-status", "timeline-data", "console-profile-start"
 ]);
 
 const RECORDING_STATE_CHANGE_EVENTS = new Set([
   "recording-started", "recording-stopping", "recording-stopped"
 ]);
 
 /**
- * This actor wraps the Performance module at toolkit/devtools/shared/performance.js
+ * This actor wraps the Performance module at devtools/shared/shared/performance.js
  * and provides RDP definitions.
  *
- * @see toolkit/devtools/shared/performance.js for documentation.
+ * @see devtools/shared/shared/performance.js for documentation.
  */
 var PerformanceActor = exports.PerformanceActor = protocol.ActorClass({
   typeName: "performance",
 
   traits: {
     features: {
       withMarkers: true,
       withMemory: true,
--- a/devtools/server/actors/profiler.js
+++ b/devtools/server/actors/profiler.js
@@ -25,20 +25,20 @@ types.addType("profiler-data", {
       newValue.currentTime = v.currentTime;
       return newValue;
     }
     return v;
   }
 });
 
 /**
- * This actor wraps the Profiler module at toolkit/devtools/shared/profiler.js
+ * This actor wraps the Profiler module at devtools/shared/shared/profiler.js
  * and provides RDP definitions.
  *
- * @see toolkit/devtools/shared/profiler.js for documentation.
+ * @see devtools/shared/shared/profiler.js for documentation.
  */
 var ProfilerActor = exports.ProfilerActor = protocol.ActorClass({
   typeName: "profiler",
 
   /**
    * The set of events the ProfilerActor emits over RDP.
    */
   events: {
--- a/devtools/server/actors/timeline.js
+++ b/devtools/server/actors/timeline.js
@@ -4,21 +4,21 @@
 "use strict";
 
 /**
  * Many Gecko operations (painting, reflows, restyle, ...) can be tracked
  * in real time. A marker is a representation of one operation. A marker
  * has a name, start and end timestamps. Markers are stored in docShells.
  *
  * This actor exposes this tracking mechanism to the devtools protocol.
- * Most of the logic is handled in toolkit/devtools/shared/timeline.js
+ * Most of the logic is handled in devtools/shared/shared/timeline.js
  * This just wraps that module up and exposes it via RDP.
  *
  * For more documentation:
- * @see toolkit/devtools/shared/timeline.js
+ * @see devtools/shared/shared/timeline.js
  */
 
 const protocol = require("devtools/server/protocol");
 const { method, Arg, RetVal, Option } = protocol;
 const events = require("sdk/event/core");
 const { Timeline } = require("devtools/shared/shared/timeline");
 const { actorBridge } = require("devtools/server/actors/common");
 
--- a/devtools/server/docs/actor-hierarchy.md
+++ b/devtools/server/docs/actor-hierarchy.md
@@ -1,11 +1,11 @@
 # How actors are organized
 
-To start with, actors are living within /toolkit/devtools/server/actors/ folder.
+To start with, actors are living within /devtools/server/actors/ folder.
 They are organized in a hierarchy for easier lifecycle/memory management:
 once a parent is removed from the pool, its children are removed as well.
 (See actor-registration.md for more information about how to implement one)
 
 The overall hierarchy of actors looks like this:
 
   RootActor: First one, automatically instanciated when we start connecting.
    |         Mostly meant to instanciate new actors.
--- a/devtools/server/docs/actor-registration.md
+++ b/devtools/server/docs/actor-registration.md
@@ -25,17 +25,17 @@ To register a global actor:
 ```
 DebuggerServer.registerModule("devtools/server/actors/webapps", {
   prefix: "webapps",
   constructor: "WebappsActor",
   type: { global: true }
 });
 ```
 
-If you are adding a new built-in devtools actor, you should be registering it using `DebuggerServer.registerModule` in `addBrowserActors` or `addTabActors` in `/toolkit/devtools/server/main.js`.
+If you are adding a new built-in devtools actor, you should be registering it using `DebuggerServer.registerModule` in `addBrowserActors` or `addTabActors` in `/devtools/server/main.js`.
 
 If you are adding a new actor from an add-on, you should call `DebuggerServer.registerModule` directly from your add-on code.
 
 ## A note about lazy registration
 
 The `DebuggerServer` loads and creates all of the actors lazily to keep the initial memory usage down (which is extremely important on lower end devices).
 
 It becomes especially important when debugging apps on b2g or pages with e10s when there are more than one process, because that's when we need to spawn a `DebuggerServer` per process (it may not be immediately obvious that the server in the main process is mostly only here for piping messages to the actors in the child process).
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -591,17 +591,17 @@ var DebuggerServer = {
   },
 
   /**
    * Creates a socket listener for remote debugger connections.
    *
    * After calling this, set some socket options, such as the port / path to
    * listen on, and then call |open| on the listener.
    *
-   * See SocketListener in toolkit/devtools/security/socket.js for available
+   * See SocketListener in devtools/shared/security/socket.js for available
    * options.
    *
    * @return SocketListener
    *         A SocketListener instance that is waiting to be configured and
    *         opened is returned.  This single listener can be closed at any
    *         later time by calling |close| on the SocketListener.  If remote
    *         connections are disabled, an error is thrown.
    */
--- a/devtools/server/tests/browser/browser.ini
+++ b/devtools/server/tests/browser/browser.ini
@@ -20,77 +20,77 @@ support-files =
   timeline-iframe-child.html
   timeline-iframe-parent.html
   director-script-target.html
 
 [browser_animation_actors_01.js]
 [browser_animation_actors_02.js]
 [browser_animation_actors_03.js]
 [browser_animation_actors_04.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_animation_actors_06.js]
 [browser_animation_actors_07.js]
 [browser_animation_actors_08.js]
 [browser_animation_actors_09.js]
 [browser_animation_actors_10.js]
 [browser_animation_actors_11.js]
 [browser_animation_actors_12.js]
 [browser_animation_actors_13.js]
 [browser_animation_actors_14.js]
 [browser_animation_actors_15.js]
 [browser_animation_actors_16.js]
 [browser_canvasframe_helper_01.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_canvasframe_helper_02.js]
 [browser_canvasframe_helper_03.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_canvasframe_helper_04.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_canvasframe_helper_05.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_canvasframe_helper_06.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_markers-cycle-collection.js]
 [browser_markers-gc.js]
 [browser_markers-parse-html.js]
 [browser_markers-styles.js]
 [browser_markers-timestamp.js]
 [browser_navigateEvents.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-allocation-data.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-legacy-front-01.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-legacy-front-02.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-legacy-front-03.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-profiler-01.js]
 [browser_perf-profiler-02.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-profiler-03.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-realtime-markers.js]
 [browser_perf-recording-actor-01.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-recording-actor-02.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-samples-01.js]
 [browser_perf-samples-02.js]
 #[browser_perf-front-profiler-01.js] bug 1077464
 #[browser_perf-front-profiler-05.js] bug 1077464
 #[browser_perf-front-profiler-06.js]
 [browser_storage_dynamic_windows.js]
 [browser_storage_listings.js]
 [browser_storage_updates.js]
 [browser_stylesheets_nested-iframes.js]
 [browser_timeline.js]
 skip-if = buildapp == 'mulet'
 [browser_timeline_actors.js]
 skip-if = buildapp == 'mulet'
 [browser_timeline_iframes.js]
 skip-if = buildapp == 'mulet'
 [browser_directorscript_actors_exports.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_directorscript_actors_error_events.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_directorscript_actors.js]
-skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are still disabled in E10S
+skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
--- a/devtools/server/tests/browser/browser_animation_actors_10.js
+++ b/devtools/server/tests/browser/browser_animation_actors_10.js
@@ -2,17 +2,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 // Check that the right duration/iterationCount/delay are retrieved even when
 // the node has multiple animations and one of them already ended before getting
 // the player objects.
-// See toolkit/devtools/server/actors/animation.js |getPlayerIndex| for more
+// See devtools/server/actors/animation.js |getPlayerIndex| for more
 // information.
 
 const {AnimationsFront} = require("devtools/server/actors/animation");
 const {InspectorFront} = require("devtools/server/actors/inspector");
 
 add_task(function*() {
   yield addTab(MAIN_DOMAIN + "animation.html");
 
--- a/devtools/server/tests/browser/browser_perf-samples-02.js
+++ b/devtools/server/tests/browser/browser_perf-samples-02.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests if the retrieved profiler data samples always have a (root) node.
  * If this ever changes, the |ThreadNode.prototype.insert| function in
- * browser/devtools/performance/modules/logic/tree-model.js will have to be changed.
+ * devtools/client/performance/modules/logic/tree-model.js will have to be changed.
  */
 
 const WAIT_TIME = 1000; // ms
 
 const { PerformanceFront } = require("devtools/server/actors/performance");
 
 add_task(function*() {
   let doc = yield addTab(MAIN_DOMAIN + "doc_perf.html");
--- a/devtools/server/tests/browser/browser_storage_listings.js
+++ b/devtools/server/tests/browser/browser_storage_listings.js
@@ -64,17 +64,17 @@ const storeMap = {
         host: ".example.org",
         expires: 0,
         isDomain: true,
         isSecure: false,
       },
       {
         name: "sc1",
         value: "foobar",
-        path: "/browser/toolkit/devtools/server/tests/browser/",
+        path: "/browser/devtools/server/tests/browser/",
         host: "sectest1.example.org",
         expires: 0,
         isDomain: false,
         isSecure: false,
       }
     ]
   },
   localStorage: {
--- a/devtools/server/tests/browser/head.js
+++ b/devtools/server/tests/browser/head.js
@@ -9,17 +9,17 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
 const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 const {DebuggerClient} = require("devtools/shared/client/main");
 const {DebuggerServer} = require("devtools/server/main");
 const {defer} = require("promise");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
-const PATH = "browser/toolkit/devtools/server/tests/browser/";
+const PATH = "browser/devtools/server/tests/browser/";
 const MAIN_DOMAIN = "http://test1.example.org/" + PATH;
 const ALT_DOMAIN = "http://sectest1.example.org/" + PATH;
 const ALT_DOMAIN_SECURED = "https://sectest1.example.org:443/" + PATH;
 
 // All tests are asynchronous.
 waitForExplicitFinish();
 
 /**
--- a/devtools/server/tests/browser/storage-dynamic-windows.html
+++ b/devtools/server/tests/browser/storage-dynamic-windows.html
@@ -3,17 +3,17 @@
 <!--
 Bug 965872 - Storage inspector actor with cookies, local storage and session storage.
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
-<iframe src="http://sectest1.example.org/browser/toolkit/devtools/server/tests/browser/storage-unsecured-iframe.html"></iframe>
+<iframe src="http://sectest1.example.org/browser/devtools/server/tests/browser/storage-unsecured-iframe.html"></iframe>
 <script type="application/javascript;version=1.7">
 "use strict";
 const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 const cookieExpiresTime1 = 2000000000000;
 const cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
--- a/devtools/server/tests/browser/storage-listings.html
+++ b/devtools/server/tests/browser/storage-listings.html
@@ -3,18 +3,18 @@
 <!--
 Bug 965872 - Storage inspector actor with cookies, local storage and session storage.
 -->
 <head>
   <meta charset="utf-8">
   <title>Storage inspector test for listing hosts and storages</title>
 </head>
 <body>
-<iframe src="http://sectest1.example.org/browser/toolkit/devtools/server/tests/browser/storage-unsecured-iframe.html"></iframe>
-<iframe src="https://sectest1.example.org:443/browser/toolkit/devtools/server/tests/browser/storage-secured-iframe.html"></iframe>
+<iframe src="http://sectest1.example.org/browser/devtools/server/tests/browser/storage-unsecured-iframe.html"></iframe>
+<iframe src="https://sectest1.example.org:443/browser/devtools/server/tests/browser/storage-secured-iframe.html"></iframe>
 <script type="application/javascript;version=1.7">
 "use strict";
 const partialHostname = location.hostname.match(/^[^.]+(\..*)$/)[1];
 const cookieExpiresTime1 = 2000000000000;
 const cookieExpiresTime2 = 2000000001000;
 // Setting up some cookies to eat.
 document.cookie = "c1=foobar; expires=" +
   new Date(cookieExpiresTime1).toGMTString() + "; path=/browser";
--- a/devtools/server/tests/mochitest/setup-in-child.js
+++ b/devtools/server/tests/mochitest/setup-in-child.js
@@ -7,14 +7,14 @@ exports.setupChild = function (a, b, c) 
   cpmm.sendAsyncMessage("test:setupChild", [a, b, c]);
 }
 
 exports.callParent = function () {
   // Hack! Fetch DebuggerServerConnection objects directly within DebuggerServer guts.
   for (let id in DebuggerServer._connections) {
     let conn = DebuggerServer._connections[id];
     conn.setupInParent({
-      module: "chrome://mochitests/content/chrome/toolkit/devtools/server/tests/mochitest/setup-in-parent.js",
+      module: "chrome://mochitests/content/chrome/devtools/server/tests/mochitest/setup-in-parent.js",
       setupParent: "setupParent",
       args: [{one: true}, 2, "three"]
     });
   }
 }
--- a/devtools/server/tests/mochitest/test_inspector-resolve-url.html
+++ b/devtools/server/tests/mochitest/test_inspector-resolve-url.html
@@ -29,47 +29,47 @@ addTest(function() {
     gInspector = InspectorFront(client, tab);
     runNextTest();
   });
 });
 
 addTest(function() {
   info("Resolve a relative URL without providing a context node");
   gInspector.resolveRelativeURL("test.png?id=4#wow").then(url => {
-    is(url, "chrome://mochitests/content/chrome/toolkit/devtools/server/tests/" +
+    is(url, "chrome://mochitests/content/chrome/devtools/server/tests/" +
             "mochitest/test.png?id=4#wow");
     runNextTest();
   });
 });
 
 addTest(function() {
   info("Resolve an absolute URL without providing a context node");
-  gInspector.resolveRelativeURL("chrome://mochitests/content/chrome/toolkit/" +
+  gInspector.resolveRelativeURL("chrome://mochitests/content/chrome/" +
                                 "devtools/server/").then(url => {
-    is(url, "chrome://mochitests/content/chrome/toolkit/devtools/server/");
+    is(url, "chrome://mochitests/content/chrome/devtools/server/");
     runNextTest();
   });
 });
 
 addTest(function() {
   info("Resolve a relative URL providing a context node");
   let node = gDoc.querySelector(".big-horizontal");
   gInspector.resolveRelativeURL("test.png?id=4#wow", node).then(url => {
-    is(url, "chrome://mochitests/content/chrome/toolkit/devtools/server/tests/" +
+    is(url, "chrome://mochitests/content/chrome/devtools/server/tests/" +
             "mochitest/test.png?id=4#wow");
     runNextTest();
   });
 });
 
 addTest(function() {
   info("Resolve an absolute URL providing a context node");
   let node = gDoc.querySelector(".big-horizontal");
-  gInspector.resolveRelativeURL("chrome://mochitests/content/chrome/toolkit/" +
+  gInspector.resolveRelativeURL("chrome://mochitests/content/chrome/" +
                                 "devtools/server/", node).then(url => {
-    is(url, "chrome://mochitests/content/chrome/toolkit/devtools/server/");
+    is(url, "chrome://mochitests/content/chrome/devtools/server/");
     runNextTest();
   });
 });
 
 addTest(function() {
   gInspector = gDoc = null;
   runNextTest();
 });
--- a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
@@ -17,17 +17,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
 
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const wasTesting = DevToolsUtils.testing;
 SimpleTest.registerCleanupFunction(() => DevToolsUtils.testing = wasTesting);
 
-const PATH = "http://mochi.test:8888/chrome/toolkit/devtools/server/tests/mochitest/";
+const PATH = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/";
 const BASE_IMAGE = PATH + "inspector-delay-image-response.sjs";
 const DELAYED_IMAGE = BASE_IMAGE + "?delay=300";
 const TIMEOUT_IMAGE = BASE_IMAGE + "?delay=50000";
 const NONEXISTENT_IMAGE = PATH + "this-does-not-exist.png";
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
--- a/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
@@ -16,17 +16,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
 
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const wasTesting = DevToolsUtils.testing;
 SimpleTest.registerCleanupFunction(() => DevToolsUtils.testing = wasTesting);
 
-const PATH = "http://mochi.test:8888/chrome/toolkit/devtools/server/tests/mochitest/";
+const PATH = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/";
 const BASE_IMAGE = PATH + "inspector-delay-image-response.sjs";
 const DELAYED_IMAGE = BASE_IMAGE + "?delay=300";
 const TIMEOUT_IMAGE = BASE_IMAGE + "?delay=50000";
 const NONEXISTENT_IMAGE = PATH + "this-does-not-exist.png";
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   runNextTest();
--- a/devtools/server/tests/mochitest/test_registerActor.html
+++ b/devtools/server/tests/mochitest/test_registerActor.html
@@ -21,17 +21,17 @@ window.onload = function() {
   var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
   var {DebuggerClient} = require("devtools/shared/client/main");
   var {DebuggerServer} = require("devtools/server/main");
   Cu.import("resource://gre/modules/Services.jsm");
 
   SimpleTest.waitForExplicitFinish();
 
   var {ActorRegistryFront} = require("devtools/server/actors/actor-registry");
-  var actorURL = "chrome://mochitests/content/chrome/toolkit/devtools/server/tests/mochitest/hello-actor.js";
+  var actorURL = "chrome://mochitests/content/chrome/devtools/server/tests/mochitest/hello-actor.js";
 
   if (!DebuggerServer.initialized) {
     DebuggerServer.init();
     DebuggerServer.addBrowserActors();
   }
 
   gClient = new DebuggerClient(DebuggerServer.connectPipe());
   gClient.connect(function onConnect() {
--- a/devtools/server/tests/mochitest/test_setupInParentChild.html
+++ b/devtools/server/tests/mochitest/test_setupInParentChild.html
@@ -63,17 +63,17 @@ function runTests() {
     let args = msg.json;
 
     is(args[0], 1, "Got first numeric argument");
     is(args[1], "two", "Got second string argument");
     is(args[2].three, true, "Got last JSON argument");
 
     // Ask the child to call setupInParent
     DebuggerServer.setupInChild({
-      module: "chrome://mochitests/content/chrome/toolkit/devtools/server/tests/mochitest/setup-in-child.js",
+      module: "chrome://mochitests/content/chrome/devtools/server/tests/mochitest/setup-in-child.js",
       setupChild: "callParent"
     });
   };
   ppmm.addMessageListener("test:setupChild", onChild);
 
   // Wait also for a reponse from setupInParent called from setup-in-child.js
   let onParent = (_, topic, args) => {
     Services.obs.removeObserver(onParent, "test:setupParent", false);
@@ -84,17 +84,17 @@ function runTests() {
 
     cleanup();
   };
   Services.obs.addObserver(onParent, "test:setupParent", false);
 
   // Instanciate e10s machinery and call setupInChild
   DebuggerServer.connectToChild(conn, iframe).then(actor => {
     DebuggerServer.setupInChild({
-      module: "chrome://mochitests/content/chrome/toolkit/devtools/server/tests/mochitest/setup-in-child.js",
+      module: "chrome://mochitests/content/chrome/devtools/server/tests/mochitest/setup-in-child.js",
       setupChild: "setupChild",
       args: [1, "two", {three: true}]
     });
   });
 
   function cleanup() {
     client.close(function () {
       DebuggerServer.destroy();
--- a/devtools/server/tests/mochitest/test_unsafeDereference.html
+++ b/devtools/server/tests/mochitest/test_unsafeDereference.html
@@ -19,17 +19,17 @@ xray wrapper.
 
 Components.utils.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
 
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
   var iframe = document.createElement("iframe");
-  iframe.src = "http://mochi.test:8888/chrome/toolkit/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html";
+  iframe.src = "http://mochi.test:8888/chrome/devtools/server/tests/mochitest/nonchrome_unsafeDereference.html";
 
   iframe.onload = function () {
     var dbg = new Debugger;
     var contentDO = dbg.addDebuggee(iframe.contentWindow);
     var xhrDesc = contentDO.getOwnPropertyDescriptor('xhr');
 
     isnot(xhrDesc, undefined, "xhr should be visible as property of content global");
     isnot(xhrDesc.value, undefined, "xhr should have a value");
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@@ -436,17 +436,17 @@ DevToolsLoader.prototype = {
 
   /**
    * Sets whether the compartments loaded by this instance should be invisible
    * to the debugger.  Invisibility is needed for loaders that support debugging
    * of chrome code.  This is true of remote target environments, like Fennec or
    * B2G.  It is not the default case for desktop Firefox because we offer the
    * Browser Toolbox for chrome debugging there, which uses its own, separate
    * loader instance.
-   * @see browser/devtools/framework/ToolboxProcess.jsm
+   * @see devtools/client/framework/ToolboxProcess.jsm
    */
   invisibleToDebugger: Services.appinfo.name !== "Firefox"
 };
 
 // Export the standard instance of DevToolsLoader used by the tools.
 this.devtools = this.loader = new DevToolsLoader();
 
 this.require = this.devtools.require.bind(this.devtools);
--- a/devtools/shared/acorn/UPGRADING.md
+++ b/devtools/shared/acorn/UPGRADING.md
@@ -12,17 +12,17 @@ 2. Make sure that all tests pass:
 
        $ npm install .
        $ npm test
 
    If there are any test failures, do not upgrade to that version of acorn!
 
 3. Copy acorn.js to our tree:
 
-       $ cp acorn.js /path/to/mozilla-central/toolkit/devtools/acorn/acorn.js
+       $ cp acorn.js /path/to/mozilla-central/devtools/shared/acorn/acorn.js
 
 4. Copy acorn_loose.js to our tree:
 
-       $ cp acorn_loose.js /path/to/mozilla-central/toolkit/devtools/acorn/acorn_loose.js
+       $ cp acorn_loose.js /path/to/mozilla-central/devtools/shared/acorn/acorn_loose.js
 
 5. Copy util/walk.js to our tree:
 
-       $ cp util/walk.js /path/to/mozilla-central/toolkit/devtools/acorn/walk.js
+       $ cp util/walk.js /path/to/mozilla-central/devtools/shared/acorn/walk.js
--- a/devtools/shared/apps/Simulator.jsm
+++ b/devtools/shared/apps/Simulator.jsm
@@ -8,17 +8,17 @@ Components.utils.import("resource://gre/
 
 /**
  * TODO (Bug 1132453) The `Simulator` module is deprecated, and should be
  * removed once all simulator addons stop using it (see bug 1132452).
  *
  * If you want to register, unregister, or otherwise deal with installed
  * simulators, please use the `Simulators` module defined in:
  *
- *   browser/devtools/webide/modules/simulators.js
+ *   devtools/client/webide/modules/simulators.js
  */
 
 const EXPORTED_SYMBOLS = ["Simulator"];
 
 const Simulator = {
   _simulators: {},
 
   register: function (name, simulator) {
--- a/devtools/shared/gcli/source/docs/index.md
+++ b/devtools/shared/gcli/source/docs/index.md
@@ -52,17 +52,17 @@ Other sources of GCLI documentation:
 - [Writing Commands](writing-commands.md)
 - [Writing Types](writing-types.md)
 - [Developing GCLI](developing-gcli.md)
 - [Writing Tests](writing-tests.md) / [Running Tests](running-tests.md)
 - [The Design of GCLI](design.md)
 - Source
   - The most up-to-date source is in [this Github repository](https://github.com/joewalker/gcli/).
   - When a feature is 'done' it's merged into the [Mozilla clone](https://github.com/mozilla/gcli/).
-  - From which it flows into [Mozilla Central](https://hg.mozilla.org/mozilla-central/file/tip/browser/devtools/commandline).
+  - From which it flows into [Mozilla Central](https://hg.mozilla.org/mozilla-central/file/tip/devtools/client/commandline).
 - [Demo of GCLI](http://mozilla.github.com/gcli/) with an arbitrary set of demo
   commands
 - Other Documentation
   - [Embedding docs](https://github.com/mozilla/gcli/blob/master/docs/index.md)
   - [Status page](http://mozilla.github.com/devtools/2011/status.html#gcli)
 
 
 ## Accessibility
--- a/devtools/shared/gcli/source/docs/writing-commands.md
+++ b/devtools/shared/gcli/source/docs/writing-commands.md
@@ -88,17 +88,17 @@ depends on what context you are writing 
 
 GCLI supports Mozilla style localization. To add a command that will only ever
 be used embedded in Firefox, this is the way to go. Your strings should be
 stored in ``toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties``,
 And you should access them using ``let l10n = require("gcli/l10n")`` and then
 ``l10n.lookup(...)`` or ``l10n.lookupFormat()``
 
 For examples of existing commands, take a look in
-``browser/devtools/webconsole/GcliCommands.jsm``, which contains most of the
+``devtools/client/webconsole/GcliCommands.jsm``, which contains most of the
 current GCLI commands. If you will be adding a number of new commands, then
 consider starting a new JSM.
 
 Your command will then look something like this:
 
     gcli.addItems([{
       name: 'greet',
       description: gcli.lookup("greetDesc")
--- a/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
+++ b/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-# A script to generate toolkit/devtools/server/CoreDump.pb.{h,cc} from
-# toolkit/devtools/server/CoreDump.proto. This script assumes you have
+# A script to generate devtools/server/CoreDump.pb.{h,cc} from
+# devtools/server/CoreDump.proto. This script assumes you have
 # downloaded and installed the protocol buffer compiler, and that it is either
 # on your $PATH or located at $PROTOC_PATH.
 #
 # These files were last compiled with libprotoc 2.4.1.
 
 set -e
 
 cd $(dirname $0)
--- a/devtools/shared/jsbeautify/UPGRADING.md
+++ b/devtools/shared/jsbeautify/UPGRADING.md
@@ -1,37 +1,37 @@
 # UPGRADING
 
 1. `git clone https://github.com/beautify-web/js-beautify.git`
 
-2. Copy `js/lib/beautify.js` to `toolkit/devtools/jsbeautify/src/beautify-js.js`
+2. Copy `js/lib/beautify.js` to `devtools/shared/jsbeautify/src/beautify-js.js`
 
 3. Remove the acorn section from the file and add the following to the top:
 
  ```
  const acorn = require("acorn/acorn");
  ```
 
 4. Just above `function Beautifier(js_source_text, options) {` add:
 
  ```
  exports.jsBeautify = js_beautify;
  ```
 
-5. Copy `beautify-html.js` to `toolkit/devtools/jsbeautify/src/beautify-html.js`
+5. Copy `beautify-html.js` to `devtools/shared/jsbeautify/src/beautify-html.js`
 
 6. Replace the require blocks at the bottom of the file with:
 
  ```
  var beautify = require('devtools/shared/jsbeautify/beautify');
 
  exports.htmlBeautify = function(html_source, options) {
     return style_html(html_source, options, beautify.js, beautify.css);
  };
  ```
 
-7. Copy `beautify-css.js` to `toolkit/devtools/jsbeautify/src/beautify-css.js`
+7. Copy `beautify-css.js` to `devtools/shared/jsbeautify/src/beautify-css.js`
 
 8. Replace the global define block at the bottom of the file with:
  ```
  exports.cssBeautify = css_beautify;
  ```
-9. Copy `js/test/beautify-tests.js` to `toolkit/devtools/jsbeautify/src/beautify-tests.js`
+9. Copy `js/test/beautify-tests.js` to `devtools/shared/jsbeautify/src/beautify-tests.js`
--- a/devtools/shared/pretty-fast/UPGRADING.md
+++ b/devtools/shared/pretty-fast/UPGRADING.md
@@ -1,7 +1,7 @@
 # UPGRADING
 
 1. `git clone https://github.com/mozilla/pretty-fast.git`
 
-2. Copy `pretty-fast/pretty-fast.js` to `toolkit/devtools/pretty-fast/pretty-fast.js`
+2. Copy `pretty-fast/pretty-fast.js` to `devtools/shared/pretty-fast/pretty-fast.js`
 
-3. Copy `pretty-fast/test.js` to `toolkit/devtools/pretty-fast/tests/unit/test.js`
+3. Copy `pretty-fast/test.js` to `devtools/shared/pretty-fast/tests/unit/test.js`
--- a/devtools/shared/shared/framerate.js
+++ b/devtools/shared/shared/framerate.js
@@ -4,17 +4,17 @@
 "use strict";
 
 const { on, once, off, emit } = require("sdk/event/core");
 const { Class } = require("sdk/core/heritage");
 
 /**
  * A very simple utility for monitoring framerate. Takes a `tabActor`
  * and monitors framerate over time. The actor wrapper around this
- * can be found at toolkit/devtools/server/actors/framerate.js
+ * can be found at devtools/server/actors/framerate.js
  */
 var Framerate = exports.Framerate = Class({
   initialize: function (tabActor) {
     this.tabActor = tabActor;
     this._contentWin = tabActor.window;
     this._onRefreshDriverTick = this._onRefreshDriverTick.bind(this);
     this._onGlobalCreated = this._onGlobalCreated.bind(this);
     on(this.tabActor, "window-ready", this._onGlobalCreated);
--- a/devtools/shared/shared/tests/unit/.eslintrc
+++ b/devtools/shared/shared/tests/unit/.eslintrc
@@ -1,4 +1,4 @@
 {
   // Extend from the common devtools xpcshell eslintrc config.
-  "extends": "../../../../../browser/devtools/.eslintrc.xpcshell"
+  "extends": "../../../../../devtools/client/.eslintrc.xpcshell"
 }
--- a/devtools/shared/shared/timeline.js
+++ b/devtools/shared/shared/timeline.js
@@ -4,17 +4,17 @@
 "use strict";
 
 /**
  * Many Gecko operations (painting, reflows, restyle, ...) can be tracked
  * in real time. A marker is a representation of one operation. A marker
  * has a name, start and end timestamps. Markers are stored in docShells.
  *
  * This module exposes this tracking mechanism. To use with devtools' RDP,
- * use toolkit/devtools/server/actors/timeline.js directly.
+ * use devtools/server/actors/timeline.js directly.
  *
  * To start/stop recording markers:
  *   timeline.start()
  *   timeline.stop()
  *   timeline.isRecording()
  *
  * When markers are available, an event is emitted:
  *   timeline.on("markers", function(markers) {...})
--- a/devtools/shared/shared/worker.js
+++ b/devtools/shared/shared/worker.js
@@ -24,17 +24,17 @@
 
 var MESSAGE_COUNTER = 0;
 
 /**
  * Creates a wrapper around a ChromeWorker, providing easy
  * communication to offload demanding tasks. The corresponding URL
  * must implement the interface provided by `devtools/toolkit/shared/worker-helper`.
  *
- * @see `./browser/devtools/shared/widgets/GraphsWorker.js`
+ * @see `./devtools/client/shared/widgets/GraphsWorker.js`
  *
  * @param {string} url
  *        The URL of the worker.
  * @param Object opts
  *        An option with the following optional fields:
  *        - name: a name that will be printed with logs
  *        - verbose: log incoming and outgoing messages
  */
@@ -110,17 +110,17 @@ DevToolsWorker.prototype.destroy = funct
 
 DevToolsWorker.prototype.onError = function({ message, filename, lineno }) {
   dump(new Error(message + " @ " + filename + ":" + lineno) + "\n");
 };
 
 /**
  * Takes a function and returns a Worker-wrapped version of the same function.
  * Returns a promise upon resolution.
- * @see `./toolkit/devtools/shared/tests/browser/browser_devtools-worker-03.js
+ * @see `./devtools/shared/shared/tests/browser/browser_devtools-worker-03.js
  *
  * * * * ! ! ! This should only be used for tests or A/B testing performance ! ! ! * * * * * *
  *
  * The original function must:
  *
  * Be a pure function, that is, not use any variables not declared within the
  * function, or its arguments.
  *
--- a/devtools/shared/sourcemap/UPGRADING.md
+++ b/devtools/shared/sourcemap/UPGRADING.md
@@ -3,11 +3,11 @@ upgrade our tree's copy of the built fil
 
 To upgrade the source-map library:
 
     $ git clone https://github.com/mozilla/source-map.git
     $ cd source-map
     $ git checkout <latest-tagged-version>
     $ npm install
     $ npm run-script build  -or-  nodejs Makefile.dryice.js (if you have issues with npm)
-    $ cp dist/source-map.js /path/to/mozilla-central/toolkit/devtools/sourcemap/source-map.js
-    $ cp dist/test/* /path/to/mozilla-central/toolkit/devtools/sourcemap/tests/unit/
+    $ cp dist/source-map.js /path/to/mozilla-central/devtools/shared/sourcemap/source-map.js
+    $ cp dist/test/* /path/to/mozilla-central/devtools/shared/sourcemap/tests/unit/
 
--- a/devtools/shared/tern/README
+++ b/devtools/shared/tern/README
@@ -2,9 +2,9 @@ This is the Tern code-analysis engine pa
 
 Tern is a stand-alone code-analysis engine for JavaScript. It is intended to be used with a code editor plugin to enhance the editor's support for intelligent JavaScript editing
 
 
 # Upgrade
 
 Currently used version is 0.6.2.  To upgrade, download the latest release from http://ternjs.net/, and copy the files from lib/ into this directory.
 
-You may also need to update the CodeMirror plugin found in browser/devtools/sourceeditor/codemirror/tern, but it will most likely work without updating.
+You may also need to update the CodeMirror plugin found in devtools/client/sourceeditor/codemirror/tern, but it will most likely work without updating.
--- a/devtools/shared/webconsole/server-logger-monitor.js
+++ b/devtools/shared/webconsole/server-logger-monitor.js
@@ -28,17 +28,17 @@ const acceptableHeaders = ["x-chromelogg
  *
  * Since child processes can't register HTTP event observer they use
  * this module to do the observing in the parent process. This monitor
  * is loaded through DebuggerServerConnection.setupInParent() that is executed
  * from within the child process. The execution is done by {@ServerLoggingListener}.
  * The monitor listens to HTTP events and forwards it into the right child process.
  *
  * Read more about the architecture:
- * https://github.com/mozilla/gecko-dev/blob/fx-team/toolkit/devtools/server/docs/actor-e10s-handling.md
+ * https://github.com/mozilla/gecko-dev/blob/fx-team/devtools/server/docs/actor-e10s-handling.md
  */
 var ServerLoggerMonitor = {
   // Initialization
 
   initialize: function() {
     this.onChildMessage = this.onChildMessage.bind(this);
     this.onDisconnectChild = this.onDisconnectChild.bind(this);
     this.onExamineResponse = this.onExamineResponse.bind(this);
--- a/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
+++ b/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the cd() function</p>
 
-<iframe id="content-iframe" src="http://example.com/chrome/toolkit/devtools/webconsole/test/sandboxed_iframe.html"></iframe>
+<iframe id="content-iframe" src="http://example.com/chrome/devtools/shared/webconsole/test/sandboxed_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
 let gState;
 
 function startTest()
 {
--- a/devtools/shared/webconsole/test/test_jsterm_last_result.html
+++ b/devtools/shared/webconsole/test/test_jsterm_last_result.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the $_ getter</p>
 
-<iframe id="content-iframe" src="http://example.com/chrome/toolkit/devtools/webconsole/test/sandboxed_iframe.html"></iframe>
+<iframe id="content-iframe" src="http://example.com/chrome/devtools/shared/webconsole/test/sandboxed_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 let gState;
 
 function evaluateJS(input, callback) {
   return new Promise((resolve, reject) => {
     gState.client.evaluateJSAsync(input, response => {
--- a/devtools/shared/webconsole/test/test_network_get.html
+++ b/devtools/shared/webconsole/test/test_network_get.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (GET request)</p>
 
-<iframe src="http://example.com/chrome/toolkit/devtools/webconsole/test/network_requests_iframe.html"></iframe>
+<iframe src="http://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
   attachConsole(["NetworkActivity"], onAttach, true);
--- a/devtools/shared/webconsole/test/test_network_longstring.html
+++ b/devtools/shared/webconsole/test/test_network_longstring.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test that the network actor uses the LongStringActor</p>
 
-<iframe src="http://example.com/chrome/toolkit/devtools/webconsole/test/network_requests_iframe.html"></iframe>
+<iframe src="http://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
--- a/devtools/shared/webconsole/test/test_network_post.html
+++ b/devtools/shared/webconsole/test/test_network_post.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (POST request)</p>
 
-<iframe src="http://example.com/chrome/toolkit/devtools/webconsole/test/network_requests_iframe.html"></iframe>
+<iframe src="http://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
 function startTest()
 {
   removeEventListener("load", startTest);
 
--- a/devtools/shared/webconsole/test/test_network_security-hpkp.html
+++ b/devtools/shared/webconsole/test/test_network_security-hpkp.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (HPKP detection)</p>
 
-<iframe src="https://example.com/chrome/toolkit/devtools/webconsole/test/network_requests_iframe.html"></iframe>
+<iframe src="https://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
 let gCurrentTestCase = -1;
 const HPKP_PREF = "security.cert_pinning.process_headers_from_non_builtin_roots";
 
 // Static pins tested by unit/test_security-info-static-hpkp.js.
--- a/devtools/shared/webconsole/test/test_network_security-hsts.html
+++ b/devtools/shared/webconsole/test/test_network_security-hsts.html
@@ -6,17 +6,17 @@
   <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript;version=1.8" src="common.js"></script>
   <!-- Any copyright is dedicated to the Public Domain.
      - http://creativecommons.org/publicdomain/zero/1.0/ -->
 </head>
 <body>
 <p>Test for the network actor (HSTS detection)</p>
 
-<iframe src="https://example.com/chrome/toolkit/devtools/webconsole/test/network_requests_iframe.html"></iframe>
+<iframe src="https://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
 
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
 let gCurrentTestCase = -1;
 const TEST_CASES = [
   {
     desc: "no HSTS",
--- a/devtools/shared/webconsole/test/test_reflow.html
+++ b/devtools/shared/webconsole/test/test_reflow.html
@@ -37,17 +37,17 @@ function onAttach(aState, aResponse)
   client.addListener("reflowActivity", onReflowActivity);
   generateReflow();
 }
 
 // We are expecting 3 reflow events.
 let expectedEvents = [
   {
     interruptible: false,
-    sourceURL: "chrome://mochitests/content/chrome/toolkit/devtools/webconsole/test/test_reflow.html",
+    sourceURL: "chrome://mochitests/content/chrome/devtools/shared/webconsole/test/test_reflow.html",
     functionName: "generateReflow"
   },
   {
     interruptible: true,
     sourceURL: null,
     functionName: null
   },
   {
--- a/dom/base/ChromeUtils.h
+++ b/dom/base/ChromeUtils.h
@@ -18,24 +18,24 @@ namespace devtools {
 class HeapSnapshot;
 } // namespace devtools
 
 namespace dom {
 
 class ThreadSafeChromeUtils
 {
 public:
-  // Implemented in toolkit/devtools/heapsnapshot/HeapSnapshot.cpp
+  // Implemented in devtools/shared/heapsnapshot/HeapSnapshot.cpp
   static void SaveHeapSnapshot(GlobalObject& global,
                                JSContext* cx,
                                const HeapSnapshotBoundaries& boundaries,
                                nsAString& filePath,
                                ErrorResult& rv);
 
-  // Implemented in toolkit/devtools/heapsnapshot/HeapSnapshot.cpp
+  // Implemented in devtools/shared/heapsnapshot/HeapSnapshot.cpp
   static already_AddRefed<devtools::HeapSnapshot> ReadHeapSnapshot(GlobalObject& global,
                                                                    JSContext* cx,
                                                                    const nsAString& filePath,
                                                                    ErrorResult& rv);
 };
 
 class ChromeUtils : public ThreadSafeChromeUtils
 {
--- a/js/public/ProfilingStack.h
+++ b/js/public/ProfilingStack.h
@@ -70,17 +70,17 @@ class ProfileEntry
 
         // Union of all flags.
         ALL = IS_CPP_ENTRY|FRAME_LABEL_COPY|BEGIN_PSEUDO_JS|OSR,
 
         // Mask for removing all flags except the category information.
         CATEGORY_MASK = ~ALL
     };
 
-    // Keep these in sync with browser/devtools/performance/modules/global.js
+    // Keep these in sync with devtools/client/performance/modules/global.js
     enum class Category : uint32_t {
         OTHER    = 0x10,
         CSS      = 0x20,
         JS       = 0x40,
         GC       = 0x80,
         CC       = 0x100,
         NETWORK  = 0x200,
         GRAPHICS = 0x400,
--- a/js/src/asmjs/AsmJSFrameIterator.cpp
+++ b/js/src/asmjs/AsmJSFrameIterator.cpp
@@ -677,17 +677,17 @@ AsmJSProfilingFrameIterator::operator++(
 
     MOZ_ASSERT(!done());
 }
 
 static const char*
 BuiltinToName(AsmJSExit::BuiltinKind builtin)
 {
     // Note: this label is regexp-matched by
-    // browser/devtools/profiler/cleopatra/js/parserWorker.js.
+    // devtools/client/profiler/cleopatra/js/parserWorker.js.
 
     switch (builtin) {
       case AsmJSExit::Builtin_ToInt32:   return "ToInt32 (in asm.js)";
 #if defined(JS_CODEGEN_ARM)
       case AsmJSExit::Builtin_IDivMod:   return "software idivmod (in asm.js)";
       case AsmJSExit::Builtin_UDivMod:   return "software uidivmod (in asm.js)";
       case AsmJSExit::Builtin_AtomicCmpXchg:  return "Atomics.compareExchange (in asm.js)";
       case AsmJSExit::Builtin_AtomicXchg:     return "Atomics.exchange (in asm.js)";
@@ -721,17 +721,17 @@ const char*
 AsmJSProfilingFrameIterator::label() const
 {
     MOZ_ASSERT(!done());
 
     // Use the same string for both time inside and under so that the two
     // entries will be coalesced by the profiler.
     //
     // NB: these labels are regexp-matched by
-    //     browser/devtools/profiler/cleopatra/js/parserWorker.js.
+    //     devtools/client/profiler/cleopatra/js/parserWorker.js.
     const char* jitFFIDescription = "fast FFI trampoline (in asm.js)";
     const char* slowFFIDescription = "slow FFI trampoline (in asm.js)";
     const char* interruptDescription = "interrupt due to out-of-bounds or long execution (in asm.js)";
 
     switch (AsmJSExit::ExtractReasonKind(exitReason_)) {
       case AsmJSExit::Reason_None:
         break;
       case AsmJSExit::Reason_JitFFI:
--- a/js/src/vm/SPSProfiler.cpp
+++ b/js/src/vm/SPSProfiler.cpp
@@ -309,17 +309,17 @@ SPSProfiler::pop()
  * allowed to fail. This function cannot trigger a GC because it could finalize
  * some scripts, resize the hash table of profile strings, and invalidate the
  * AddPtr held while invoking allocProfileString.
  */
 const char*
 SPSProfiler::allocProfileString(JSScript* script, JSFunction* maybeFun)
 {
     // Note: this profiler string is regexp-matched by
-    // browser/devtools/profiler/cleopatra/js/parserWorker.js.
+    // devtools/client/profiler/cleopatra/js/parserWorker.js.
 
     // Get the function name, if any.
     JSAtom* atom = maybeFun ? maybeFun->displayAtom() : nullptr;
 
     // Get the script filename, if any, and its length.
     const char* filename = script->filename();
     if (filename == nullptr)
         filename = "<unknown>";
--- a/mobile/android/chrome/content/RemoteDebugger.js
+++ b/mobile/android/chrome/content/RemoteDebugger.js
@@ -34,17 +34,17 @@ var RemoteDebugger = {
    *          },
    *          server: {
    *            host,
    *            port
    *          }
    *        }
    *        Specific authentication modes may include additional fields.  Check
    *        the different |allowConnection| methods in
-   *        toolkit/devtools/security/auth.js.
+   *        devtools/shared/security/auth.js.
    * @return An AuthenticationResult value.
    *         A promise that will be resolved to the above is also allowed.
    */
   allowConnection(session) {
     if (this._promptingForAllow) {
       // Don't stack connection prompts if one is already open
       return DebuggerServer.AuthenticationResult.DENY;
     }
--- a/python/mozbuild/mozbuild/test/test_testing.py
+++ b/python/mozbuild/mozbuild/test/test_testing.py
@@ -137,26 +137,26 @@ ALL_TESTS_JSON = b'''
             "manifest": "/home/chris/m-c/image/test/browser/browser.ini",
             "name": "browser_bug666317.js",
             "path": "/home/chris/m-c/obj-dbg/_tests/testing/mochitest/browser/image/test/browser/browser_bug666317.js",
             "relpath": "image/test/browser/browser_bug666317.js",
             "skip-if": "e10s # Bug 948194 - Decoded Images seem to not be discarded on memory-pressure notification with e10s enabled",
             "subsuite": ""
         }
    ],
-   "browser/devtools/markupview/test/browser_markupview_copy_image_data.js": [
+   "devtools/client/markupview/test/browser_markupview_copy_image_data.js": [
         {
-            "dir_relpath": "browser/devtools/markupview/test",
-            "file_relpath": "browser/devtools/markupview/test/browser_markupview_copy_image_data.js",
+            "dir_relpath": "devtools/client/markupview/test",
+            "file_relpath": "devtools/client/markupview/test/browser_markupview_copy_image_data.js",
             "flavor": "browser-chrome",
-            "here": "/home/chris/m-c/obj-dbg/_tests/testing/mochitest/browser/browser/devtools/markupview/test",
-            "manifest": "/home/chris/m-c/browser/devtools/markupview/test/browser.ini",
+            "here": "/home/chris/m-c/obj-dbg/_tests/testing/mochitest/browser/devtools/client/markupview/test",
+            "manifest": "/home/chris/m-c/devtools/client/markupview/test/browser.ini",
             "name": "browser_markupview_copy_image_data.js",
-            "path": "/home/chris/m-c/obj-dbg/_tests/testing/mochitest/browser/browser/devtools/markupview/test/browser_markupview_copy_image_data.js",
-            "relpath": "browser/devtools/markupview/test/browser_markupview_copy_image_data.js",
+            "path": "/home/chris/m-c/obj-dbg/_tests/testing/mochitest/browser/devtools/client/markupview/test/browser_markupview_copy_image_data.js",
+            "relpath": "devtools/client/markupview/test/browser_markupview_copy_image_data.js",
             "subsuite": "devtools",
             "tags": "devtools"
         }
    ]
 }'''.strip()
 
 
 class Base(unittest.TestCase):
--- a/testing/runtimes/mochitest-devtools-chrome.runtimes.json
+++ b/testing/runtimes/mochitest-devtools-chrome.runtimes.json
@@ -1,820 +1,820 @@
 {
   "excluded_test_average": 1606, 
   "runtimes": {
-    "browser/devtools/animationinspector/test/browser_animation_empty_on_invalid_nodes.js": 11367, 
-    "browser/devtools/animationinspector/test/browser_animation_iterationCount_hidden_by_default.js": 5368, 
-    "browser/devtools/animationinspector/test/browser_animation_panel_exists.js": 5252, 
-    "browser/devtools/animationinspector/test/browser_animation_participate_in_inspector_update.js": 8774, 
-    "browser/devtools/animationinspector/test/browser_animation_play_pause_button.js": 6102, 
-    "browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js": 5674, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js": 6206, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_compositor_icon.js": 4905, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_destroy.js": 5266, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js": 9402, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js": 8588, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js": 7554, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_meta_data.js": 5171, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_scrubber_delayed.js": 4850, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_scrubber_enabled.js": 7386, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_scrubber_moves.js": 5733, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_state_after_pause.js": 5371, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_target_nodes.js": 8338, 
-    "browser/devtools/animationinspector/test/browser_animation_rate_select_shows_presets.js": 5335, 
-    "browser/devtools/animationinspector/test/browser_animation_refresh_on_added_animation.js": 9023, 
-    "browser/devtools/animationinspector/test/browser_animation_refresh_on_removed_animation.js": 12069, 
-    "browser/devtools/animationinspector/test/browser_animation_refresh_when_active.js": 10349, 
-    "browser/devtools/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js": 8856, 
-    "browser/devtools/animationinspector/test/browser_animation_setting_currentTime_works_and_pauses.js": 7295, 
-    "browser/devtools/animationinspector/test/browser_animation_setting_playbackRate_works.js": 5351, 
-    "browser/devtools/animationinspector/test/browser_animation_shows_player_on_valid_node.js": 8520, 
-    "browser/devtools/animationinspector/test/browser_animation_target_highlight_select.js": 11921, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_animates.js": 4759, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_displays_with_pref.js": 4454, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_header.js": 4484, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_is_enabled.js": 6885, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_exists.js": 4526, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_movable.js": 3945, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_shows_delay.js": 4708, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_shows_iterations.js": 4691, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_ui.js": 4491, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_waits_for_delay.js": 3777, 
-    "browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js": 5870, 
-    "browser/devtools/animationinspector/test/browser_animation_toggle_button_toggles_animations.js": 5753, 
-    "browser/devtools/animationinspector/test/browser_animation_toggle_button_updates_playerWidgets.js": 5825, 
-    "browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js": 5290, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_changes.js": 5799, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js": 10748, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_rate_changes.js": 5908, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_time_changes.js": 6307, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-highlight.js": 3366, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js": 4232, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js": 3645, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-slider-02.js": 3407, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js": 3251, 
-    "browser/devtools/commandline/test/browser_cmd_addon.js": 3636, 
-    "browser/devtools/commandline/test/browser_cmd_csscoverage_startstop.js": 3888, 
-    "browser/devtools/commandline/test/browser_cmd_highlight_01.js": 13146, 
-    "browser/devtools/commandline/test/browser_cmd_pagemod_export.js": 3659, 
-    "browser/devtools/commandline/test/browser_cmd_screenshot.js": 6829, 
-    "browser/devtools/commandline/test/browser_gcli_exec.js": 3804, 
-    "browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js": 4439, 
-    "browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js": 4516, 
-    "browser/devtools/debugger/test/browser_dbg_addon-modules.js": 5270, 
-    "browser/devtools/debugger/test/browser_dbg_addon-panels.js": 5365, 
-    "browser/devtools/debugger/test/browser_dbg_addon-sources.js": 5104, 
-    "browser/devtools/debugger/test/browser_dbg_auto-pretty-print-01.js": 3801, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-01.js": 3330, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-02.js": 3478, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-03.js": 3533, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-04.js": 3475, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-06.js": 3521, 
-    "browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js": 3606, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js": 3348, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js": 5630, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js": 3231, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js": 3460, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js": 3386, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js": 4856, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js": 3566, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location.js": 3565, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location2.js": 4238, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js": 21298, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-button-01.js": 3718, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-button-02.js": 3197, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-condition-thrown-message.js": 4440, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js": 3811, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu.js": 10667, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js": 7390, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-editor.js": 3693, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-eval.js": 3177, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-highlight.js": 3582, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-new-script.js": 3863, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-other-tabs.js": 5351, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-pane.js": 3835, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-reload.js": 3734, 
-    "browser/devtools/debugger/test/browser_dbg_bug-896139.js": 4069, 
-    "browser/devtools/debugger/test/browser_dbg_closure-inspection.js": 7951, 
-    "browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js": 5206, 
-    "browser/devtools/debugger/test/browser_dbg_cmd-break.js": 4698, 
-    "browser/devtools/debugger/test/browser_dbg_cmd-dbg.js": 5582, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-01.js": 10253, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-02.js": 4188, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-03.js": 3597, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-04.js": 4432, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-05.js": 5954, 
-    "browser/devtools/debugger/test/browser_dbg_console-eval.js": 3984, 
-    "browser/devtools/debugger/test/browser_dbg_console-named-eval.js": 3581, 
-    "browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js": 3783, 
-    "browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js": 3682, 
-    "browser/devtools/debugger/test/browser_dbg_editor-contextmenu.js": 3594, 
-    "browser/devtools/debugger/test/browser_dbg_editor-mode.js": 3764, 
-    "browser/devtools/debugger/test/browser_dbg_file-reload.js": 3285, 
-    "browser/devtools/debugger/test/browser_dbg_function-display-name.js": 3674, 
-    "browser/devtools/debugger/test/browser_dbg_hit-counts-01.js": 3313, 
-    "browser/devtools/debugger/test/browser_dbg_host-layout.js": 15477, 
-    "browser/devtools/debugger/test/browser_dbg_iframes.js": 3291, 
-    "browser/devtools/debugger/test/browser_dbg_interrupts.js": 3283, 
-    "browser/devtools/debugger/test/browser_dbg_listtabs-02.js": 3207, 
-    "browser/devtools/debugger/test/browser_dbg_location-changes-01-simple.js": 4432, 
-    "browser/devtools/debugger/test/browser_dbg_location-changes-02-blank.js": 3740, 
-    "browser/devtools/debugger/test/browser_dbg_location-changes-03-new.js": 4061, 
-    "browser/devtools/debugger/test/browser_dbg_location-changes-04-breakpoint.js": 6050, 
-    "browser/devtools/debugger/test/browser_dbg_on-pause-highlight.js": 3557, 
-    "browser/devtools/debugger/test/browser_dbg_optimized-out-vars.js": 3872, 
-    "browser/devtools/debugger/test/browser_dbg_pause-exceptions-01.js": 4701, 
-    "browser/devtools/debugger/test/browser_dbg_pause-exceptions-02.js": 4798, 
-    "browser/devtools/debugger/test/browser_dbg_pause-no-step.js": 3623, 
-    "browser/devtools/debugger/test/browser_dbg_pause-resume.js": 3218, 
-    "browser/devtools/debugger/test/browser_dbg_pause-warning.js": 5224, 
-    "browser/devtools/debugger/test/browser_dbg_paused-keybindings.js": 4147, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-01.js": 3456, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-02.js": 3491, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-03.js": 4160, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-04.js": 3875, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-05.js": 3401, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-06.js": 3350, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-07.js": 3481, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-08.js": 4316, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-09.js": 4008, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-10.js": 3297, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-11.js": 4315, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-12.js": 3553, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-13.js": 3617, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-on-paused.js": 4450, 
-    "browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js": 3650, 
-    "browser/devtools/debugger/test/browser_dbg_promises-allocation-stack.js": 3555, 
-    "browser/devtools/debugger/test/browser_dbg_promises-fulfillment-stack.js": 3563, 
-    "browser/devtools/debugger/test/browser_dbg_promises-rejection-stack.js": 3561, 
-    "browser/devtools/debugger/test/browser_dbg_reload-preferred-script-01.js": 3405, 
-    "browser/devtools/debugger/test/browser_dbg_reload-preferred-script-02.js": 3370, 
-    "browser/devtools/debugger/test/browser_dbg_reload-preferred-script-03.js": 3512, 
-    "browser/devtools/debugger/test/browser_dbg_reload-same-script.js": 6132, 
-    "browser/devtools/debugger/test/browser_dbg_scripts-switching-01.js": 4649, 
-    "browser/devtools/debugger/test/browser_dbg_scripts-switching-02.js": 4648, 
-    "browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js": 3401, 
-    "browser/devtools/debugger/test/browser_dbg_search-autofill-identifier.js": 3673, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-01.js": 5445, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-02.js": 5529, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-03.js": 4785, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-04.js": 3606, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-01.js": 5509, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-02.js": 5151, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-03.js": 5075, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-04.js": 4315, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-05.js": 5778, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-06.js": 7162, 
-    "browser/devtools/debugger/test/browser_dbg_search-popup-jank.js": 5101, 
-    "browser/devtools/debugger/test/browser_dbg_search-sources-01.js": 5406, 
-    "browser/devtools/debugger/test/browser_dbg_search-sources-02.js": 5483, 
-    "browser/devtools/debugger/test/browser_dbg_search-sources-03.js": 4172, 
-    "browser/devtools/debugger/test/browser_dbg_search-symbols.js": 6951, 
-    "browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-01.js": 4200, 
-    "browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-02.js": 4091, 
-    "browser/devtools/debugger/test/browser_dbg_searchbox-parse.js": 3359, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-01.js": 9963, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-02.js": 5140, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-03.js": 4781, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-04.js": 5407, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-05.js": 6144, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-01.js": 4983, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-02.js": 5341, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-03.js": 4432, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-04.js": 5492, 
-    "browser/devtools/debugger/test/browser_dbg_sources-bookmarklet.js": 3702, 
-    "browser/devtools/debugger/test/browser_dbg_sources-cache.js": 4659, 
-    "browser/devtools/debugger/test/browser_dbg_sources-contextmenu-01.js": 3952, 
-    "browser/devtools/debugger/test/browser_dbg_sources-contextmenu-02.js": 4246, 
-    "browser/devtools/debugger/test/browser_dbg_sources-eval-02.js": 3842, 
-    "browser/devtools/debugger/test/browser_dbg_sources-keybindings.js": 3758, 
-    "browser/devtools/debugger/test/browser_dbg_sources-labels.js": 3708, 
-    "browser/devtools/debugger/test/browser_dbg_sources-sorting.js": 3750, 
-    "browser/devtools/debugger/test/browser_dbg_split-console-paused-reload.js": 8976, 
-    "browser/devtools/debugger/test/browser_dbg_stack-01.js": 4215, 
-    "browser/devtools/debugger/test/browser_dbg_stack-02.js": 4585, 
-    "browser/devtools/debugger/test/browser_dbg_stack-03.js": 12530, 
-    "browser/devtools/debugger/test/browser_dbg_stack-04.js": 4387, 
-    "browser/devtools/debugger/test/browser_dbg_stack-05.js": 4647, 
-    "browser/devtools/debugger/test/browser_dbg_stack-06.js": 4572, 
-    "browser/devtools/debugger/test/browser_dbg_stack-07.js": 5815, 
-    "browser/devtools/debugger/test/browser_dbg_step-out.js": 5295, 
-    "browser/devtools/debugger/test/browser_dbg_terminate-on-tab-close.js": 4394, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-01.js": 3931, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-02.js": 3789, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-03.js": 4172, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-04.js": 3879, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-05.js": 3845, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-06.js": 3514, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-07.js": 4016, 
-    "browser/devtools/debugger/test/browser_dbg_tracing-08.js": 4805, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-01.js": 3687, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-02.js": 3784, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-03.js": 4105, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-04.js": 3796, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-05.js": 3961, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-06.js": 4789, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js": 4512, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-data.js": 3950, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-cancel.js": 4695, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-click.js": 3773, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-01.js": 16042, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-02.js": 5854, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-value.js": 8457, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-watch.js": 7097, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-01.js": 12423, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-02.js": 12976, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-03.js": 9968, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-04.js": 9092, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-05.js": 9445, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-pref.js": 4211, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-searchbox.js": 4036, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-01.js": 7696, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-02.js": 5491, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-03.js": 11403, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js": 5338, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js": 4651, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-hide-non-enums.js": 4392, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js": 11929, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js": 9352, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js": 5197, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js": 7427, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js": 6221, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js": 5290, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js": 5354, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js": 5345, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js": 5420, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js": 7074, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js": 5639, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js": 5955, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js": 6085, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js": 7112, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js": 6986, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js": 7907, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js": 6411, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js": 13041, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-01.js": 24723, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-02.js": 29720, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-03.js": 6593, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-webidl.js": 11423, 
-    "browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js": 5303, 
-    "browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js": 12206, 
-    "browser/devtools/fontinspector/test/browser_fontinspector.js": 5603, 
-    "browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js": 3612, 
-    "browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js": 3415, 
-    "browser/devtools/fontinspector/test/browser_fontinspector_theme-change.js": 3909, 
-    "browser/devtools/framework/test/browser_devtools_api.js": 3717, 
-    "browser/devtools/framework/test/browser_keybindings.js": 3679, 
-    "browser/devtools/framework/test/browser_keybindings_01.js": 4615, 
-    "browser/devtools/framework/test/browser_new_activation_workflow.js": 3551, 
-    "browser/devtools/framework/test/browser_toolbox_hosts.js": 6796, 
-    "browser/devtools/framework/test/browser_toolbox_hosts_size.js": 5268, 
-    "browser/devtools/framework/test/browser_toolbox_options.js": 5115, 
-    "browser/devtools/framework/test/browser_toolbox_options_disable_buttons.js": 4083, 
-    "browser/devtools/framework/test/browser_toolbox_options_disable_cache-01.js": 7633, 
-    "browser/devtools/framework/test/browser_toolbox_options_disable_cache-02.js": 9709, 
-    "browser/devtools/framework/test/browser_toolbox_tabsswitch_shortcuts.js": 6582, 
-    "browser/devtools/framework/test/browser_toolbox_theme_registration.js": 4244, 
-    "browser/devtools/framework/test/browser_toolbox_toggle.js": 9638, 
-    "browser/devtools/framework/test/browser_toolbox_tool_ready.js": 5819, 
-    "browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js": 6378, 
-    "browser/devtools/framework/test/browser_toolbox_view_source_04.js": 3626, 
-    "browser/devtools/framework/test/browser_toolbox_window_reload_target.js": 13041, 
-    "browser/devtools/framework/test/browser_toolbox_window_shortcuts.js": 4286, 
-    "browser/devtools/framework/test/browser_toolbox_window_title_changes.js": 4976, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs.js": 7142, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js": 3180, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_keybinding.js": 8701, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_menu.js": 3549, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_mutations.js": 4993, 
-    "browser/devtools/inspector/test/browser_inspector_delete-selected-node-01.js": 3520, 
-    "browser/devtools/inspector/test/browser_inspector_delete-selected-node-02.js": 4896, 
-    "browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js": 3535, 
-    "browser/devtools/inspector/test/browser_inspector_destroy-after-navigation.js": 4242, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-01.js": 3364, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-02.js": 5192, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-03.js": 4610, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-comments.js": 4905, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js": 3211, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_02.js": 4385, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_03.js": 3480, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_04.js": 3490, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_05.js": 4776, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-hover_01.js": 4612, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-hover_02.js": 3235, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-hover_03.js": 3435, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-iframes.js": 4939, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-inline.js": 8232, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_01.js": 4884, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_02.js": 4755, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_03.js": 3473, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_04.js": 3342, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-options.js": 4135, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js": 3197, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-rulers_02.js": 3188, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-selector_01.js": 3777, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-selector_02.js": 3276, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-xbl.js": 3550, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js": 4423, 
-    "browser/devtools/inspector/test/browser_inspector_iframe-navigation.js": 3472, 
-    "browser/devtools/inspector/test/browser_inspector_infobar_01.js": 4769, 
-    "browser/devtools/inspector/test/browser_inspector_initialization.js": 10479, 
-    "browser/devtools/inspector/test/browser_inspector_invalidate.js": 3653, 
-    "browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js": 3881, 
-    "browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts.js": 3813, 
-    "browser/devtools/inspector/test/browser_inspector_menu-01-sensitivity.js": 5519, 
-    "browser/devtools/inspector/test/browser_inspector_menu-01.js": 9344, 
-    "browser/devtools/inspector/test/browser_inspector_menu-02-copy-items.js": 3784, 
-    "browser/devtools/inspector/test/browser_inspector_menu-03-paste-items.js": 5441, 
-    "browser/devtools/inspector/test/browser_inspector_menu-04-other.js": 5088, 
-    "browser/devtools/inspector/test/browser_inspector_navigation.js": 5264, 
-    "browser/devtools/inspector/test/browser_inspector_pane-toggle-03.js": 3592, 
-    "browser/devtools/inspector/test/browser_inspector_picker-stop-on-destroy.js": 5700, 
-    "browser/devtools/inspector/test/browser_inspector_pseudoclass-lock.js": 5411, 
-    "browser/devtools/inspector/test/browser_inspector_reload-01.js": 3513, 
-    "browser/devtools/inspector/test/browser_inspector_reload-02.js": 3947, 
-    "browser/devtools/inspector/test/browser_inspector_remove-iframe-during-load.js": 3640, 
-    "browser/devtools/inspector/test/browser_inspector_search-01.js": 9354, 
-    "browser/devtools/inspector/test/browser_inspector_search-02.js": 6798, 
-    "browser/devtools/inspector/test/browser_inspector_search-03.js": 6803, 
-    "browser/devtools/inspector/test/browser_inspector_search-04.js": 4311, 
-    "browser/devtools/inspector/test/browser_inspector_search-05.js": 4759, 
-    "browser/devtools/inspector/test/browser_inspector_search-navigation.js": 8900, 
-    "browser/devtools/inspector/test/browser_inspector_search-reserved.js": 5376, 
-    "browser/devtools/inspector/test/browser_inspector_select-docshell.js": 3732, 
-    "browser/devtools/inspector/test/browser_inspector_select-last-selected.js": 10300, 
-    "browser/devtools/inspector/test/browser_inspector_sidebarstate.js": 7512, 
-    "browser/devtools/layoutview/test/browser_layoutview.js": 4816, 
-    "browser/devtools/layoutview/test/browser_layoutview_editablemodel.js": 5766, 
-    "browser/devtools/layoutview/test/browser_layoutview_editablemodel_stylerules.js": 4262, 
-    "browser/devtools/layoutview/test/browser_layoutview_update-after-navigation.js": 5688, 
-    "browser/devtools/layoutview/test/browser_layoutview_update-after-reload.js": 4557, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_01.js": 5509, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_02.js": 5719, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_03.js": 3242, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_04.js": 3475, 
-    "browser/devtools/markupview/test/browser_markupview_copy_image_data.js": 3848, 
-    "browser/devtools/markupview/test/browser_markupview_css_completion_style_attribute.js": 6180, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js": 3866, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js": 4209, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js": 3993, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js": 6812, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js": 3437, 
-    "browser/devtools/markupview/test/browser_markupview_events-overflow.js": 5318, 
-    "browser/devtools/markupview/test/browser_markupview_events.js": 8689, 
-    "browser/devtools/markupview/test/browser_markupview_events_form.js": 3199, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.0.js": 6250, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.1.js": 6640, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.11.1.js": 7257, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.2.js": 5715, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.3.js": 8079, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.4.js": 7983, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.6.js": 9979, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_1.7.js": 8661, 
-    "browser/devtools/markupview/test/browser_markupview_events_jquery_2.1.1.js": 7746, 
-    "browser/devtools/markupview/test/browser_markupview_html_edit_01.js": 8473, 
-    "browser/devtools/markupview/test/browser_markupview_html_edit_02.js": 8134, 
-    "browser/devtools/markupview/test/browser_markupview_html_edit_03.js": 6147, 
-    "browser/devtools/markupview/test/browser_markupview_image_tooltip.js": 3372, 
-    "browser/devtools/markupview/test/browser_markupview_image_tooltip_mutations.js": 3254, 
-    "browser/devtools/markupview/test/browser_markupview_keybindings_01.js": 3299, 
-    "browser/devtools/markupview/test/browser_markupview_keybindings_03.js": 3451, 
-    "browser/devtools/markupview/test/browser_markupview_keybindings_04.js": 4198, 
-    "browser/devtools/markupview/test/browser_markupview_links_01.js": 6352, 
-    "browser/devtools/markupview/test/browser_markupview_links_02.js": 4059, 
-    "browser/devtools/markupview/test/browser_markupview_links_03.js": 3707, 
-    "browser/devtools/markupview/test/browser_markupview_links_04.js": 5422, 
-    "browser/devtools/markupview/test/browser_markupview_links_05.js": 5892, 
-    "browser/devtools/markupview/test/browser_markupview_links_06.js": 7548, 
-    "browser/devtools/markupview/test/browser_markupview_links_07.js": 5762, 
-    "browser/devtools/markupview/test/browser_markupview_load_01.js": 10491, 
-    "browser/devtools/markupview/test/browser_markupview_mutation_01.js": 6098, 
-    "browser/devtools/markupview/test/browser_markupview_mutation_02.js": 3358, 
-    "browser/devtools/markupview/test/browser_markupview_navigation.js": 8466, 
-    "browser/devtools/markupview/test/browser_markupview_node_not_displayed_02.js": 5252, 
-    "browser/devtools/markupview/test/browser_markupview_pagesize_01.js": 4644, 
-    "browser/devtools/markupview/test/browser_markupview_pagesize_02.js": 4714, 
-    "browser/devtools/markupview/test/browser_markupview_search_01.js": 4275, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_01.js": 6499, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_03.js": 3526, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_04.js": 8442, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_05.js": 4825, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_06.js": 5136, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_07.js": 4537, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_08.js": 4726, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_09.js": 3390, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_10.js": 3329, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_12.js": 3714, 
-    "browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js": 5145, 
-    "browser/devtools/markupview/test/browser_markupview_toggle_01.js": 3730, 
-    "browser/devtools/markupview/test/browser_markupview_toggle_02.js": 3691, 
-    "browser/devtools/markupview/test/browser_markupview_toggle_03.js": 4166, 
-    "browser/devtools/markupview/test/browser_markupview_update-on-navigtion.js": 3818, 
-    "browser/devtools/netmonitor/har/test/browser_net_har_copy_all_as_har.js": 4078, 
-    "browser/devtools/netmonitor/test/browser_net_aaa_leaktest.js": 3776, 
-    "browser/devtools/netmonitor/test/browser_net_accessibility-01.js": 9465, 
-    "browser/devtools/netmonitor/test/browser_net_accessibility-02.js": 9419, 
-    "browser/devtools/netmonitor/test/browser_net_api-calls.js": 3406, 
-    "browser/devtools/netmonitor/test/browser_net_autoscroll.js": 10638, 
-    "browser/devtools/netmonitor/test/browser_net_cached-status.js": 3817, 
-    "browser/devtools/netmonitor/test/browser_net_complex-params.js": 4835, 
-    "browser/devtools/netmonitor/test/browser_net_content-type.js": 5359, 
-    "browser/devtools/netmonitor/test/browser_net_copy_image_as_data_uri.js": 4297, 
-    "browser/devtools/netmonitor/test/browser_net_copy_params.js": 4402, 
-    "browser/devtools/netmonitor/test/browser_net_copy_response.js": 4343, 
-    "browser/devtools/netmonitor/test/browser_net_curl-utils.js": 3531, 
-    "browser/devtools/netmonitor/test/browser_net_details-no-duplicated-content.js": 4121, 
-    "browser/devtools/netmonitor/test/browser_net_filter-01.js": 7654, 
-    "browser/devtools/netmonitor/test/browser_net_filter-02.js": 10866, 
-    "browser/devtools/netmonitor/test/browser_net_filter-03.js": 10641, 
-    "browser/devtools/netmonitor/test/browser_net_filter-04.js": 4344, 
-    "browser/devtools/netmonitor/test/browser_net_footer-summary.js": 7876, 
-    "browser/devtools/netmonitor/test/browser_net_html-preview.js": 3992, 
-    "browser/devtools/netmonitor/test/browser_net_icon-preview.js": 5345, 
-    "browser/devtools/netmonitor/test/browser_net_image-tooltip.js": 5498, 
-    "browser/devtools/netmonitor/test/browser_net_json-long.js": 13553, 
-    "browser/devtools/netmonitor/test/browser_net_json-malformed.js": 3957, 
-    "browser/devtools/netmonitor/test/browser_net_large-response.js": 3404, 
-    "browser/devtools/netmonitor/test/browser_net_persistent_logs.js": 3784, 
-    "browser/devtools/netmonitor/test/browser_net_post-data-01.js": 3337, 
-    "browser/devtools/netmonitor/test/browser_net_prefs-reload.js": 15071, 
-    "browser/devtools/netmonitor/test/browser_net_req-resp-bodies.js": 3978, 
-    "browser/devtools/netmonitor/test/browser_net_resend.js": 4125, 
-    "browser/devtools/netmonitor/test/browser_net_security-state.js": 3782, 
-    "browser/devtools/netmonitor/test/browser_net_security-tab-deselect.js": 3401, 
-    "browser/devtools/netmonitor/test/browser_net_security-tab-visibility.js": 4613, 
-    "browser/devtools/netmonitor/test/browser_net_sort-01.js": 7583, 
-    "browser/devtools/netmonitor/test/browser_net_sort-02.js": 7739, 
-    "browser/devtools/netmonitor/test/browser_net_sort-03.js": 10294, 
-    "browser/devtools/netmonitor/test/browser_net_statistics-01.js": 4253, 
-    "browser/devtools/netmonitor/test/browser_net_statistics-02.js": 4900, 
-    "browser/devtools/netmonitor/test/browser_net_status-codes.js": 4390, 
-    "browser/devtools/netmonitor/test/browser_net_timing-division.js": 5635, 
-    "browser/devtools/performance/test/browser_aaa-run-first-leaktest.js": 3922, 
-    "browser/devtools/performance/test/browser_markers-cycle-collection.js": 5663, 
-    "browser/devtools/performance/test/browser_perf-categories-js-calltree.js": 7688, 
-    "browser/devtools/performance/test/browser_perf-clear-01.js": 6499, 
-    "browser/devtools/performance/test/browser_perf-clear-02.js": 7684, 
-    "browser/devtools/performance/test/browser_perf-columns-js-calltree.js": 7489, 
-    "browser/devtools/performance/test/browser_perf-columns-memory-calltree.js": 5427, 
-    "browser/devtools/performance/test/browser_perf-compatibility-02.js": 4383, 
-    "browser/devtools/performance/test/browser_perf-compatibility-04.js": 4726, 
-    "browser/devtools/performance/test/browser_perf-compatibility-05.js": 5828, 
-    "browser/devtools/performance/test/browser_perf-compatibility-07.js": 5350, 
-    "browser/devtools/performance/test/browser_perf-compatibility-08.js": 6000, 
-    "browser/devtools/performance/test/browser_perf-console-record-01.js": 4358, 
-    "browser/devtools/performance/test/browser_perf-console-record-02.js": 4518, 
-    "browser/devtools/performance/test/browser_perf-console-record-03.js": 4118, 
-    "browser/devtools/performance/test/browser_perf-console-record-04.js": 6559, 
-    "browser/devtools/performance/test/browser_perf-console-record-05.js": 7694, 
-    "browser/devtools/performance/test/browser_perf-console-record-06.js": 6193, 
-    "browser/devtools/performance/test/browser_perf-console-record-07.js": 5022, 
-    "browser/devtools/performance/test/browser_perf-console-record-08.js": 8244, 
-    "browser/devtools/performance/test/browser_perf-console-record-09.js": 3267, 
-    "browser/devtools/performance/test/browser_perf-data-massaging-01.js": 5714, 
-    "browser/devtools/performance/test/browser_perf-data-samples.js": 4214, 
-    "browser/devtools/performance/test/browser_perf-details-01.js": 5107, 
-    "browser/devtools/performance/test/browser_perf-details-02.js": 4982, 
-    "browser/devtools/performance/test/browser_perf-details-03.js": 7917, 
-    "browser/devtools/performance/test/browser_perf-details-04.js": 7457, 
-    "browser/devtools/performance/test/browser_perf-details-05.js": 6441, 
-    "browser/devtools/performance/test/browser_perf-details-06.js": 6284, 
-    "browser/devtools/performance/test/browser_perf-details-07.js": 4967, 
-    "browser/devtools/performance/test/browser_perf-details-calltree-render.js": 7373, 
-    "browser/devtools/performance/test/browser_perf-details-flamegraph-render.js": 7079, 
-    "browser/devtools/performance/test/browser_perf-details-memory-calltree-render.js": 7306, 
-    "browser/devtools/performance/test/browser_perf-details-memory-flamegraph-render.js": 7016, 
-    "browser/devtools/performance/test/browser_perf-details-waterfall-render.js": 6486, 
-    "browser/devtools/performance/test/browser_perf-events-calltree.js": 4586, 
-    "browser/devtools/performance/test/browser_perf-front-profiler-02.js": 3293, 
-    "browser/devtools/performance/test/browser_perf-front-profiler-03.js": 4835, 
-    "browser/devtools/performance/test/browser_perf-front-profiler-04.js": 4725, 
-    "browser/devtools/performance/test/browser_perf-highlighted.js": 5287, 
-    "browser/devtools/performance/test/browser_perf-jit-view-01.js": 6934, 
-    "browser/devtools/performance/test/browser_perf-jit-view-02.js": 6069, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-01.js": 6385, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-02.js": 4189, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-03.js": 4815, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-04.js": 4751, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-05.js": 5658, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-06.js": 4346, 
-    "browser/devtools/performance/test/browser_perf-loading-01.js": 4100, 
-    "browser/devtools/performance/test/browser_perf-loading-02.js": 6159, 
-    "browser/devtools/performance/test/browser_perf-options-02.js": 4177, 
-    "browser/devtools/performance/test/browser_perf-options-allocations.js": 4746, 
-    "browser/devtools/performance/test/browser_perf-options-enable-framerate.js": 5054, 
-    "browser/devtools/performance/test/browser_perf-options-enable-memory-01.js": 6278, 
-    "browser/devtools/performance/test/browser_perf-options-enable-memory-02.js": 6307, 
-    "browser/devtools/performance/test/browser_perf-options-enable-optimizations.js": 6682, 
-    "browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-01.js": 5224, 
-    "browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-02.js": 5140, 
-    "browser/devtools/performance/test/browser_perf-options-invert-call-tree-01.js": 5127, 
-    "browser/devtools/performance/test/browser_perf-options-invert-call-tree-02.js": 4895, 
-    "browser/devtools/performance/test/browser_perf-options-invert-flame-graph-01.js": 5175, 
-    "browser/devtools/performance/test/browser_perf-options-invert-flame-graph-02.js": 5111, 
-    "browser/devtools/performance/test/browser_perf-options-profiler.js": 4538, 
-    "browser/devtools/performance/test/browser_perf-options-show-idle-blocks-01.js": 5171, 
-    "browser/devtools/performance/test/browser_perf-options-show-idle-blocks-02.js": 5110, 
-    "browser/devtools/performance/test/browser_perf-options-show-platform-data-01.js": 7857, 
-    "browser/devtools/performance/test/browser_perf-options-show-platform-data-02.js": 5732, 
-    "browser/devtools/performance/test/browser_perf-overview-render-01.js": 6622, 
-    "browser/devtools/performance/test/browser_perf-overview-render-02.js": 17065, 
-    "browser/devtools/performance/test/browser_perf-overview-render-03.js": 16375, 
-    "browser/devtools/performance/test/browser_perf-overview-render-04.js": 4775, 
-    "browser/devtools/performance/test/browser_perf-overview-selection-01.js": 5402, 
-    "browser/devtools/performance/test/browser_perf-overview-selection-02.js": 8407, 
-    "browser/devtools/performance/test/browser_perf-overview-selection-03.js": 5697, 
-    "browser/devtools/performance/test/browser_perf-overview-time-interval.js": 5383, 
-    "browser/devtools/performance/test/browser_perf-recording-model-01.js": 3967, 
-    "browser/devtools/performance/test/browser_perf-recording-selected-02.js": 3249, 
-    "browser/devtools/performance/test/browser_perf-recording-selected-03.js": 3398, 
-    "browser/devtools/performance/test/browser_perf-recording-selected-04.js": 4388, 
-    "browser/devtools/performance/test/browser_perf-refresh.js": 3955, 
-    "browser/devtools/performance/test/browser_perf-states.js": 5245, 
-    "browser/devtools/performance/test/browser_perf-theme-toggle-01.js": 8835, 
-    "browser/devtools/performance/test/browser_perf_recordings-io-01.js": 3358, 
-    "browser/devtools/performance/test/browser_profiler_tree-view-11.js": 4353, 
-    "browser/devtools/performance/test/browser_timeline-filters-02.js": 4161, 
-    "browser/devtools/performance/test/browser_timeline-filters.js": 6007, 
-    "browser/devtools/performance/test/browser_timeline-waterfall-background.js": 5631, 
-    "browser/devtools/performance/test/browser_timeline-waterfall-generic.js": 6463, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_delete_file.js": 5010, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js": 3803, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_external_change.js": 4226, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js": 10960, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js": 4194, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_02.js": 3468, 
-    "browser/devtools/responsivedesign/test/browser_responsivecomputedview.js": 4803, 
-    "browser/devtools/responsivedesign/test/browser_responsiveruleview.js": 4356, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_close_toolbox.js": 4487, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_disable_view_menu_items.js": 6957, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_restore.js": 4431, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_unsaved.js": 3548, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_wrong_window_focus.js": 3770, 
-    "browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js": 3324, 
-    "browser/devtools/shared/test/browser_css_color.js": 3210, 
-    "browser/devtools/shared/test/browser_tableWidget_basic.js": 5684, 
-    "browser/devtools/shared/test/browser_telemetry_button_eyedropper.js": 4659, 
-    "browser/devtools/shared/test/browser_telemetry_button_paintflashing.js": 4289, 
-    "browser/devtools/shared/test/browser_telemetry_button_responsive.js": 3260, 
-    "browser/devtools/shared/test/browser_telemetry_button_scratchpad.js": 6509, 
-    "browser/devtools/shared/test/browser_telemetry_button_tilt.js": 4443, 
-    "browser/devtools/shared/test/browser_telemetry_sidebar.js": 7095, 
-    "browser/devtools/shared/test/browser_telemetry_toolbox.js": 7083, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js": 4773, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js": 4055, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js": 3343, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js": 3557, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js": 3276, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js": 3360, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js": 3549, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js": 3438, 
-    "browser/devtools/shared/test/browser_toolbar_basic.js": 3950, 
-    "browser/devtools/shared/test/browser_toolbar_webconsole_errors_count.js": 3634, 
-    "browser/devtools/sourceeditor/test/browser_codemirror.js": 4597, 
-    "browser/devtools/sourceeditor/test/browser_vimemacs.js": 35225, 
-    "browser/devtools/storage/test/browser_storage_basic.js": 10104, 
-    "browser/devtools/storage/test/browser_storage_dynamic_updates.js": 6616, 
-    "browser/devtools/storage/test/browser_storage_sidebar.js": 6947, 
-    "browser/devtools/storage/test/browser_storage_values.js": 5949, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_autocomplete-disabled.js": 3960, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js": 5172, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_bug_740541_iframes.js": 3541, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_cmd_edit.js": 4046, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js": 3434, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js": 4172, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_loading.js": 3185, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar.js": 3861, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js": 3381, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js": 3814, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_navigate.js": 4238, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_reload.js": 5118, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_scroll.js": 3489, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_large.js": 3571, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js": 7289, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js": 6423, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_transition_rule.js": 4142, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_xul.js": 3377, 
-    "browser/devtools/styleinspector/test/browser_computedview_browser-styles.js": 6322, 
-    "browser/devtools/styleinspector/test/browser_computedview_cycle_color.js": 3470, 
-    "browser/devtools/styleinspector/test/browser_computedview_getNodeInfo.js": 3640, 
-    "browser/devtools/styleinspector/test/browser_computedview_keybindings_01.js": 3505, 
-    "browser/devtools/styleinspector/test/browser_computedview_keybindings_02.js": 4083, 
-    "browser/devtools/styleinspector/test/browser_computedview_matched-selectors-toggle.js": 3622, 
-    "browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js": 3944, 
-    "browser/devtools/styleinspector/test/browser_computedview_matched-selectors_02.js": 3440, 
-    "browser/devtools/styleinspector/test/browser_computedview_media-queries.js": 3633, 
-    "browser/devtools/styleinspector/test/browser_computedview_no-results-placeholder.js": 4025, 
-    "browser/devtools/styleinspector/test/browser_computedview_original-source-link.js": 6130, 
-    "browser/devtools/styleinspector/test/browser_computedview_pseudo-element_01.js": 4567, 
-    "browser/devtools/styleinspector/test/browser_computedview_refresh-on-style-change_01.js": 3616, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter.js": 5152, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter_clear.js": 6340, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter_context-menu.js": 3472, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter_escape-keypress.js": 6345, 
-    "browser/devtools/styleinspector/test/browser_computedview_select-and-copy-styles.js": 3773, 
-    "browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js": 6267, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js": 4069, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js": 3337, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js": 3209, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js": 3228, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js": 3202, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js": 11785, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js": 3300, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js": 3645, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_04.js": 3323, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js": 5311, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js": 4210, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js": 3460, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js": 3341, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js": 7334, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_02.js": 6402, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_01.js": 5680, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_02.js": 6634, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js": 3730, 
-    "browser/devtools/styleinspector/test/browser_ruleview_content_01.js": 3283, 
-    "browser/devtools/styleinspector/test/browser_ruleview_content_02.js": 3195, 
-    "browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js": 3240, 
-    "browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js": 5574, 
-    "browser/devtools/styleinspector/test/browser_ruleview_copy_styles.js": 3976, 
-    "browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js": 3597, 
-    "browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js": 3276, 
-    "browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js": 3391, 
-    "browser/devtools/styleinspector/test/browser_ruleview_custom.js": 3730, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-cancel.js": 3179, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js": 3547, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-computed.js": 3395, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js": 5384, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-order.js": 3465, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_01.js": 3188, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_02.js": 3307, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_03.js": 3309, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js": 4623, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js": 3990, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_03.js": 3417, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_04.js": 3527, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_05.js": 3470, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_06.js": 3389, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_07.js": 3339, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector-commit.js": 3957, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_01.js": 3368, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_02.js": 3860, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_04.js": 3524, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_05.js": 3599, 
-    "browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_01.js": 4278, 
-    "browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_02.js": 3812, 
-    "browser/devtools/styleinspector/test/browser_ruleview_eyedropper.js": 4302, 
-    "browser/devtools/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js": 3305, 
-    "browser/devtools/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js": 3415, 
-    "browser/devtools/styleinspector/test/browser_ruleview_inherit.js": 3684, 
-    "browser/devtools/styleinspector/test/browser_ruleview_keybindings.js": 3205, 
-    "browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js": 4708, 
-    "browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_02.js": 4470, 
-    "browser/devtools/styleinspector/test/browser_ruleview_livepreview.js": 3831, 
-    "browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_02.js": 3201, 
-    "browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_05.js": 3243, 
-    "browser/devtools/styleinspector/test/browser_ruleview_mathml-element.js": 3701, 
-    "browser/devtools/styleinspector/test/browser_ruleview_media-queries.js": 3236, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js": 3372, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js": 3401, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js": 3289, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_01.js": 3229, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_02.js": 3204, 
-    "browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js": 4831, 
-    "browser/devtools/styleinspector/test/browser_ruleview_override.js": 4901, 
-    "browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_01.js": 5458, 
-    "browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_02.js": 3745, 
-    "browser/devtools/styleinspector/test/browser_ruleview_pseudo_lock_options.js": 4545, 
-    "browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js": 3406, 
-    "browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js": 3868, 
-    "browser/devtools/styleinspector/test/browser_ruleview_refresh-on-style-change.js": 3173, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js": 3597, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_02.js": 3313, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_03.js": 3291, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_04.js": 3316, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_05.js": 3256, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_06.js": 3416, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_07.js": 3263, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_08.js": 3386, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_clear.js": 3280, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js": 3330, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-overridden-property.js": 3290, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_01.js": 3538, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_02.js": 3503, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_03.js": 3234, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_04.js": 3865, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_05.js": 3395, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_06.js": 3384, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_07.js": 3306, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_08.js": 3300, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_09.js": 3258, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_10.js": 3471, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_11.js": 3234, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_12.js": 3628, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_13.js": 3553, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_14.js": 3365, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_15.js": 3424, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_16.js": 3321, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_clear.js": 3307, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js": 3277, 
-    "browser/devtools/styleinspector/test/browser_ruleview_select-and-copy-styles.js": 3330, 
-    "browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_02.js": 3250, 
-    "browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_03.js": 3540, 
-    "browser/devtools/styleinspector/test/browser_ruleview_selector_highlight.js": 4739, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js": 4957, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_01.js": 4880, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_02.js": 3689, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_03.js": 3341, 
-    "browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js": 5544, 
-    "browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js": 4611, 
-    "browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js": 3608, 
-    "browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles.js": 12999, 
-    "browser/devtools/styleinspector/test/browser_ruleview_user-property-reset.js": 4872, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js": 10071, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js": 3563, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-data-uri.js": 4826, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js": 5173, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js": 6125, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_refresh_when_active.js": 4256, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-background-image.js": 3947, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js": 3738, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js": 3828, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js": 3622, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js": 3171, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-01.js": 3429, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-02.js": 3628, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-03.js": 3199, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-04.js": 3324, 
-    "browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js": 3274, 
-    "browser/devtools/timeline/test/browser_timeline_overview-update.js": 3363, 
-    "browser/devtools/timeline/test/browser_timeline_recording-without-memory.js": 3666, 
-    "browser/devtools/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js": 4611, 
-    "browser/devtools/webaudioeditor/test/browser_wa_destroy-node-01.js": 4558, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-click.js": 3483, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-render-01.js": 3702, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-zoom.js": 3203, 
-    "browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js": 3879, 
-    "browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js": 4077, 
-    "browser/devtools/webaudioeditor/test/browser_wa_navigate.js": 3626, 
-    "browser/devtools/webaudioeditor/test/browser_wa_properties-view-media-nodes.js": 3447, 
-    "browser/devtools/webaudioeditor/test/browser_wa_properties-view-params.js": 5327, 
-    "browser/devtools/webaudioeditor/test/browser_wa_reset-03.js": 3849, 
-    "browser/devtools/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js": 3707, 
-    "browser/devtools/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js": 5470, 
-    "browser/devtools/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js": 4853, 
-    "browser/devtools/webconsole/test/browser_console_history_persist.js": 6497, 
-    "browser/devtools/webconsole/test/browser_console_iframe_messages.js": 3719, 
-    "browser/devtools/webconsole/test/browser_console_native_getters.js": 5641, 
-    "browser/devtools/webconsole/test/browser_console_optimized_out_vars.js": 3968, 
-    "browser/devtools/webconsole/test/browser_console_private_browsing.js": 5279, 
-    "browser/devtools/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js": 4810, 
-    "browser/devtools/webconsole/test/browser_console_variables_view_highlighter.js": 5594, 
-    "browser/devtools/webconsole/test/browser_console_variables_view_while_debugging.js": 3711, 
-    "browser/devtools/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js": 5181, 
-    "browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe.js": 4323, 
-    "browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe2.js": 3476, 
-    "browser/devtools/webconsole/test/browser_jsterm_inspect.js": 7231, 
-    "browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js": 3560, 
-    "browser/devtools/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js": 4267, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js": 3706, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js": 4885, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js": 6058, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js": 4874, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js": 3478, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js": 3748, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js": 6123, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js": 4114, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js": 3647, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_659907_console_dir.js": 5328, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js": 9285, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js": 3911, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js": 3361, 
-    "browser/devtools/webconsole/test/browser_webconsole_cached_autocomplete.js": 4756, 
-    "browser/devtools/webconsole/test/browser_webconsole_certificate_messages.js": 3530, 
-    "browser/devtools/webconsole/test/browser_webconsole_clickable_urls.js": 7432, 
-    "browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js": 6972, 
-    "browser/devtools/webconsole/test/browser_webconsole_hpkp_invalid-headers.js": 4494, 
-    "browser/devtools/webconsole/test/browser_webconsole_hsts_invalid-headers.js": 3642, 
-    "browser/devtools/webconsole/test/browser_webconsole_inspect-parsed-documents.js": 3387, 
-    "browser/devtools/webconsole/test/browser_webconsole_jsterm.js": 3301, 
-    "browser/devtools/webconsole/test/browser_webconsole_network_panel.js": 3790, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_01.js": 3805, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_02.js": 7481, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_03.js": 6231, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_04.js": 5284, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_05.js": 5314, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_06.js": 6424, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_01.js": 4538, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_02.js": 5507, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_03.js": 3443, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_04.js": 4847, 
-    "browser/devtools/webconsole/test/browser_webconsole_split.js": 8445, 
-    "browser/devtools/webconsole/test/browser_webconsole_split_escape_key.js": 3609, 
-    "browser/devtools/webconsole/test/browser_webconsole_split_persist.js": 7189, 
-    "browser/devtools/webide/test/browser_tabs.js": 5134, 
-    "browser/devtools/webide/test/sidebars/browser_tabs.js": 5627, 
-    "toolkit/devtools/server/tests/browser/browser_animation_actors_05.js": 3304, 
-    "toolkit/devtools/server/tests/browser/browser_markers-cycle-collection.js": 6946, 
-    "toolkit/devtools/server/tests/browser/browser_perf-samples-01.js": 3364, 
-    "toolkit/devtools/server/tests/browser/browser_storage_dynamic_windows.js": 5281, 
-    "toolkit/devtools/server/tests/browser/browser_storage_listings.js": 4344
+    "devtools/client/animationinspector/test/browser_animation_empty_on_invalid_nodes.js": 11367, 
+    "devtools/client/animationinspector/test/browser_animation_iterationCount_hidden_by_default.js": 5368, 
+    "devtools/client/animationinspector/test/browser_animation_panel_exists.js": 5252, 
+    "devtools/client/animationinspector/test/browser_animation_participate_in_inspector_update.js": 8774, 
+    "devtools/client/animationinspector/test/browser_animation_play_pause_button.js": 6102, 
+    "devtools/client/animationinspector/test/browser_animation_playerFronts_are_refreshed.js": 5674, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js": 6206, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_compositor_icon.js": 4905, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_destroy.js": 5266, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js": 9402, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_dura