diff --git a/.gitignore b/.gitignore
index d2589c0abdae0..a2374adc8c3e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,8 @@ 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
diff --git a/.hgignore b/.hgignore
index 7357cb7bb3dec..c9450fdb1b1ad 100644
--- a/.hgignore
+++ b/.hgignore
@@ -64,8 +64,8 @@ _OPT\.OBJ/
 .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$
diff --git a/b2g/chrome/content/devtools/debugger.js b/b2g/chrome/content/devtools/debugger.js
index 81259e4be5baa..9e8617e2da9ba 100644
--- a/b2g/chrome/content/devtools/debugger.js
+++ b/b2g/chrome/content/devtools/debugger.js
@@ -49,7 +49,7 @@ var RemoteDebugger = {
    *        }
    *        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.
    */
diff --git 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
index d12e601926414..68a6954ccd318 100644
--- 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,6 +1,6 @@
 @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;
diff --git a/build/dumbmake-dependencies b/build/dumbmake-dependencies
index cdb136d53b5b4..17367d219e250 100644
--- a/build/dumbmake-dependencies
+++ b/build/dumbmake-dependencies
@@ -51,7 +51,7 @@ toolkit/library
 browser/app
   browser/base
   browser/components
-  browser/devtools
+  devtools/client
   browser/locales
   browser/modules
   browser/themes
@@ -60,7 +60,7 @@ browser/app
   toolkit/components/jsdownloads
   toolkit/content
   toolkit/crashreporter
-  toolkit/devtools
+  devtools/shared
   toolkit/forgetaboutsite
   toolkit/identity
   toolkit/modules
diff --git a/devtools/.eslintrc b/devtools/.eslintrc
index f7b201e522f9f..41cec24f8e64c 100644
--- a/devtools/.eslintrc
+++ b/devtools/.eslintrc
@@ -328,7 +328,7 @@
     // 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,
diff --git a/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js b/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
index d46afd7ebcac9..384c89d3ec48e 100644
--- a/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
+++ b/devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js
@@ -7,7 +7,7 @@
 // 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");
diff --git a/devtools/client/animationinspector/test/head.js b/devtools/client/animationinspector/test/head.js
index 39d087bac3386..61be58fe547c6 100644
--- a/devtools/client/animationinspector/test/head.js
+++ b/devtools/client/animationinspector/test/head.js
@@ -16,7 +16,7 @@ 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";
diff --git a/devtools/client/app-manager/content/template.js b/devtools/client/app-manager/content/template.js
index 5aa0f802ad730..434308768e7c8 100644
--- a/devtools/client/app-manager/content/template.js
+++ b/devtools/client/app-manager/content/template.js
@@ -12,7 +12,7 @@
  *
  * 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}">
  *
diff --git a/devtools/client/app-manager/test/head.js b/devtools/client/app-manager/test/head.js
index 5a0c099bf6ea8..450c5fe507932 100644
--- a/devtools/client/app-manager/test/head.js
+++ b/devtools/client/app-manager/test/head.js
@@ -14,7 +14,7 @@ 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(".");
diff --git a/devtools/client/canvasdebugger/test/head.js b/devtools/client/canvasdebugger/test/head.js
index 64def8fe0418b..770e7ec901c03 100644
--- a/devtools/client/canvasdebugger/test/head.js
+++ b/devtools/client/canvasdebugger/test/head.js
@@ -29,7 +29,7 @@ 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";
diff --git a/devtools/client/commandline/test/browser_cmd_appcache_invalid.js b/devtools/client/commandline/test/browser_cmd_appcache_invalid.js
index d0e0a7fe883d1..0f81734bc2e5e 100644
--- a/devtools/client/commandline/test/browser_cmd_appcache_invalid.js
+++ b/devtools/client/commandline/test/browser_cmd_appcache_invalid.js
@@ -4,7 +4,7 @@
 // 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() {
@@ -44,9 +44,9 @@ function* spawnTest() {
     '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.',
diff --git a/devtools/client/commandline/test/browser_cmd_appcache_valid.js b/devtools/client/commandline/test/browser_cmd_appcache_valid.js
index 9658873744231..d3cdda6258f8a 100644
--- a/devtools/client/commandline/test/browser_cmd_appcache_valid.js
+++ b/devtools/client/commandline/test/browser_cmd_appcache_valid.js
@@ -3,7 +3,7 @@
 
 // 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() {
@@ -110,7 +110,7 @@ function* spawnTest() {
       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: {
@@ -160,7 +160,7 @@ function* spawnTest() {
       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: {}
diff --git a/devtools/client/commandline/test/browser_cmd_cookie.js b/devtools/client/commandline/test/browser_cmd_cookie.js
index 80f90df28807a..47a0ead31fcf5 100644
--- a/devtools/client/commandline/test/browser_cmd_cookie.js
+++ b/devtools/client/commandline/test/browser_cmd_cookie.js
@@ -3,7 +3,7 @@
 
 // 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() {
diff --git a/devtools/client/commandline/test/browser_cmd_cookie_host.js b/devtools/client/commandline/test/browser_cmd_cookie_host.js
index 89d7a815cdf6f..6e99f8fd61af6 100644
--- a/devtools/client/commandline/test/browser_cmd_cookie_host.js
+++ b/devtools/client/commandline/test/browser_cmd_cookie_host.js
@@ -3,7 +3,7 @@
 
 // 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() {
diff --git a/devtools/client/commandline/test/browser_cmd_inject.js b/devtools/client/commandline/test/browser_cmd_inject.js
index 588487b2e029b..f1109f5ac2bef 100644
--- a/devtools/client/commandline/test/browser_cmd_inject.js
+++ b/devtools/client/commandline/test/browser_cmd_inject.js
@@ -3,7 +3,7 @@
 
 // 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() {
@@ -43,9 +43,9 @@ function test() {
         }
       },
       {
-        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',
diff --git a/devtools/client/commandline/test/browser_cmd_jsb.js b/devtools/client/commandline/test/browser_cmd_jsb.js
index 146d1f99da7e0..c05452afbc569 100644
--- a/devtools/client/commandline/test/browser_cmd_jsb.js
+++ b/devtools/client/commandline/test/browser_cmd_jsb.js
@@ -3,7 +3,7 @@
 
 // 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() {
diff --git a/devtools/client/commandline/test/browser_cmd_listen.js b/devtools/client/commandline/test/browser_cmd_listen.js
index f8adb7189744e..b84488fdd0258 100644
--- a/devtools/client/commandline/test/browser_cmd_listen.js
+++ b/devtools/client/commandline/test/browser_cmd_listen.js
@@ -3,7 +3,7 @@
 
 // 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() {
diff --git a/devtools/client/commandline/test/browser_cmd_media.js b/devtools/client/commandline/test/browser_cmd_media.js
index b6e39e06e8a90..21f9190dda906 100644
--- a/devtools/client/commandline/test/browser_cmd_media.js
+++ b/devtools/client/commandline/test/browser_cmd_media.js
@@ -2,7 +2,7 @@
  * 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) {
diff --git a/devtools/client/commandline/test/browser_cmd_pagemod_export.js b/devtools/client/commandline/test/browser_cmd_pagemod_export.js
index 3d4cefcc3557c..35ba3ff4efa5b 100644
--- a/devtools/client/commandline/test/browser_cmd_pagemod_export.js
+++ b/devtools/client/commandline/test/browser_cmd_pagemod_export.js
@@ -3,7 +3,7 @@
 
 // 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() {
diff --git a/devtools/client/commandline/test/browser_cmd_paintflashing.js b/devtools/client/commandline/test/browser_cmd_paintflashing.js
index 73725376a5791..77b55c0e3c2e1 100644
--- a/devtools/client/commandline/test/browser_cmd_paintflashing.js
+++ b/devtools/client/commandline/test/browser_cmd_paintflashing.js
@@ -5,7 +5,7 @@
 
 "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() {
diff --git a/devtools/client/commandline/test/browser_cmd_screenshot.js b/devtools/client/commandline/test/browser_cmd_screenshot.js
index a86d5049b3efd..834ec6e9c79e4 100644
--- a/devtools/client/commandline/test/browser_cmd_screenshot.js
+++ b/devtools/client/commandline/test/browser_cmd_screenshot.js
@@ -2,7 +2,7 @@
  * 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;
diff --git a/devtools/client/commandline/test/head.js b/devtools/client/commandline/test/head.js
index 11deef69636ef..929c9d03edf45 100644
--- a/devtools/client/commandline/test/head.js
+++ b/devtools/client/commandline/test/head.js
@@ -2,8 +2,8 @@
  * 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");
diff --git a/devtools/client/commandline/test/helpers.js b/devtools/client/commandline/test/helpers.js
index f7b4694db8cc6..343db6646fc8a 100644
--- a/devtools/client/commandline/test/helpers.js
+++ b/devtools/client/commandline/test/helpers.js
@@ -410,7 +410,7 @@ helpers.runTests = function(options, tests) {
   }, 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 = { };
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js b/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
index c3266f0cbd7ea..9c3ad076da295 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
@@ -5,7 +5,7 @@
  * 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() {
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
index 9dccc5fb3ce4e..9fdf60942fa73 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
@@ -5,7 +5,7 @@
  * 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";
 
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
index 070a20ddd61d8..429e813742b2a 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
@@ -5,7 +5,7 @@
  * 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";
 
diff --git a/devtools/client/debugger/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js
index 828b6b4767454..1e6948caa3ee0 100644
--- a/devtools/client/debugger/test/mochitest/head.js
+++ b/devtools/client/debugger/test/mochitest/head.js
@@ -26,7 +26,7 @@ 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;
diff --git a/devtools/client/eyedropper/test/head.js b/devtools/client/eyedropper/test/head.js
index 037f1128881e6..032c82d599448 100644
--- a/devtools/client/eyedropper/test/head.js
+++ b/devtools/client/eyedropper/test/head.js
@@ -2,7 +2,7 @@
    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");
diff --git a/devtools/client/fontinspector/test/head.js b/devtools/client/fontinspector/test/head.js
index 4bc5d32ca8cac..244f19f7bb401 100644
--- a/devtools/client/fontinspector/test/head.js
+++ b/devtools/client/fontinspector/test/head.js
@@ -5,9 +5,9 @@
 "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.
diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework/gDevTools.jsm
index 7e70a657a2269..070f8f06bb668 100644
--- a/devtools/client/framework/gDevTools.jsm
+++ b/devtools/client/framework/gDevTools.jsm
@@ -77,7 +77,7 @@ DevTools.prototype = {
    * - 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)
diff --git 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
index c13adcf4ed21a..63ee55f2edbd1 100644
--- 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,7 +1,7 @@
 /* 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";
 
diff --git a/devtools/client/framework/test/browser_toolbox_theme_registration.js b/devtools/client/framework/test/browser_toolbox_theme_registration.js
index 601c3a4fa4c62..7612c641a4f0b 100644
--- a/devtools/client/framework/test/browser_toolbox_theme_registration.js
+++ b/devtools/client/framework/test/browser_toolbox_theme_registration.js
@@ -2,7 +2,7 @@
 /* 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;
 
diff --git a/devtools/client/framework/test/browser_toolbox_toggle.js b/devtools/client/framework/test/browser_toolbox_toggle.js
index c2b075cbc4071..4930aad411334 100644
--- a/devtools/client/framework/test/browser_toolbox_toggle.js
+++ b/devtools/client/framework/test/browser_toolbox_toggle.js
@@ -12,7 +12,7 @@ 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", {
diff --git a/devtools/client/framework/test/head.js b/devtools/client/framework/test/head.js
index b60e0649b70f9..a54275e85d46e 100644
--- a/devtools/client/framework/test/head.js
+++ b/devtools/client/framework/test/head.js
@@ -2,7 +2,7 @@
    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) {
diff --git a/devtools/client/framework/toolbox-highlighter-utils.js b/devtools/client/framework/toolbox-highlighter-utils.js
index 03bf19180ced7..806bfdd5b8797 100644
--- a/devtools/client/framework/toolbox-highlighter-utils.js
+++ b/devtools/client/framework/toolbox-highlighter-utils.js
@@ -196,7 +196,7 @@ exports.getHighlighterUtils = function(toolbox) {
   /**
    * 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
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 5e4ed064f26dc..7f9c1f7d78b73 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -2094,7 +2094,7 @@ Toolbox.prototype = {
 
   /**
    * 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);
@@ -2102,7 +2102,7 @@ Toolbox.prototype = {
 
   /**
    * 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);
@@ -2115,7 +2115,7 @@ Toolbox.prototype = {
    * 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);
@@ -2123,7 +2123,7 @@ Toolbox.prototype = {
 
   /**
    * 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);
diff --git a/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js b/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
index 27c2a71a76219..62b68cc3fdfb4 100644
--- a/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
+++ b/devtools/client/inspector/test/browser_inspector_highlighter-csstransform_02.js
@@ -13,7 +13,7 @@ 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
 */
diff --git a/devtools/client/inspector/test/browser_inspector_navigation.js b/devtools/client/inspector/test/browser_inspector_navigation.js
index 136318b02738e..2e19ad66f60a8 100644
--- a/devtools/client/inspector/test/browser_inspector_navigation.js
+++ b/devtools/client/inspector/test/browser_inspector_navigation.js
@@ -7,7 +7,7 @@
 
 // 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;
diff --git a/devtools/client/inspector/test/head.js b/devtools/client/inspector/test/head.js
index 0465d62d36504..b401bd0a51a29 100644
--- a/devtools/client/inspector/test/head.js
+++ b/devtools/client/inspector/test/head.js
@@ -17,7 +17,7 @@ const CC = Components.Constructor;
 // 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
diff --git a/devtools/client/layoutview/test/head.js b/devtools/client/layoutview/test/head.js
index d7334bd51b1da..971c2efae1460 100644
--- a/devtools/client/layoutview/test/head.js
+++ b/devtools/client/layoutview/test/head.js
@@ -15,7 +15,7 @@ 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);
diff --git a/devtools/client/markupview/test/head.js b/devtools/client/markupview/test/head.js
index d4d7bf74ce1ec..f78c222b4c086 100644
--- a/devtools/client/markupview/test/head.js
+++ b/devtools/client/markupview/test/head.js
@@ -48,8 +48,8 @@ registerCleanupFunction(function*() {
   }
 });
 
-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";
 
diff --git a/devtools/client/netmonitor/har/test/head.js b/devtools/client/netmonitor/har/test/head.js
index 7a33656e33e8d..9e2b18623a431 100644
--- a/devtools/client/netmonitor/har/test/head.js
+++ b/devtools/client/netmonitor/har/test/head.js
@@ -5,8 +5,8 @@
 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/";
diff --git a/devtools/client/netmonitor/test/head.js b/devtools/client/netmonitor/test/head.js
index 6be30216e6d26..3233a3e481364 100644
--- a/devtools/client/netmonitor/test/head.js
+++ b/devtools/client/netmonitor/test/head.js
@@ -15,7 +15,7 @@ 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";
@@ -48,7 +48,7 @@ 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==";
diff --git a/devtools/client/performance/modules/logic/jit.js b/devtools/client/performance/modules/logic/jit.js
index 19584020dadad..57d52c5bdc634 100644
--- a/devtools/client/performance/modules/logic/jit.js
+++ b/devtools/client/performance/modules/logic/jit.js
@@ -23,7 +23,7 @@ const SUCCESSFUL_OUTCOMES = [
  * 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.
diff --git a/devtools/client/performance/modules/markers.js b/devtools/client/performance/modules/markers.js
index 59ba6e4aff458..b4c92a931b804 100644
--- a/devtools/client/performance/modules/markers.js
+++ b/devtools/client/performance/modules/markers.js
@@ -21,7 +21,7 @@ const { Formatters } = require("devtools/client/performance/modules/logic/marker
  * - 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.
diff --git a/devtools/client/performance/test/head.js b/devtools/client/performance/test/head.js
index 385f3f8fae65d..1a00c87a473a0 100644
--- a/devtools/client/performance/test/head.js
+++ b/devtools/client/performance/test/head.js
@@ -25,7 +25,7 @@ var {
 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";
diff --git a/devtools/client/performance/views/optimizations-list.js b/devtools/client/performance/views/optimizations-list.js
index 57175586a3b65..a1d4301723e23 100644
--- a/devtools/client/performance/views/optimizations-list.js
+++ b/devtools/client/performance/views/optimizations-list.js
@@ -12,7 +12,7 @@ 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 = {
@@ -247,7 +247,7 @@ var OptimizationsListView = {
   /**
    * 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}
    */
@@ -261,7 +261,7 @@ var OptimizationsListView = {
   /**
    * 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}
    */
@@ -300,7 +300,7 @@ var OptimizationsListView = {
   /**
    * 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}
    */
diff --git a/devtools/client/performance/views/overview.js b/devtools/client/performance/views/overview.js
index 753df1cd38132..17719e727288a 100644
--- a/devtools/client/performance/views/overview.js
+++ b/devtools/client/performance/views/overview.js
@@ -5,7 +5,7 @@
 
 // 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
diff --git a/devtools/client/projecteditor/test/head.js b/devtools/client/projecteditor/test/head.js
index 383f09bae41a2..88694a2fd6869 100644
--- a/devtools/client/projecteditor/test/head.js
+++ b/devtools/client/projecteditor/test/head.js
@@ -12,7 +12,7 @@ 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());
diff --git a/devtools/client/responsivedesign/test/browser_responsiveui_touch.js b/devtools/client/responsivedesign/test/browser_responsiveui_touch.js
index 579b5ebb4163f..d859700c8a9cc 100644
--- a/devtools/client/responsivedesign/test/browser_responsiveui_touch.js
+++ b/devtools/client/responsivedesign/test/browser_responsiveui_touch.js
@@ -3,7 +3,7 @@
 
 "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*() {
diff --git a/devtools/client/scratchpad/test/browser_scratchpad_open.js b/devtools/client/scratchpad/test/browser_scratchpad_open.js
index dcdc6be5e059a..950c4f040ed80 100644
--- a/devtools/client/scratchpad/test/browser_scratchpad_open.js
+++ b/devtools/client/scratchpad/test/browser_scratchpad_open.js
@@ -82,7 +82,7 @@ function testOpenTestFile()
     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');
diff --git a/devtools/client/shadereditor/test/head.js b/devtools/client/shadereditor/test/head.js
index c73ef17c9e9ef..fe700d82b1584 100644
--- a/devtools/client/shadereditor/test/head.js
+++ b/devtools/client/shadereditor/test/head.js
@@ -25,7 +25,7 @@ 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";
diff --git a/devtools/client/shared/browser-loader.js b/devtools/client/shared/browser-loader.js
index bacd584cc5201..96b23ab4f371d 100644
--- a/devtools/client/shared/browser-loader.js
+++ b/devtools/client/shared/browser-loader.js
@@ -38,7 +38,7 @@ const VENDOR_CONTENT_URL = "resource:///modules/devtools/shared/vendor";
  * 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
diff --git a/devtools/client/shared/telemetry.js b/devtools/client/shared/telemetry.js
index 2285fc799db3c..9ec98788cd435 100644
--- a/devtools/client/shared/telemetry.js
+++ b/devtools/client/shared/telemetry.js
@@ -11,7 +11,7 @@
  *    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",
diff --git a/devtools/client/shared/test/head.js b/devtools/client/shared/test/head.js
index ad2d54fb50cc6..5b02a545b262e 100644
--- a/devtools/client/shared/test/head.js
+++ b/devtools/client/shared/test/head.js
@@ -16,7 +16,7 @@ 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";
 
 /**
diff --git a/devtools/client/shared/test/test-actor-registry.js b/devtools/client/shared/test/test-actor-registry.js
index c940ac88db739..f6b0e04658382 100644
--- a/devtools/client/shared/test/test-actor-registry.js
+++ b/devtools/client/shared/test/test-actor-registry.js
@@ -14,7 +14,7 @@ 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
diff --git a/devtools/client/shared/test/test-actor.js b/devtools/client/shared/test/test-actor.js
index 90b05a563a457..8c07a80fe902c 100644
--- a/devtools/client/shared/test/test-actor.js
+++ b/devtools/client/shared/test/test-actor.js
@@ -28,7 +28,7 @@ var dumpn = msg => {
  * 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) {
diff --git a/devtools/client/sourceeditor/codemirror/README b/devtools/client/sourceeditor/codemirror/README
index e3587d3ae9512..2e19093f89f22 100644
--- a/devtools/client/sourceeditor/codemirror/README
+++ b/devtools/client/sourceeditor/codemirror/README
@@ -92,9 +92,9 @@ in the LICENSE file:
 
 # 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");
@@ -135,7 +135,7 @@ diff --git a/browser/devtools/sourceeditor/codemirror/search/search.js b/browser
 # 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
diff --git a/devtools/client/sourceeditor/test/browser_codemirror.js b/devtools/client/sourceeditor/test/browser_codemirror.js
index 3e8e01dc74b83..4a9d95640e82e 100644
--- a/devtools/client/sourceeditor/test/browser_codemirror.js
+++ b/devtools/client/sourceeditor/test/browser_codemirror.js
@@ -5,7 +5,7 @@
 "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() {
diff --git a/devtools/client/sourceeditor/test/browser_css_autocompletion.js b/devtools/client/sourceeditor/test/browser_css_autocompletion.js
index 3af434a94f10d..48a4855fefce3 100644
--- a/devtools/client/sourceeditor/test/browser_css_autocompletion.js
+++ b/devtools/client/sourceeditor/test/browser_css_autocompletion.js
@@ -9,9 +9,9 @@ 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);
diff --git a/devtools/client/sourceeditor/test/browser_css_statemachine.js b/devtools/client/sourceeditor/test/browser_css_statemachine.js
index d4d76db7493f2..1251e673dbe38 100644
--- a/devtools/client/sourceeditor/test/browser_css_statemachine.js
+++ b/devtools/client/sourceeditor/test/browser_css_statemachine.js
@@ -7,9 +7,9 @@
 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);
diff --git a/devtools/client/sourceeditor/test/browser_editor_script_injection.js b/devtools/client/sourceeditor/test/browser_editor_script_injection.js
index c34787f947c2c..4bcc26a6eb724 100644
--- a/devtools/client/sourceeditor/test/browser_editor_script_injection.js
+++ b/devtools/client/sourceeditor/test/browser_editor_script_injection.js
@@ -11,7 +11,7 @@ add_task(function*() {
 });
 
 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, {
diff --git a/devtools/client/sourceeditor/test/browser_vimemacs.js b/devtools/client/sourceeditor/test/browser_vimemacs.js
index de2d895140a5f..3af4d2bb73dd7 100644
--- a/devtools/client/sourceeditor/test/browser_vimemacs.js
+++ b/devtools/client/sourceeditor/test/browser_vimemacs.js
@@ -4,7 +4,7 @@
 "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() {
diff --git a/devtools/client/storage/test/head.js b/devtools/client/storage/test/head.js
index 69dd9f5ec4682..f2048daa41ae0 100644
--- a/devtools/client/storage/test/head.js
+++ b/devtools/client/storage/test/head.js
@@ -14,7 +14,7 @@ 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;
diff --git a/devtools/client/storage/test/storage-listings.html b/devtools/client/storage/test/storage-listings.html
index e90d9f370df19..7d2911b3b2b1e 100644
--- a/devtools/client/storage/test/storage-listings.html
+++ b/devtools/client/storage/test/storage-listings.html
@@ -8,8 +8,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];
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js b/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
index 4977ead277d9d..4751a9d6df563 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js
@@ -5,7 +5,7 @@
 
 // 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* () {
@@ -56,7 +56,7 @@ add_task(function* () {
       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",
@@ -74,7 +74,7 @@ add_task(function* () {
       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",
@@ -92,7 +92,7 @@ add_task(function* () {
       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",
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_opentab.js b/devtools/client/styleeditor/test/browser_styleeditor_opentab.js
index fe4c7f0155539..92d42892b56ae 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_opentab.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_opentab.js
@@ -17,7 +17,7 @@ add_task(function*() {
   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");
 
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js b/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
index 1a222b47475f1..0cf960ebb23c0 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js
@@ -7,7 +7,7 @@
 // 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", {});
diff --git a/devtools/client/styleeditor/test/head.js b/devtools/client/styleeditor/test/head.js
index f0bef63428fd9..74d0581d1573d 100644
--- a/devtools/client/styleeditor/test/head.js
+++ b/devtools/client/styleeditor/test/head.js
@@ -2,9 +2,9 @@
    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", {});
diff --git a/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js b/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
index 967d0e1fa0986..cac459e4bc304 100644
--- a/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
+++ b/devtools/client/styleinspector/test/browser_ruleview_copy_styles.js
@@ -131,7 +131,7 @@ add_task(function*() {
       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,
diff --git a/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js b/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
index 8ee8525241a99..5861f8a5f4a5e 100644
--- a/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
+++ b/devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
@@ -7,7 +7,7 @@
 // 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";
diff --git a/devtools/client/styleinspector/test/doc_urls_clickable.css b/devtools/client/styleinspector/test/doc_urls_clickable.css
index 802b580d4ea30..9b268776e8197 100644
--- a/devtools/client/styleinspector/test/doc_urls_clickable.css
+++ b/devtools/client/styleinspector/test/doc_urls_clickable.css
@@ -2,7 +2,7 @@
     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==');
diff --git a/devtools/client/styleinspector/test/head.js b/devtools/client/styleinspector/test/head.js
index 0ae7812b4b5bd..79d9a8d4fe008 100644
--- a/devtools/client/styleinspector/test/head.js
+++ b/devtools/client/styleinspector/test/head.js
@@ -22,9 +22,9 @@ var {console} =
 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";
 
diff --git a/devtools/client/themes/animationinspector.css b/devtools/client/themes/animationinspector.css
index 2644297098cb7..eb96a5a70ed0e 100644
--- a/devtools/client/themes/animationinspector.css
+++ b/devtools/client/themes/animationinspector.css
@@ -154,7 +154,7 @@ body {
   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);
@@ -193,7 +193,7 @@ body {
   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;
diff --git a/devtools/client/themes/common.css b/devtools/client/themes/common.css
index c96a9e352463b..b298d47858c64 100644
--- a/devtools/client/themes/common.css
+++ b/devtools/client/themes/common.css
@@ -153,7 +153,7 @@
   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;
diff --git a/devtools/client/themes/dark-theme.css b/devtools/client/themes/dark-theme.css
index 6aa2f9eb7b140..2eb5d632d51ab 100644
--- a/devtools/client/themes/dark-theme.css
+++ b/devtools/client/themes/dark-theme.css
@@ -341,7 +341,7 @@ div.CodeMirror span.eval-text {
   }
 }
 
-/* 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;
diff --git a/devtools/client/themes/light-theme.css b/devtools/client/themes/light-theme.css
index 338290d26adc2..ff4197eb4fbc9 100644
--- a/devtools/client/themes/light-theme.css
+++ b/devtools/client/themes/light-theme.css
@@ -350,7 +350,7 @@ div.CodeMirror span.eval-text {
   }
 }
 
-/* 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;
diff --git a/devtools/client/themes/netmonitor.css b/devtools/client/themes/netmonitor.css
index 03e6c4b148984..ed656a75f3af7 100644
--- a/devtools/client/themes/netmonitor.css
+++ b/devtools/client/themes/netmonitor.css
@@ -300,7 +300,7 @@ box.requests-menu-status[code^="5"] {
   -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;
diff --git a/devtools/client/themes/performance.css b/devtools/client/themes/performance.css
index 0be320b1ade99..6d18da63727c7 100644
--- a/devtools/client/themes/performance.css
+++ b/devtools/client/themes/performance.css
@@ -376,7 +376,7 @@
 
 .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;
diff --git a/devtools/client/webaudioeditor/test/browser_callwatcher-02.js b/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
index fd41710bd935f..2b3c2cd1f59e7 100644
--- a/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
+++ b/devtools/client/webaudioeditor/test/browser_callwatcher-02.js
@@ -27,7 +27,7 @@ add_task(function*() {
   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");
@@ -38,7 +38,7 @@ add_task(function*() {
   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);
 });
diff --git a/devtools/client/webaudioeditor/test/doc_buffer-and-array.html b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
index 49dc91f29f683..ef4cec8b6bd3c 100644
--- a/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
+++ b/devtools/client/webaudioeditor/test/doc_buffer-and-array.html
@@ -13,7 +13,7 @@
     <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();
diff --git a/devtools/client/webaudioeditor/test/head.js b/devtools/client/webaudioeditor/test/head.js
index 29e7809154a5a..ad46908db02b2 100644
--- a/devtools/client/webaudioeditor/test/head.js
+++ b/devtools/client/webaudioeditor/test/head.js
@@ -25,7 +25,7 @@ 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";
diff --git 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
index 1df921b472074..eb071136b9ab2 100644
--- 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
@@ -14,7 +14,7 @@
 
 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";
 
diff --git a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js b/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
index 62aaab96544ff..8a97abea7f937 100644
--- a/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/test/browser_bug664688_sandbox_update_after_navigation.js
@@ -10,9 +10,9 @@
 "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);
diff --git a/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js b/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
index 2407bd935bc90..ad4200a319a5b 100644
--- a/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
+++ b/devtools/client/webconsole/test/browser_bug_638949_copy_link_location.js
@@ -9,7 +9,7 @@
 "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";
diff --git a/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js b/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
index cd3723d241203..13a1e83b7df25 100644
--- a/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
+++ b/devtools/client/webconsole/test/browser_bug_865288_repeat_different_objects.js
@@ -8,7 +8,7 @@
 
 "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* () {
diff --git 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
index 3a1097515a609..5cc009b99e151 100644
--- 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
@@ -8,7 +8,7 @@
 
 "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() {
diff --git 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
index 29d969e1c3d72..dc8085f27d6d7 100644
--- 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
@@ -8,7 +8,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_cached_messages.js b/devtools/client/webconsole/test/browser_cached_messages.js
index 8564748159b61..84d01edb95c2a 100644
--- a/devtools/client/webconsole/test/browser_cached_messages.js
+++ b/devtools/client/webconsole/test/browser_cached_messages.js
@@ -8,7 +8,7 @@
 
 "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
diff --git a/devtools/client/webconsole/test/browser_console.js b/devtools/client/webconsole/test/browser_console.js
index 6b49809876c6b..bc67db05d3f6c 100644
--- a/devtools/client/webconsole/test/browser_console.js
+++ b/devtools/client/webconsole/test/browser_console.js
@@ -7,7 +7,7 @@
 
 "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()}`;
diff --git a/devtools/client/webconsole/test/browser_console_clear_on_reload.js b/devtools/client/webconsole/test/browser_console_clear_on_reload.js
index f9ae0a6468afe..4eeb7e2e08046 100644
--- a/devtools/client/webconsole/test/browser_console_clear_on_reload.js
+++ b/devtools/client/webconsole/test/browser_console_clear_on_reload.js
@@ -10,7 +10,7 @@
 
 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);
diff --git a/devtools/client/webconsole/test/browser_console_click_focus.js b/devtools/client/webconsole/test/browser_console_click_focus.js
index 5038cebf9f243..79c62a19735b8 100644
--- a/devtools/client/webconsole/test/browser_console_click_focus.js
+++ b/devtools/client/webconsole/test/browser_console_click_focus.js
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git 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
index dabb4af4bdd6f..67924ad43113f 100644
--- 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
@@ -11,7 +11,7 @@ function test() {
   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);
diff --git a/devtools/client/webconsole/test/browser_console_iframe_messages.js b/devtools/client/webconsole/test/browser_console_iframe_messages.js
index 1606aa58d3b76..19a73174c2f79 100644
--- a/devtools/client/webconsole/test/browser_console_iframe_messages.js
+++ b/devtools/client/webconsole/test/browser_console_iframe_messages.js
@@ -8,7 +8,7 @@
 
 "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 = [
diff --git a/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js b/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
index 8b9a4ff7a2759..d079eb7c971af 100644
--- a/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
+++ b/devtools/client/webconsole/test/browser_console_keyboard_accessibility.js
@@ -8,7 +8,7 @@
 "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);
diff --git a/devtools/client/webconsole/test/browser_console_navigation_marker.js b/devtools/client/webconsole/test/browser_console_navigation_marker.js
index 57848de018035..87cb51d18877d 100644
--- a/devtools/client/webconsole/test/browser_console_navigation_marker.js
+++ b/devtools/client/webconsole/test/browser_console_navigation_marker.js
@@ -8,7 +8,7 @@
 "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;
diff --git a/devtools/client/webconsole/test/browser_console_optimized_out_vars.js b/devtools/client/webconsole/test/browser_console_optimized_out_vars.js
index 5a10da1aabd58..5801be87a193c 100644
--- a/devtools/client/webconsole/test/browser_console_optimized_out_vars.js
+++ b/devtools/client/webconsole/test/browser_console_optimized_out_vars.js
@@ -8,7 +8,7 @@
 
 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);
@@ -49,7 +49,7 @@ function test() {
   });
 }
 
-// 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;
diff --git a/devtools/client/webconsole/test/browser_console_server_logging.js b/devtools/client/webconsole/test/browser_console_server_logging.js
index 0e280c9757354..fff8665afaf8a 100644
--- a/devtools/client/webconsole/test/browser_console_server_logging.js
+++ b/devtools/client/webconsole/test/browser_console_server_logging.js
@@ -7,7 +7,7 @@
 
 // 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);
 
diff --git a/devtools/client/webconsole/test/browser_console_variables_view.js b/devtools/client/webconsole/test/browser_console_variables_view.js
index f9cf732874902..0527214aeaeed 100644
--- a/devtools/client/webconsole/test/browser_console_variables_view.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view.js
@@ -7,7 +7,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js b/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
index 9f9313e958956..4cc8adc20aa1e 100644
--- a/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view_highlighter.js
@@ -8,7 +8,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js b/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
index 6d678d5812790..02fb611e6e8d4 100644
--- a/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
+++ b/devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js
@@ -9,7 +9,7 @@
 
 "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,
diff --git 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
index 0b2af21df1824..eebeba276689b 100644
--- 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
@@ -8,7 +8,7 @@
 
 "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,
diff --git a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
index c0b06ea0b188b..5375d51aef5be 100644
--- a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js
@@ -8,7 +8,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
index 2bba36cbe1c6b..1b9f75f1baf69 100644
--- a/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
+++ b/devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js
@@ -9,7 +9,7 @@
 
 "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);
diff --git a/devtools/client/webconsole/test/browser_longstring_hang.js b/devtools/client/webconsole/test/browser_longstring_hang.js
index 0382ccca66f80..5db15e0bb8a8a 100644
--- a/devtools/client/webconsole/test/browser_longstring_hang.js
+++ b/devtools/client/webconsole/test/browser_longstring_hang.js
@@ -6,7 +6,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js b/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
index 7e6b7d8b08871..65958dd5d7c23 100644
--- a/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
+++ b/devtools/client/webconsole/test/browser_netmonitor_shows_reqs_in_webconsole.js
@@ -10,7 +10,7 @@ const TEST_URI = "data:text/html;charset=utf8,Test that the netmonitor " +
                  "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";
diff --git a/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js b/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
index 25af7c95f79a1..c0bef5462de13 100644
--- a/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
+++ b/devtools/client/webconsole/test/browser_repeated_messages_accuracy.js
@@ -10,7 +10,7 @@
 
 "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";
 
diff --git a/devtools/client/webconsole/test/browser_result_format_as_string.js b/devtools/client/webconsole/test/browser_result_format_as_string.js
index 975cdd7afd5fb..3abda1954b9a8 100644
--- a/devtools/client/webconsole/test/browser_result_format_as_string.js
+++ b/devtools/client/webconsole/test/browser_result_format_as_string.js
@@ -6,7 +6,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js b/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
index 5031c96f10032..4a4f3c455327a 100644
--- a/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
+++ b/devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js
@@ -5,9 +5,9 @@
 
 "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";
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
index 868488377c07c..f6bea12b91452 100644
--- a/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
@@ -11,7 +11,7 @@
 
 "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";
diff --git a/devtools/client/webconsole/test/browser_webconsole_assert.js b/devtools/client/webconsole/test/browser_webconsole_assert.js
index aab55cd095538..788cf5a55db61 100644
--- a/devtools/client/webconsole/test/browser_webconsole_assert.js
+++ b/devtools/client/webconsole/test/browser_webconsole_assert.js
@@ -7,7 +7,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
index 6d38dad454673..079af004ff5ed 100644
--- a/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_autocomplete_crossdomain_iframe.js
@@ -9,7 +9,7 @@
 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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
index 21957bdb76521..cc9338d62d562 100644
--- a/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js
@@ -8,7 +8,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js b/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
index 4257e650f26da..15f246d8cb117 100644
--- a/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
+++ b/devtools/client/webconsole/test/browser_webconsole_basic_net_logging.js
@@ -8,7 +8,7 @@
 
 "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();
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
index 4f878c58f04fa..a5892ed54aee4 100644
--- a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
@@ -14,7 +14,7 @@
 
 "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";
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js b/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
index e0c4964457a27..05c443107b020 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_1010953_cspro.js
@@ -19,7 +19,7 @@ CSP_REPORT_MSG are confirmed to be found in the console messages.
 
 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 " +
diff --git 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
index 7c51e612981d4..825bf316bb51a 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js b/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
index d5bfdc1a83a13..b4bd21321088f 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_578437_page_reload.js
@@ -7,7 +7,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js b/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
index 703461224cb34..e72f5a4fb704c 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_579412_input_focus.js
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git 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
index 31bbc28602e5b..1fa3f75494e6d 100644
--- 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
@@ -8,7 +8,7 @@
 
 "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* () {
diff --git 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
index 97b7d28f8781b..3be69eeab9c91 100644
--- 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
@@ -9,7 +9,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js b/devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
index 36607452c0564..439499396e403 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_580454_timestamp_l10n.js
@@ -12,7 +12,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js b/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
index d1e39059a3144..a6482340c2e6d 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
@@ -9,7 +9,7 @@
 "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* () {
diff --git 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
index 943871d00fce1..ce0023565745f 100644
--- 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
@@ -5,7 +5,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js b/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
index 21526ff557724..f405e11ad7170 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_585956_console_trace.js
@@ -5,7 +5,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js b/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
index c96b8fcd9195a..92b668bcfb3cd 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_587617_output_copy.js
@@ -10,7 +10,7 @@
 
 "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;
diff --git 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
index 7bdf81386c11b..156569e9eb6e0 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js b/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
index ae4c196dd2831..3b405ff016bc8 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
@@ -5,7 +5,7 @@
 
 "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* () {
diff --git 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
index a9b7e4fd26eae..6c56978a33f0e 100644
--- 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
@@ -5,14 +5,14 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js b/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
index 09f5a94cedcd7..d933399cad233 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js
@@ -12,7 +12,7 @@
 
 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 = [
   {
diff --git 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
index 2be5bdeb06353..10230063f143d 100644
--- 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
@@ -10,7 +10,7 @@
 
 "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;
diff --git 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
index 57d002ecfdd68..f135425ce7ed7 100644
--- 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
@@ -10,7 +10,7 @@
 
 "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";
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js b/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
index 629034398f25d..d5b5df58280b3 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js
@@ -10,7 +10,7 @@
 
 "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";
 
diff --git 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
index cf7e63b83adb6..53e28aae487a7 100644
--- 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
@@ -10,7 +10,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js b/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
index ebbfce3b37718..933b97745aa0a 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_599725_response_headers.js
@@ -11,7 +11,7 @@
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js b/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
index cfa112b94c57c..34880eb8d40e3 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_600183_charset.js
@@ -11,7 +11,7 @@
 "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) {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js b/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
index 12db63eec979a..049e84c8c4fba 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_601177_log_levels.js
@@ -12,7 +12,7 @@
 
 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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js b/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
index 4c86954534363..1ee8045c4775c 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_603750_websocket.js
@@ -10,7 +10,7 @@
 
 "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";
diff --git 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
index 6794274df990b..2182e93ba3729 100644
--- 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
@@ -10,7 +10,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js b/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
index 525751ac3b537..e90c865d2bcf1 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_618078_network_exceptions.js
@@ -9,7 +9,7 @@
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js b/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
index 66b4e5c733eab..6ee7e1400e6d8 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
@@ -9,7 +9,7 @@
 
 "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* () {
diff --git 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
index 69a6631f47752..5f6b671609311 100644
--- 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
@@ -11,7 +11,7 @@
 
 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 = {};
diff --git 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
index 8ae273a945614..fba24fa7eb121 100644
--- 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
@@ -3,7 +3,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js b/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
index 3a33cf366368f..0c4cbd37535b3 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
@@ -5,7 +5,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js b/devtools/client/webconsole/test/browser_webconsole_bug_632817.js
index 7bce32571c821..2717e9be1f0e1 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_632817.js
@@ -9,7 +9,7 @@
 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 =
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js b/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
index 16ac55d194f09..96d8b65583893 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_644419_log_limits.js
@@ -13,7 +13,7 @@ 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;
diff --git 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
index 6af36c327c6ec..4ecc90d0a6589 100644
--- 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
@@ -10,7 +10,7 @@
 
 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";
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js b/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
index afe63308d5a23..f06c262624a69 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js
@@ -8,7 +8,7 @@
 
 "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>" +
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_704295.js b/devtools/client/webconsole/test/browser_webconsole_bug_704295.js
index d9b294ba2c963..262a8f06b2e3c 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_704295.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_704295.js
@@ -7,7 +7,7 @@
 
 "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* () {
diff --git 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
index 1c7811a85b7c6..30383bc2b531f 100644
--- 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
@@ -5,7 +5,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js b/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
index f70761d967ad3..23e3aa38e6a0e 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
@@ -13,7 +13,7 @@
 "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";
diff --git 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
index efd6f27dbcbe6..6334d67f4b12d 100644
--- 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
@@ -6,14 +6,14 @@
 
 "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 " +
diff --git 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
index 43a46b67f55ba..2975afd3fd9fa 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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 " +
diff --git 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
index f7a1613de9403..59e90a597dad3 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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 " +
diff --git 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
index aa3f58eacdd8a..e8d973e14205c 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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";
diff --git 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
index a7f5c11f3ad4c..b8c8384a12c28 100644
--- 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
@@ -8,7 +8,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js b/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
index 9e954c5705853..412348265773e 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_770099_violation.js
@@ -10,7 +10,7 @@
 "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 " +
diff --git 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
index 6d4d1b9130c7a..392643d6ca9b7 100644
--- 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
@@ -6,7 +6,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
index c4a8983838226..48723b93f5695 100644
--- a/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_bug_837351_securityerrors.js
@@ -3,7 +3,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js b/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
index 0f120f687d2ad..baafaff5a4197 100644
--- a/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_cd_iframe.js
@@ -8,7 +8,7 @@
 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 = [{
diff --git a/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js b/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
index 9aa61708841fd..2c1852018bb71 100644
--- a/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
+++ b/devtools/client/webconsole/test/browser_webconsole_certificate_messages.js
@@ -8,7 +8,7 @@
 
 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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js b/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
index 5c8b1dbe90ac4..381f3f946b3ed 100644
--- a/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
+++ b/devtools/client/webconsole/test/browser_webconsole_closure_inspection.js
@@ -8,7 +8,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_column_numbers.js b/devtools/client/webconsole/test/browser_webconsole_column_numbers.js
index ecb4aac5f1449..ea03af445f6b4 100644
--- a/devtools/client/webconsole/test/browser_webconsole_column_numbers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_column_numbers.js
@@ -7,7 +7,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js b/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
index fa143e5be705d..08dbcba42e28b 100644
--- a/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_api_stackframe.js
@@ -9,7 +9,7 @@
 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("/"));
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_console_extras.js b/devtools/client/webconsole/test/browser_webconsole_console_extras.js
index 46261a3e44c1f..1ebaad8ab71cd 100644
--- a/devtools/client/webconsole/test/browser_webconsole_console_extras.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_extras.js
@@ -9,7 +9,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js b/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
index d91bbf55d3efd..a80cc70db5c4b 100644
--- a/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_logging_api.js
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js b/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
index 1a74079bc537b..e38dfc99039ac 100644
--- a/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_logging_workers_api.js
@@ -6,7 +6,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js b/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
index dad7306aae773..d30a8c1176863 100644
--- a/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
+++ b/devtools/client/webconsole/test/browser_webconsole_console_trace_duplicates.js
@@ -5,7 +5,7 @@
 "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);
diff --git a/devtools/client/webconsole/test/browser_webconsole_count.js b/devtools/client/webconsole/test/browser_webconsole_count.js
index ff1dcf10fa925..ae98dd74209cb 100644
--- a/devtools/client/webconsole/test/browser_webconsole_count.js
+++ b/devtools/client/webconsole/test/browser_webconsole_count.js
@@ -6,7 +6,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js b/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
index b3c4c07c0a1f0..50f6ba04dadd8 100644
--- a/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
+++ b/devtools/client/webconsole/test/browser_webconsole_dont_navigate_on_doubleclick.js
@@ -18,7 +18,7 @@ function test() {
   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();
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js b/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
index 5ef63a0ed90ab..50afbcf12eb79 100644
--- a/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
+++ b/devtools/client/webconsole/test/browser_webconsole_exception_stackframe.js
@@ -15,7 +15,7 @@ if (!Services.appinfo.browserTabsRemoteAutostart) {
 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("/"));
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_execution_scope.js b/devtools/client/webconsole/test/browser_webconsole_execution_scope.js
index bf25052d09ea8..66ba904ddb991 100644
--- a/devtools/client/webconsole/test/browser_webconsole_execution_scope.js
+++ b/devtools/client/webconsole/test/browser_webconsole_execution_scope.js
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_for_of.js b/devtools/client/webconsole/test/browser_webconsole_for_of.js
index d361e3d3980d0..7dc09fa1ff071 100644
--- a/devtools/client/webconsole/test/browser_webconsole_for_of.js
+++ b/devtools/client/webconsole/test/browser_webconsole_for_of.js
@@ -5,7 +5,7 @@
 
 "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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_history.js b/devtools/client/webconsole/test/browser_webconsole_history.js
index b0f008677eddc..51080106e16e7 100644
--- a/devtools/client/webconsole/test/browser_webconsole_history.js
+++ b/devtools/client/webconsole/test/browser_webconsole_history.js
@@ -7,7 +7,7 @@
 
 "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.
diff --git a/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js b/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
index 2bac705374081..0c904e21ae6ea 100644
--- a/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js
@@ -7,7 +7,7 @@
 
 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";
diff --git a/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js b/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
index 5812d0aad834a..1ec6de8194da5 100644
--- a/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
+++ b/devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js
@@ -7,7 +7,7 @@
 
 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";
diff --git a/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js b/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
index 056f4c1877efb..74cc65f1e7c31 100644
--- a/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
+++ b/devtools/client/webconsole/test/browser_webconsole_js_input_expansion.js
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_jsterm.js b/devtools/client/webconsole/test/browser_webconsole_jsterm.js
index 48fcfbcd1a1f7..164452c6ac4a1 100644
--- a/devtools/client/webconsole/test/browser_webconsole_jsterm.js
+++ b/devtools/client/webconsole/test/browser_webconsole_jsterm.js
@@ -5,7 +5,7 @@
 
 "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;
diff --git 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
index 62699ef1edfbb..cd872117e0473 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git 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
index 91b7c52d9b34a..0d42ffca921cd 100644
--- 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
@@ -7,7 +7,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js b/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
index 6095eeb53e3c5..67d1e965286a7 100644
--- a/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
+++ b/devtools/client/webconsole/test/browser_webconsole_log_file_filter.js
@@ -7,7 +7,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/browser_webconsole_message_node_id.js b/devtools/client/webconsole/test/browser_webconsole_message_node_id.js
index 81d5c4aecf0d1..6af4a17f43724 100644
--- a/devtools/client/webconsole/test/browser_webconsole_message_node_id.js
+++ b/devtools/client/webconsole/test/browser_webconsole_message_node_id.js
@@ -5,7 +5,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_netlogging.js b/devtools/client/webconsole/test/browser_webconsole_netlogging.js
index eb86b14c8b987..78c1bf379af3d 100644
--- a/devtools/client/webconsole/test/browser_webconsole_netlogging.js
+++ b/devtools/client/webconsole/test/browser_webconsole_netlogging.js
@@ -20,7 +20,7 @@ const TEST_URI = "data:text/html;charset=utf-8,Web Console network " +
 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 =
diff --git a/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js b/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
index ba591c3df1c79..fdf2b1a470de1 100644
--- a/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
+++ b/devtools/client/webconsole/test/browser_webconsole_open-links-without-callback.js
@@ -10,7 +10,7 @@
 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);
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_02.js b/devtools/client/webconsole/test/browser_webconsole_output_02.js
index 5134f673ddb14..0623d9cefe7af 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_02.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_02.js
@@ -7,7 +7,7 @@
 
 "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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_03.js b/devtools/client/webconsole/test/browser_webconsole_output_03.js
index fc7a0f0f0ac90..06d44c6055d6d 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_03.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_03.js
@@ -7,7 +7,7 @@
 
 "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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_04.js b/devtools/client/webconsole/test/browser_webconsole_output_04.js
index 70b86ab9706a0..71b706db4b046 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_04.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_04.js
@@ -13,7 +13,7 @@ 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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
index e6234814b5e61..44e7229e8cf56 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js
@@ -13,7 +13,7 @@ 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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
index 23c9f05e9e3dd..e5a1398e8b3c3 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js
@@ -8,7 +8,7 @@
 
 "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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
index c24db2edb2caa..48f9f91d36d9d 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js
@@ -8,7 +8,7 @@
 
 "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() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
index d4eaf4816fe97..799277e6e5449 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js
@@ -8,7 +8,7 @@
 
 "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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_events.js b/devtools/client/webconsole/test/browser_webconsole_output_events.js
index b0abc18b18668..0b2e0f08379fc 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_events.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_events.js
@@ -12,7 +12,7 @@ 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* () {
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_order.js b/devtools/client/webconsole/test/browser_webconsole_output_order.js
index ec1ee1f6d1416..87849e622bcda 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_order.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_order.js
@@ -8,7 +8,7 @@
 
 "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*() {
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_regexp.js b/devtools/client/webconsole/test/browser_webconsole_output_regexp.js
index 9a8ca766e4bbb..f06beb1fa9a29 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_regexp.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_regexp.js
@@ -7,7 +7,7 @@
 
 "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();
diff --git a/devtools/client/webconsole/test/browser_webconsole_output_table.js b/devtools/client/webconsole/test/browser_webconsole_output_table.js
index bf2c736ffda3c..89f2cf49a6428 100644
--- a/devtools/client/webconsole/test/browser_webconsole_output_table.js
+++ b/devtools/client/webconsole/test/browser_webconsole_output_table.js
@@ -6,7 +6,7 @@
 
 "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 = [
diff --git a/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js b/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
index 01fee6f1d2e76..82b5b5f1ca43b 100644
--- a/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_show_subresource_security_errors.js
@@ -10,7 +10,7 @@
 
 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.";
 
diff --git a/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js b/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
index d3ef8cba860ee..48fb34917071f 100644
--- a/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -10,7 +10,7 @@ const TEST_URI = "data:text/html;charset=utf8,Test that the web console " +
                  "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";
diff --git a/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js b/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
index 356bb1b721cfc..a3df1419a9abb 100644
--- a/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
+++ b/devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js
@@ -6,7 +6,7 @@
 
 "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", {});
diff --git a/devtools/client/webconsole/test/browser_webconsole_view_source.js b/devtools/client/webconsole/test/browser_webconsole_view_source.js
index f36fa1debde73..45e1561678c24 100644
--- a/devtools/client/webconsole/test/browser_webconsole_view_source.js
+++ b/devtools/client/webconsole/test/browser_webconsole_view_source.js
@@ -6,7 +6,7 @@
 
 "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;
diff --git a/devtools/client/webconsole/test/head.js b/devtools/client/webconsole/test/head.js
index 4d5f21f81c69d..05b312ca85dcf 100644
--- a/devtools/client/webconsole/test/head.js
+++ b/devtools/client/webconsole/test/head.js
@@ -1287,7 +1287,7 @@ function waitForMessages(options) {
         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;
         }
       }
diff --git a/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html b/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
index 5b12278d161f2..8e47cf20f9744 100644
--- a/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
+++ b/devtools/client/webconsole/test/test-bug-593003-iframe-wrong-hud.html
@@ -9,6 +9,6 @@
    <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>
diff --git 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
index 273e1a4e5be05..b9939fe83c0fb 100644
--- 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
@@ -9,6 +9,6 @@
   </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>
diff --git 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
index 21f5dd6720f12..7678d15fe0435 100644
--- 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
@@ -9,6 +9,6 @@
   </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>
diff --git 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
index 1d8f5ac4741cf..c0ff6994ad4e3 100644
--- 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
@@ -9,6 +9,6 @@
   </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>
diff --git 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
index 7c749b8c781d6..84e0b6c7284a5 100644
--- 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
@@ -9,6 +9,6 @@
   </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>
diff --git 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
index 7aad0b2c58644..72d86931ad681 100644
--- 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
@@ -9,6 +9,6 @@
   </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>
diff --git 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
index a4d0d7843f86b..f473303f446b8 100644
--- 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
@@ -10,7 +10,7 @@
   <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>
diff --git a/devtools/client/webconsole/test/test-bug-869003-top-window.html b/devtools/client/webconsole/test/test-bug-869003-top-window.html
index ab3b87542f12d..a2da438f6d718 100644
--- a/devtools/client/webconsole/test/test-bug-869003-top-window.html
+++ b/devtools/client/webconsole/test/test-bug-869003-top-window.html
@@ -9,6 +9,6 @@
   <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>
diff --git a/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html b/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
index e9a8553ddcbb3..54a4e90383bd4 100644
--- a/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
+++ b/devtools/client/webconsole/test/test-bug-989025-iframe-parent.html
@@ -8,6 +8,6 @@
   </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>
diff --git a/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html b/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
index 505676acbeee1..dde47a78e33f3 100644
--- a/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
+++ b/devtools/client/webconsole/test/test-iframe-762593-insecure-frame.html
@@ -9,7 +9,7 @@
     <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>
diff --git a/devtools/client/webconsole/test/test-network-request.html b/devtools/client/webconsole/test/test-network-request.html
index f8f75d60b6079..7cb736296d147 100644
--- a/devtools/client/webconsole/test/test-network-request.html
+++ b/devtools/client/webconsole/test/test-network-request.html
@@ -20,7 +20,7 @@
       }
 
       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) {
@@ -32,7 +32,7 @@
     <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>
diff --git a/devtools/client/webide/test/browser_tabs.js b/devtools/client/webide/test/browser_tabs.js
index 42daac0e12f51..764286db1fd20 100644
--- a/devtools/client/webide/test/browser_tabs.js
+++ b/devtools/client/webide/test/browser_tabs.js
@@ -2,7 +2,7 @@
    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();
diff --git a/devtools/client/webide/test/head.js b/devtools/client/webide/test/head.js
index a97ceff16360e..b44269893d0e3 100644
--- a/devtools/client/webide/test/head.js
+++ b/devtools/client/webide/test/head.js
@@ -18,9 +18,9 @@ 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);
diff --git a/devtools/client/webide/test/sidebars/browser_tabs.js b/devtools/client/webide/test/sidebars/browser_tabs.js
index 1e1e618aeb201..3ffe02053a928 100644
--- a/devtools/client/webide/test/sidebars/browser_tabs.js
+++ b/devtools/client/webide/test/sidebars/browser_tabs.js
@@ -2,7 +2,7 @@
    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();
diff --git a/devtools/client/webide/test/templates.json b/devtools/client/webide/test/templates.json
index 8ee4a0dce9d58..e6ffa3efe6a89 100644
--- a/devtools/client/webide/test/templates.json
+++ b/devtools/client/webide/test/templates.json
@@ -1,12 +1,12 @@
 [
   {
-    "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"
diff --git a/devtools/server/actors/animation.js b/devtools/server/actors/animation.js
index 5ac698f4cb008..a63baa86c6348 100644
--- a/devtools/server/actors/animation.js
+++ b/devtools/server/actors/animation.js
@@ -566,7 +566,7 @@ var AnimationsActor = exports.AnimationsActor = ActorClass({
    * 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 = [
diff --git a/devtools/server/actors/common.js b/devtools/server/actors/common.js
index 2ee6bedbc829b..5f9e752d8cf3f 100644
--- a/devtools/server/actors/common.js
+++ b/devtools/server/actors/common.js
@@ -527,8 +527,8 @@ exports.expectState = expectState;
  * 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 () {
diff --git a/devtools/server/actors/framerate.js b/devtools/server/actors/framerate.js
index 4242f6332684a..8415819801ee7 100644
--- a/devtools/server/actors/framerate.js
+++ b/devtools/server/actors/framerate.js
@@ -13,7 +13,7 @@ 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",
diff --git a/devtools/server/actors/highlighters.js b/devtools/server/actors/highlighters.js
index 842b36a795e64..f7d3ac34c671a 100644
--- a/devtools/server/actors/highlighters.js
+++ b/devtools/server/actors/highlighters.js
@@ -470,7 +470,7 @@ let CustomHighlighterActor = exports.CustomHighlighterActor = protocol.ActorClas
    *
    * 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
diff --git a/devtools/server/actors/memory.js b/devtools/server/actors/memory.js
index 7b92d2acda240..d3be25184a05b 100644
--- a/devtools/server/actors/memory.js
+++ b/devtools/server/actors/memory.js
@@ -40,10 +40,10 @@ types.addDictType("AllocationsRecordingOptions", {
  * 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",
diff --git a/devtools/server/actors/performance-recording.js b/devtools/server/actors/performance-recording.js
index 2918fac0487e3..38ef1f8bba6f0 100644
--- a/devtools/server/actors/performance-recording.js
+++ b/devtools/server/actors/performance-recording.js
@@ -19,10 +19,10 @@ 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",
diff --git a/devtools/server/actors/performance.js b/devtools/server/actors/performance.js
index edcfc51c75600..0f4486d13f306 100644
--- a/devtools/server/actors/performance.js
+++ b/devtools/server/actors/performance.js
@@ -35,10 +35,10 @@ const RECORDING_STATE_CHANGE_EVENTS = new Set([
 ]);
 
 /**
- * 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",
diff --git a/devtools/server/actors/profiler.js b/devtools/server/actors/profiler.js
index 7f6a75600cf7c..12865a6c36813 100644
--- a/devtools/server/actors/profiler.js
+++ b/devtools/server/actors/profiler.js
@@ -30,10 +30,10 @@ types.addType("profiler-data", {
 });
 
 /**
- * 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",
diff --git a/devtools/server/actors/timeline.js b/devtools/server/actors/timeline.js
index 8f387e8d8aa61..667aa71560608 100644
--- a/devtools/server/actors/timeline.js
+++ b/devtools/server/actors/timeline.js
@@ -9,11 +9,11 @@
  * 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");
diff --git a/devtools/server/docs/actor-hierarchy.md b/devtools/server/docs/actor-hierarchy.md
index df69ade9249d2..0356fe27134bd 100644
--- a/devtools/server/docs/actor-hierarchy.md
+++ b/devtools/server/docs/actor-hierarchy.md
@@ -1,6 +1,6 @@
 # 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)
diff --git a/devtools/server/docs/actor-registration.md b/devtools/server/docs/actor-registration.md
index 3de80f49026df..ac3dbda31782c 100644
--- a/devtools/server/docs/actor-registration.md
+++ b/devtools/server/docs/actor-registration.md
@@ -30,7 +30,7 @@ DebuggerServer.registerModule("devtools/server/actors/webapps", {
 });
 ```
 
-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.
 
diff --git a/devtools/server/main.js b/devtools/server/main.js
index c40dd9511069f..ca70482e3a8dd 100644
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -596,7 +596,7 @@ var DebuggerServer = {
    * 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
diff --git a/devtools/server/tests/browser/browser.ini b/devtools/server/tests/browser/browser.ini
index 7e81f0915fb74..9cb90a5ccca16 100644
--- a/devtools/server/tests/browser/browser.ini
+++ b/devtools/server/tests/browser/browser.ini
@@ -25,7 +25,7 @@ support-files =
 [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]
@@ -38,41 +38,41 @@ skip-if = e10s # Bug 1183605 - toolkit/devtools/server/tests/browser/ tests are
 [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
@@ -89,8 +89,8 @@ 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
diff --git a/devtools/server/tests/browser/browser_animation_actors_10.js b/devtools/server/tests/browser/browser_animation_actors_10.js
index e9395e2497e68..14b0a4c20a09e 100644
--- a/devtools/server/tests/browser/browser_animation_actors_10.js
+++ b/devtools/server/tests/browser/browser_animation_actors_10.js
@@ -7,7 +7,7 @@
 // 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");
diff --git a/devtools/server/tests/browser/browser_perf-samples-02.js b/devtools/server/tests/browser/browser_perf-samples-02.js
index 8bd6efd40bef1..354368868b950 100644
--- a/devtools/server/tests/browser/browser_perf-samples-02.js
+++ b/devtools/server/tests/browser/browser_perf-samples-02.js
@@ -4,7 +4,7 @@
 /**
  * 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
diff --git a/devtools/server/tests/browser/browser_storage_listings.js b/devtools/server/tests/browser/browser_storage_listings.js
index 41fe6a0c17223..d19c206a17659 100644
--- a/devtools/server/tests/browser/browser_storage_listings.js
+++ b/devtools/server/tests/browser/browser_storage_listings.js
@@ -69,7 +69,7 @@ const storeMap = {
       {
         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,
diff --git a/devtools/server/tests/browser/head.js b/devtools/server/tests/browser/head.js
index 6d04d20e5aa86..dd6fda866801b 100644
--- a/devtools/server/tests/browser/head.js
+++ b/devtools/server/tests/browser/head.js
@@ -14,7 +14,7 @@ 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;
diff --git a/devtools/server/tests/browser/storage-dynamic-windows.html b/devtools/server/tests/browser/storage-dynamic-windows.html
index fe4c8e489f23c..46de6f2db3dca 100644
--- a/devtools/server/tests/browser/storage-dynamic-windows.html
+++ b/devtools/server/tests/browser/storage-dynamic-windows.html
@@ -8,7 +8,7 @@
   <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];
diff --git a/devtools/server/tests/browser/storage-listings.html b/devtools/server/tests/browser/storage-listings.html
index 0cd192da7949e..25cab5999cb6a 100644
--- a/devtools/server/tests/browser/storage-listings.html
+++ b/devtools/server/tests/browser/storage-listings.html
@@ -8,8 +8,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];
diff --git a/devtools/server/tests/mochitest/setup-in-child.js b/devtools/server/tests/mochitest/setup-in-child.js
index 487f2982614b4..bf2231bcbbc3f 100644
--- a/devtools/server/tests/mochitest/setup-in-child.js
+++ b/devtools/server/tests/mochitest/setup-in-child.js
@@ -12,7 +12,7 @@ exports.callParent = function () {
   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"]
     });
diff --git a/devtools/server/tests/mochitest/test_inspector-resolve-url.html b/devtools/server/tests/mochitest/test_inspector-resolve-url.html
index edf4ed1d94f49..e555bfc40a38f 100644
--- a/devtools/server/tests/mochitest/test_inspector-resolve-url.html
+++ b/devtools/server/tests/mochitest/test_inspector-resolve-url.html
@@ -34,7 +34,7 @@
 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();
   });
@@ -42,9 +42,9 @@
 
 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();
   });
 });
@@ -53,7 +53,7 @@
   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();
   });
@@ -62,9 +62,9 @@
 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();
   });
 });
diff --git a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
index 99f7c4a81bc5f..888d2e69b50da 100644
--- a/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageData-wait-for-load.html
@@ -22,7 +22,7 @@
 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";
diff --git a/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
index 13cc14c51a018..cd37a381827eb 100644
--- a/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
+++ b/devtools/server/tests/mochitest/test_inspector_getImageDataFromURL.html
@@ -21,7 +21,7 @@
 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";
diff --git a/devtools/server/tests/mochitest/test_registerActor.html b/devtools/server/tests/mochitest/test_registerActor.html
index b424c4ddac710..2523ce7a8afb1 100644
--- a/devtools/server/tests/mochitest/test_registerActor.html
+++ b/devtools/server/tests/mochitest/test_registerActor.html
@@ -26,7 +26,7 @@
   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();
diff --git a/devtools/server/tests/mochitest/test_setupInParentChild.html b/devtools/server/tests/mochitest/test_setupInParentChild.html
index 4142bbeed1a48..6f79647d0544a 100644
--- a/devtools/server/tests/mochitest/test_setupInParentChild.html
+++ b/devtools/server/tests/mochitest/test_setupInParentChild.html
@@ -68,7 +68,7 @@
 
     // 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"
     });
   };
@@ -89,7 +89,7 @@
   // 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}]
     });
diff --git a/devtools/server/tests/mochitest/test_unsafeDereference.html b/devtools/server/tests/mochitest/test_unsafeDereference.html
index ce765daf5b9f9..df44fac516c94 100644
--- a/devtools/server/tests/mochitest/test_unsafeDereference.html
+++ b/devtools/server/tests/mochitest/test_unsafeDereference.html
@@ -24,7 +24,7 @@
   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;
diff --git a/devtools/shared/Loader.jsm b/devtools/shared/Loader.jsm
index f4657aed08775..75a964291b22e 100644
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@@ -441,7 +441,7 @@ DevToolsLoader.prototype = {
    * 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"
 };
diff --git a/devtools/shared/acorn/UPGRADING.md b/devtools/shared/acorn/UPGRADING.md
index 45cf02fc7c9ae..974dc69a6c019 100644
--- a/devtools/shared/acorn/UPGRADING.md
+++ b/devtools/shared/acorn/UPGRADING.md
@@ -17,12 +17,12 @@ to:
 
 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
diff --git a/devtools/shared/apps/Simulator.jsm b/devtools/shared/apps/Simulator.jsm
index f70936e3ccd17..04952b391c9e6 100644
--- a/devtools/shared/apps/Simulator.jsm
+++ b/devtools/shared/apps/Simulator.jsm
@@ -13,7 +13,7 @@ Components.utils.import("resource://gre/modules/devtools/shared/event-emitter.js
  * 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"];
diff --git a/devtools/shared/gcli/source/docs/index.md b/devtools/shared/gcli/source/docs/index.md
index cdb8c49eef486..dce112e6d974b 100644
--- a/devtools/shared/gcli/source/docs/index.md
+++ b/devtools/shared/gcli/source/docs/index.md
@@ -57,7 +57,7 @@ Other sources of GCLI documentation:
 - 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
diff --git a/devtools/shared/gcli/source/docs/writing-commands.md b/devtools/shared/gcli/source/docs/writing-commands.md
index e8ec5ded1ab15..e73050279184f 100644
--- a/devtools/shared/gcli/source/docs/writing-commands.md
+++ b/devtools/shared/gcli/source/docs/writing-commands.md
@@ -93,7 +93,7 @@ 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.
 
diff --git a/devtools/shared/heapsnapshot/generate-core-dump-sources.sh b/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
index 05abde2ca8677..97e492ff0533e 100755
--- a/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
+++ b/devtools/shared/heapsnapshot/generate-core-dump-sources.sh
@@ -1,7 +1,7 @@
 #!/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.
 #
diff --git a/devtools/shared/jsbeautify/UPGRADING.md b/devtools/shared/jsbeautify/UPGRADING.md
index 99d91c1a3278f..dc6e0fe43965b 100644
--- a/devtools/shared/jsbeautify/UPGRADING.md
+++ b/devtools/shared/jsbeautify/UPGRADING.md
@@ -2,7 +2,7 @@
 
 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:
 
@@ -16,7 +16,7 @@
  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:
 
@@ -28,10 +28,10 @@
  };
  ```
 
-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`
diff --git a/devtools/shared/pretty-fast/UPGRADING.md b/devtools/shared/pretty-fast/UPGRADING.md
index 6ad0071c896f0..bc56b98417e96 100644
--- a/devtools/shared/pretty-fast/UPGRADING.md
+++ b/devtools/shared/pretty-fast/UPGRADING.md
@@ -2,6 +2,6 @@
 
 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`
diff --git a/devtools/shared/shared/framerate.js b/devtools/shared/shared/framerate.js
index 3c61abc4cc2b2..6f56e386794e9 100644
--- a/devtools/shared/shared/framerate.js
+++ b/devtools/shared/shared/framerate.js
@@ -9,7 +9,7 @@ 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) {
diff --git a/devtools/shared/shared/tests/unit/.eslintrc b/devtools/shared/shared/tests/unit/.eslintrc
index 7c26e7b42a364..e48bc0b14babf 100644
--- 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"
 }
diff --git a/devtools/shared/shared/timeline.js b/devtools/shared/shared/timeline.js
index 7724ea3b73a61..40999dd966694 100644
--- a/devtools/shared/shared/timeline.js
+++ b/devtools/shared/shared/timeline.js
@@ -9,7 +9,7 @@
  * 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()
diff --git a/devtools/shared/shared/worker.js b/devtools/shared/shared/worker.js
index 432c059c20077..e5887fb741016 100644
--- a/devtools/shared/shared/worker.js
+++ b/devtools/shared/shared/worker.js
@@ -29,7 +29,7 @@ var MESSAGE_COUNTER = 0;
  * 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.
@@ -115,7 +115,7 @@ DevToolsWorker.prototype.onError = function({ message, filename, lineno }) {
 /**
  * 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 ! ! ! * * * * * *
  *
diff --git a/devtools/shared/sourcemap/UPGRADING.md b/devtools/shared/sourcemap/UPGRADING.md
index f498ca1ae597e..5a257f7e48844 100644
--- a/devtools/shared/sourcemap/UPGRADING.md
+++ b/devtools/shared/sourcemap/UPGRADING.md
@@ -8,6 +8,6 @@ To upgrade the source-map library:
     $ 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/
 
diff --git a/devtools/shared/tern/README b/devtools/shared/tern/README
index 3d65fdd38b3ae..d52ed46454ed8 100644
--- a/devtools/shared/tern/README
+++ b/devtools/shared/tern/README
@@ -7,4 +7,4 @@ Tern is a stand-alone code-analysis engine for JavaScript. It is intended to be
 
 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.
diff --git a/devtools/shared/webconsole/server-logger-monitor.js b/devtools/shared/webconsole/server-logger-monitor.js
index 5d5bc491d6da5..defa7eae04576 100644
--- a/devtools/shared/webconsole/server-logger-monitor.js
+++ b/devtools/shared/webconsole/server-logger-monitor.js
@@ -33,7 +33,7 @@ const acceptableHeaders = ["x-chromelogger-data"];
  * 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
diff --git a/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html b/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
index 034e99ff485bb..d8a143d30acac 100644
--- a/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
+++ b/devtools/shared/webconsole/test/test_jsterm_cd_iframe.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_jsterm_last_result.html b/devtools/shared/webconsole/test/test_jsterm_last_result.html
index 277abdbc7db95..00f619ce050c5 100644
--- a/devtools/shared/webconsole/test/test_jsterm_last_result.html
+++ b/devtools/shared/webconsole/test/test_jsterm_last_result.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_network_get.html b/devtools/shared/webconsole/test/test_network_get.html
index cf094dd5b70a7..14578b896ce39 100644
--- a/devtools/shared/webconsole/test/test_network_get.html
+++ b/devtools/shared/webconsole/test/test_network_get.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_network_longstring.html b/devtools/shared/webconsole/test/test_network_longstring.html
index 5c0bd28407960..c8241abb5469e 100644
--- a/devtools/shared/webconsole/test/test_network_longstring.html
+++ b/devtools/shared/webconsole/test/test_network_longstring.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_network_post.html b/devtools/shared/webconsole/test/test_network_post.html
index de69dc9d95216..af5a3796773ec 100644
--- a/devtools/shared/webconsole/test/test_network_post.html
+++ b/devtools/shared/webconsole/test/test_network_post.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_network_security-hpkp.html b/devtools/shared/webconsole/test/test_network_security-hpkp.html
index a85d159bfbd6d..4699f8a48e6a5 100644
--- a/devtools/shared/webconsole/test/test_network_security-hpkp.html
+++ b/devtools/shared/webconsole/test/test_network_security-hpkp.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_network_security-hsts.html b/devtools/shared/webconsole/test/test_network_security-hsts.html
index 1895c91137557..6ecaf40d0c75d 100644
--- a/devtools/shared/webconsole/test/test_network_security-hsts.html
+++ b/devtools/shared/webconsole/test/test_network_security-hsts.html
@@ -11,7 +11,7 @@
 <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();
diff --git a/devtools/shared/webconsole/test/test_reflow.html b/devtools/shared/webconsole/test/test_reflow.html
index c010604bef4f3..7b7c52e629df9 100644
--- a/devtools/shared/webconsole/test/test_reflow.html
+++ b/devtools/shared/webconsole/test/test_reflow.html
@@ -42,7 +42,7 @@
 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"
   },
   {
diff --git a/dom/base/ChromeUtils.h b/dom/base/ChromeUtils.h
index cca80dfb79f36..915ee030fdd46 100644
--- a/dom/base/ChromeUtils.h
+++ b/dom/base/ChromeUtils.h
@@ -23,14 +23,14 @@ 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,
diff --git a/js/public/ProfilingStack.h b/js/public/ProfilingStack.h
index 86e2608167494..d1d6762f73da0 100644
--- a/js/public/ProfilingStack.h
+++ b/js/public/ProfilingStack.h
@@ -75,7 +75,7 @@ class ProfileEntry
         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,
diff --git a/js/src/asmjs/AsmJSFrameIterator.cpp b/js/src/asmjs/AsmJSFrameIterator.cpp
index c836ac930dea8..1004ce63082b1 100644
--- a/js/src/asmjs/AsmJSFrameIterator.cpp
+++ b/js/src/asmjs/AsmJSFrameIterator.cpp
@@ -682,7 +682,7 @@ 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)";
@@ -726,7 +726,7 @@ AsmJSProfilingFrameIterator::label() const
     // 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)";
diff --git a/js/src/vm/SPSProfiler.cpp b/js/src/vm/SPSProfiler.cpp
index a51715176841d..c8adc412c0602 100644
--- a/js/src/vm/SPSProfiler.cpp
+++ b/js/src/vm/SPSProfiler.cpp
@@ -314,7 +314,7 @@ 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;
diff --git a/mobile/android/chrome/content/RemoteDebugger.js b/mobile/android/chrome/content/RemoteDebugger.js
index 73c82c751f879..7586aaccd90bf 100644
--- a/mobile/android/chrome/content/RemoteDebugger.js
+++ b/mobile/android/chrome/content/RemoteDebugger.js
@@ -39,7 +39,7 @@ var RemoteDebugger = {
    *        }
    *        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.
    */
diff --git a/python/mozbuild/mozbuild/test/test_testing.py b/python/mozbuild/mozbuild/test/test_testing.py
index c9155a9818a7e..3b56abb0fa0dc 100644
--- a/python/mozbuild/mozbuild/test/test_testing.py
+++ b/python/mozbuild/mozbuild/test/test_testing.py
@@ -142,16 +142,16 @@
             "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"
         }
diff --git a/testing/runtimes/mochitest-devtools-chrome.runtimes.json b/testing/runtimes/mochitest-devtools-chrome.runtimes.json
index e965da51b0061..d4e13a43ee221 100644
--- 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_duration.js": 8588, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js": 7554, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_meta_data.js": 5171, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_scrubber_delayed.js": 4850, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_scrubber_enabled.js": 7386, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_scrubber_moves.js": 5733, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_state_after_pause.js": 5371, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_target_nodes.js": 8338, 
+    "devtools/client/animationinspector/test/browser_animation_rate_select_shows_presets.js": 5335, 
+    "devtools/client/animationinspector/test/browser_animation_refresh_on_added_animation.js": 9023, 
+    "devtools/client/animationinspector/test/browser_animation_refresh_on_removed_animation.js": 12069, 
+    "devtools/client/animationinspector/test/browser_animation_refresh_when_active.js": 10349, 
+    "devtools/client/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js": 8856, 
+    "devtools/client/animationinspector/test/browser_animation_setting_currentTime_works_and_pauses.js": 7295, 
+    "devtools/client/animationinspector/test/browser_animation_setting_playbackRate_works.js": 5351, 
+    "devtools/client/animationinspector/test/browser_animation_shows_player_on_valid_node.js": 8520, 
+    "devtools/client/animationinspector/test/browser_animation_target_highlight_select.js": 11921, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_animates.js": 4759, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_displays_with_pref.js": 4454, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_header.js": 4484, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_is_enabled.js": 6885, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_scrubber_exists.js": 4526, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_scrubber_movable.js": 3945, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_shows_delay.js": 4708, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_shows_iterations.js": 4691, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_ui.js": 4491, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_waits_for_delay.js": 3777, 
+    "devtools/client/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js": 5870, 
+    "devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js": 5753, 
+    "devtools/client/animationinspector/test/browser_animation_toggle_button_updates_playerWidgets.js": 5825, 
+    "devtools/client/animationinspector/test/browser_animation_toolbar_exists.js": 5290, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_changes.js": 5799, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js": 10748, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_rate_changes.js": 5908, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_time_changes.js": 6307, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-highlight.js": 3366, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js": 4232, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js": 3645, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-slider-02.js": 3407, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js": 3251, 
+    "devtools/client/commandline/test/browser_cmd_addon.js": 3636, 
+    "devtools/client/commandline/test/browser_cmd_csscoverage_startstop.js": 3888, 
+    "devtools/client/commandline/test/browser_cmd_highlight_01.js": 13146, 
+    "devtools/client/commandline/test/browser_cmd_pagemod_export.js": 3659, 
+    "devtools/client/commandline/test/browser_cmd_screenshot.js": 6829, 
+    "devtools/client/commandline/test/browser_gcli_exec.js": 3804, 
+    "devtools/client/debugger/test/browser_dbg_aaa_run_first_leaktest.js": 4439, 
+    "devtools/client/debugger/test/browser_dbg_addon-modules-unpacked.js": 4516, 
+    "devtools/client/debugger/test/browser_dbg_addon-modules.js": 5270, 
+    "devtools/client/debugger/test/browser_dbg_addon-panels.js": 5365, 
+    "devtools/client/debugger/test/browser_dbg_addon-sources.js": 5104, 
+    "devtools/client/debugger/test/browser_dbg_auto-pretty-print-01.js": 3801, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-01.js": 3330, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-02.js": 3478, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-03.js": 3533, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-04.js": 3475, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-06.js": 3521, 
+    "devtools/client/debugger/test/browser_dbg_breadcrumbs-access.js": 3606, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-01.js": 3348, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-02.js": 5630, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-03.js": 3231, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-04.js": 3460, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-05.js": 3386, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-06.js": 4856, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-08.js": 3566, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-actual-location.js": 3565, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-actual-location2.js": 4238, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js": 21298, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-button-01.js": 3718, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-button-02.js": 3197, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-condition-thrown-message.js": 4440, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-contextmenu-add.js": 3811, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-contextmenu.js": 10667, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-disabled-reload.js": 7390, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-editor.js": 3693, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-eval.js": 3177, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-highlight.js": 3582, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-new-script.js": 3863, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-other-tabs.js": 5351, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-pane.js": 3835, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-reload.js": 3734, 
+    "devtools/client/debugger/test/browser_dbg_bug-896139.js": 4069, 
+    "devtools/client/debugger/test/browser_dbg_closure-inspection.js": 7951, 
+    "devtools/client/debugger/test/browser_dbg_cmd-blackbox.js": 5206, 
+    "devtools/client/debugger/test/browser_dbg_cmd-break.js": 4698, 
+    "devtools/client/debugger/test/browser_dbg_cmd-dbg.js": 5582, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-01.js": 10253, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-02.js": 4188, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-03.js": 3597, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-04.js": 4432, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-05.js": 5954, 
+    "devtools/client/debugger/test/browser_dbg_console-eval.js": 3984, 
+    "devtools/client/debugger/test/browser_dbg_console-named-eval.js": 3581, 
+    "devtools/client/debugger/test/browser_dbg_controller-evaluate-01.js": 3783, 
+    "devtools/client/debugger/test/browser_dbg_controller-evaluate-02.js": 3682, 
+    "devtools/client/debugger/test/browser_dbg_editor-contextmenu.js": 3594, 
+    "devtools/client/debugger/test/browser_dbg_editor-mode.js": 3764, 
+    "devtools/client/debugger/test/browser_dbg_file-reload.js": 3285, 
+    "devtools/client/debugger/test/browser_dbg_function-display-name.js": 3674, 
+    "devtools/client/debugger/test/browser_dbg_hit-counts-01.js": 3313, 
+    "devtools/client/debugger/test/browser_dbg_host-layout.js": 15477, 
+    "devtools/client/debugger/test/browser_dbg_iframes.js": 3291, 
+    "devtools/client/debugger/test/browser_dbg_interrupts.js": 3283, 
+    "devtools/client/debugger/test/browser_dbg_listtabs-02.js": 3207, 
+    "devtools/client/debugger/test/browser_dbg_location-changes-01-simple.js": 4432, 
+    "devtools/client/debugger/test/browser_dbg_location-changes-02-blank.js": 3740, 
+    "devtools/client/debugger/test/browser_dbg_location-changes-03-new.js": 4061, 
+    "devtools/client/debugger/test/browser_dbg_location-changes-04-breakpoint.js": 6050, 
+    "devtools/client/debugger/test/browser_dbg_on-pause-highlight.js": 3557, 
+    "devtools/client/debugger/test/browser_dbg_optimized-out-vars.js": 3872, 
+    "devtools/client/debugger/test/browser_dbg_pause-exceptions-01.js": 4701, 
+    "devtools/client/debugger/test/browser_dbg_pause-exceptions-02.js": 4798, 
+    "devtools/client/debugger/test/browser_dbg_pause-no-step.js": 3623, 
+    "devtools/client/debugger/test/browser_dbg_pause-resume.js": 3218, 
+    "devtools/client/debugger/test/browser_dbg_pause-warning.js": 5224, 
+    "devtools/client/debugger/test/browser_dbg_paused-keybindings.js": 4147, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-01.js": 3456, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-02.js": 3491, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-03.js": 4160, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-04.js": 3875, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-05.js": 3401, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-06.js": 3350, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-07.js": 3481, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-08.js": 4316, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-09.js": 4008, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-10.js": 3297, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-11.js": 4315, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-12.js": 3553, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-13.js": 3617, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-on-paused.js": 4450, 
+    "devtools/client/debugger/test/browser_dbg_progress-listener-bug.js": 3650, 
+    "devtools/client/debugger/test/browser_dbg_promises-allocation-stack.js": 3555, 
+    "devtools/client/debugger/test/browser_dbg_promises-fulfillment-stack.js": 3563, 
+    "devtools/client/debugger/test/browser_dbg_promises-rejection-stack.js": 3561, 
+    "devtools/client/debugger/test/browser_dbg_reload-preferred-script-01.js": 3405, 
+    "devtools/client/debugger/test/browser_dbg_reload-preferred-script-02.js": 3370, 
+    "devtools/client/debugger/test/browser_dbg_reload-preferred-script-03.js": 3512, 
+    "devtools/client/debugger/test/browser_dbg_reload-same-script.js": 6132, 
+    "devtools/client/debugger/test/browser_dbg_scripts-switching-01.js": 4649, 
+    "devtools/client/debugger/test/browser_dbg_scripts-switching-02.js": 4648, 
+    "devtools/client/debugger/test/browser_dbg_scripts-switching-03.js": 3401, 
+    "devtools/client/debugger/test/browser_dbg_search-autofill-identifier.js": 3673, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-01.js": 5445, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-02.js": 5529, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-03.js": 4785, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-04.js": 3606, 
+    "devtools/client/debugger/test/browser_dbg_search-global-01.js": 5509, 
+    "devtools/client/debugger/test/browser_dbg_search-global-02.js": 5151, 
+    "devtools/client/debugger/test/browser_dbg_search-global-03.js": 5075, 
+    "devtools/client/debugger/test/browser_dbg_search-global-04.js": 4315, 
+    "devtools/client/debugger/test/browser_dbg_search-global-05.js": 5778, 
+    "devtools/client/debugger/test/browser_dbg_search-global-06.js": 7162, 
+    "devtools/client/debugger/test/browser_dbg_search-popup-jank.js": 5101, 
+    "devtools/client/debugger/test/browser_dbg_search-sources-01.js": 5406, 
+    "devtools/client/debugger/test/browser_dbg_search-sources-02.js": 5483, 
+    "devtools/client/debugger/test/browser_dbg_search-sources-03.js": 4172, 
+    "devtools/client/debugger/test/browser_dbg_search-symbols.js": 6951, 
+    "devtools/client/debugger/test/browser_dbg_searchbox-help-popup-01.js": 4200, 
+    "devtools/client/debugger/test/browser_dbg_searchbox-help-popup-02.js": 4091, 
+    "devtools/client/debugger/test/browser_dbg_searchbox-parse.js": 3359, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-01.js": 9963, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-02.js": 5140, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-03.js": 4781, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-04.js": 5407, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-05.js": 6144, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-01.js": 4983, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-02.js": 5341, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-03.js": 4432, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-04.js": 5492, 
+    "devtools/client/debugger/test/browser_dbg_sources-bookmarklet.js": 3702, 
+    "devtools/client/debugger/test/browser_dbg_sources-cache.js": 4659, 
+    "devtools/client/debugger/test/browser_dbg_sources-contextmenu-01.js": 3952, 
+    "devtools/client/debugger/test/browser_dbg_sources-contextmenu-02.js": 4246, 
+    "devtools/client/debugger/test/browser_dbg_sources-eval-02.js": 3842, 
+    "devtools/client/debugger/test/browser_dbg_sources-keybindings.js": 3758, 
+    "devtools/client/debugger/test/browser_dbg_sources-labels.js": 3708, 
+    "devtools/client/debugger/test/browser_dbg_sources-sorting.js": 3750, 
+    "devtools/client/debugger/test/browser_dbg_split-console-paused-reload.js": 8976, 
+    "devtools/client/debugger/test/browser_dbg_stack-01.js": 4215, 
+    "devtools/client/debugger/test/browser_dbg_stack-02.js": 4585, 
+    "devtools/client/debugger/test/browser_dbg_stack-03.js": 12530, 
+    "devtools/client/debugger/test/browser_dbg_stack-04.js": 4387, 
+    "devtools/client/debugger/test/browser_dbg_stack-05.js": 4647, 
+    "devtools/client/debugger/test/browser_dbg_stack-06.js": 4572, 
+    "devtools/client/debugger/test/browser_dbg_stack-07.js": 5815, 
+    "devtools/client/debugger/test/browser_dbg_step-out.js": 5295, 
+    "devtools/client/debugger/test/browser_dbg_terminate-on-tab-close.js": 4394, 
+    "devtools/client/debugger/test/browser_dbg_tracing-01.js": 3931, 
+    "devtools/client/debugger/test/browser_dbg_tracing-02.js": 3789, 
+    "devtools/client/debugger/test/browser_dbg_tracing-03.js": 4172, 
+    "devtools/client/debugger/test/browser_dbg_tracing-04.js": 3879, 
+    "devtools/client/debugger/test/browser_dbg_tracing-05.js": 3845, 
+    "devtools/client/debugger/test/browser_dbg_tracing-06.js": 3514, 
+    "devtools/client/debugger/test/browser_dbg_tracing-07.js": 4016, 
+    "devtools/client/debugger/test/browser_dbg_tracing-08.js": 4805, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-01.js": 3687, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-02.js": 3784, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-03.js": 4105, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-04.js": 3796, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-05.js": 3961, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-06.js": 4789, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-accessibility.js": 4512, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-data.js": 3950, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-cancel.js": 4695, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-click.js": 3773, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-getset-01.js": 16042, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-getset-02.js": 5854, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-value.js": 8457, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-watch.js": 7097, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-01.js": 12423, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-02.js": 12976, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-03.js": 9968, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-04.js": 9092, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-05.js": 9445, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-pref.js": 4211, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-searchbox.js": 4036, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-parameters-01.js": 7696, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-parameters-02.js": 5491, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-parameters-03.js": 11403, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-with.js": 5338, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js": 4651, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-hide-non-enums.js": 4392, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-large-array-buffer.js": 11929, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-override-01.js": 9352, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-override-02.js": 5197, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-01.js": 7427, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-02.js": 6221, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-03.js": 5290, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-04.js": 5354, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-05.js": 5345, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-06.js": 5420, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-07.js": 7074, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-08.js": 5639, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-09.js": 5955, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-10.js": 6085, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-11.js": 7112, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-12.js": 6986, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-13.js": 7907, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-15.js": 6411, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-16.js": 13041, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-reexpand-01.js": 24723, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-reexpand-02.js": 29720, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-reexpand-03.js": 6593, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-webidl.js": 11423, 
+    "devtools/client/debugger/test/browser_dbg_watch-expressions-01.js": 5303, 
+    "devtools/client/debugger/test/browser_dbg_watch-expressions-02.js": 12206, 
+    "devtools/client/fontinspector/test/browser_fontinspector.js": 5603, 
+    "devtools/client/fontinspector/test/browser_fontinspector_edit-previews-show-all.js": 3612, 
+    "devtools/client/fontinspector/test/browser_fontinspector_edit-previews.js": 3415, 
+    "devtools/client/fontinspector/test/browser_fontinspector_theme-change.js": 3909, 
+    "devtools/client/framework/test/browser_devtools_api.js": 3717, 
+    "devtools/client/framework/test/browser_keybindings.js": 3679, 
+    "devtools/client/framework/test/browser_keybindings_01.js": 4615, 
+    "devtools/client/framework/test/browser_new_activation_workflow.js": 3551, 
+    "devtools/client/framework/test/browser_toolbox_hosts.js": 6796, 
+    "devtools/client/framework/test/browser_toolbox_hosts_size.js": 5268, 
+    "devtools/client/framework/test/browser_toolbox_options.js": 5115, 
+    "devtools/client/framework/test/browser_toolbox_options_disable_buttons.js": 4083, 
+    "devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js": 7633, 
+    "devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js": 9709, 
+    "devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js": 6582, 
+    "devtools/client/framework/test/browser_toolbox_theme_registration.js": 4244, 
+    "devtools/client/framework/test/browser_toolbox_toggle.js": 9638, 
+    "devtools/client/framework/test/browser_toolbox_tool_ready.js": 5819, 
+    "devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js": 6378, 
+    "devtools/client/framework/test/browser_toolbox_view_source_04.js": 3626, 
+    "devtools/client/framework/test/browser_toolbox_window_reload_target.js": 13041, 
+    "devtools/client/framework/test/browser_toolbox_window_shortcuts.js": 4286, 
+    "devtools/client/framework/test/browser_toolbox_window_title_changes.js": 4976, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs.js": 7142, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_highlight_hover.js": 3180, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_keybinding.js": 8701, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_menu.js": 3549, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_mutations.js": 4993, 
+    "devtools/client/inspector/test/browser_inspector_delete-selected-node-01.js": 3520, 
+    "devtools/client/inspector/test/browser_inspector_delete-selected-node-02.js": 4896, 
+    "devtools/client/inspector/test/browser_inspector_delete-selected-node-03.js": 3535, 
+    "devtools/client/inspector/test/browser_inspector_destroy-after-navigation.js": 4242, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-01.js": 3364, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-02.js": 5192, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-03.js": 4610, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-comments.js": 4905, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-csstransform_01.js": 3211, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_02.js": 4385, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_03.js": 3480, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_04.js": 3490, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_05.js": 4776, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-hover_01.js": 4612, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-hover_02.js": 3235, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-hover_03.js": 3435, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-iframes.js": 4939, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-inline.js": 8232, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_01.js": 4884, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_02.js": 4755, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_03.js": 3473, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_04.js": 3342, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-options.js": 4135, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-rect_02.js": 3197, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-rulers_02.js": 3188, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-selector_01.js": 3777, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-selector_02.js": 3276, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-xbl.js": 3550, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-zoom.js": 4423, 
+    "devtools/client/inspector/test/browser_inspector_iframe-navigation.js": 3472, 
+    "devtools/client/inspector/test/browser_inspector_infobar_01.js": 4769, 
+    "devtools/client/inspector/test/browser_inspector_initialization.js": 10479, 
+    "devtools/client/inspector/test/browser_inspector_invalidate.js": 3653, 
+    "devtools/client/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js": 3881, 
+    "devtools/client/inspector/test/browser_inspector_keyboard-shortcuts.js": 3813, 
+    "devtools/client/inspector/test/browser_inspector_menu-01-sensitivity.js": 5519, 
+    "devtools/client/inspector/test/browser_inspector_menu-01.js": 9344, 
+    "devtools/client/inspector/test/browser_inspector_menu-02-copy-items.js": 3784, 
+    "devtools/client/inspector/test/browser_inspector_menu-03-paste-items.js": 5441, 
+    "devtools/client/inspector/test/browser_inspector_menu-04-other.js": 5088, 
+    "devtools/client/inspector/test/browser_inspector_navigation.js": 5264, 
+    "devtools/client/inspector/test/browser_inspector_pane-toggle-03.js": 3592, 
+    "devtools/client/inspector/test/browser_inspector_picker-stop-on-destroy.js": 5700, 
+    "devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js": 5411, 
+    "devtools/client/inspector/test/browser_inspector_reload-01.js": 3513, 
+    "devtools/client/inspector/test/browser_inspector_reload-02.js": 3947, 
+    "devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js": 3640, 
+    "devtools/client/inspector/test/browser_inspector_search-01.js": 9354, 
+    "devtools/client/inspector/test/browser_inspector_search-02.js": 6798, 
+    "devtools/client/inspector/test/browser_inspector_search-03.js": 6803, 
+    "devtools/client/inspector/test/browser_inspector_search-04.js": 4311, 
+    "devtools/client/inspector/test/browser_inspector_search-05.js": 4759, 
+    "devtools/client/inspector/test/browser_inspector_search-navigation.js": 8900, 
+    "devtools/client/inspector/test/browser_inspector_search-reserved.js": 5376, 
+    "devtools/client/inspector/test/browser_inspector_select-docshell.js": 3732, 
+    "devtools/client/inspector/test/browser_inspector_select-last-selected.js": 10300, 
+    "devtools/client/inspector/test/browser_inspector_sidebarstate.js": 7512, 
+    "devtools/client/layoutview/test/browser_layoutview.js": 4816, 
+    "devtools/client/layoutview/test/browser_layoutview_editablemodel.js": 5766, 
+    "devtools/client/layoutview/test/browser_layoutview_editablemodel_stylerules.js": 4262, 
+    "devtools/client/layoutview/test/browser_layoutview_update-after-navigation.js": 5688, 
+    "devtools/client/layoutview/test/browser_layoutview_update-after-reload.js": 4557, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_01.js": 5509, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_02.js": 5719, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_03.js": 3242, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_04.js": 3475, 
+    "devtools/client/markupview/test/browser_markupview_copy_image_data.js": 3848, 
+    "devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js": 6180, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js": 3866, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js": 4209, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_isDragging.js": 3993, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js": 6812, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_textSelection.js": 3437, 
+    "devtools/client/markupview/test/browser_markupview_events-overflow.js": 5318, 
+    "devtools/client/markupview/test/browser_markupview_events.js": 8689, 
+    "devtools/client/markupview/test/browser_markupview_events_form.js": 3199, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.0.js": 6250, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.1.js": 6640, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.11.1.js": 7257, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.2.js": 5715, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.3.js": 8079, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.4.js": 7983, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.6.js": 9979, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_1.7.js": 8661, 
+    "devtools/client/markupview/test/browser_markupview_events_jquery_2.1.1.js": 7746, 
+    "devtools/client/markupview/test/browser_markupview_html_edit_01.js": 8473, 
+    "devtools/client/markupview/test/browser_markupview_html_edit_02.js": 8134, 
+    "devtools/client/markupview/test/browser_markupview_html_edit_03.js": 6147, 
+    "devtools/client/markupview/test/browser_markupview_image_tooltip.js": 3372, 
+    "devtools/client/markupview/test/browser_markupview_image_tooltip_mutations.js": 3254, 
+    "devtools/client/markupview/test/browser_markupview_keybindings_01.js": 3299, 
+    "devtools/client/markupview/test/browser_markupview_keybindings_03.js": 3451, 
+    "devtools/client/markupview/test/browser_markupview_keybindings_04.js": 4198, 
+    "devtools/client/markupview/test/browser_markupview_links_01.js": 6352, 
+    "devtools/client/markupview/test/browser_markupview_links_02.js": 4059, 
+    "devtools/client/markupview/test/browser_markupview_links_03.js": 3707, 
+    "devtools/client/markupview/test/browser_markupview_links_04.js": 5422, 
+    "devtools/client/markupview/test/browser_markupview_links_05.js": 5892, 
+    "devtools/client/markupview/test/browser_markupview_links_06.js": 7548, 
+    "devtools/client/markupview/test/browser_markupview_links_07.js": 5762, 
+    "devtools/client/markupview/test/browser_markupview_load_01.js": 10491, 
+    "devtools/client/markupview/test/browser_markupview_mutation_01.js": 6098, 
+    "devtools/client/markupview/test/browser_markupview_mutation_02.js": 3358, 
+    "devtools/client/markupview/test/browser_markupview_navigation.js": 8466, 
+    "devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js": 5252, 
+    "devtools/client/markupview/test/browser_markupview_pagesize_01.js": 4644, 
+    "devtools/client/markupview/test/browser_markupview_pagesize_02.js": 4714, 
+    "devtools/client/markupview/test/browser_markupview_search_01.js": 4275, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_01.js": 6499, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_03.js": 3526, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_04.js": 8442, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_05.js": 4825, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_06.js": 5136, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_07.js": 4537, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_08.js": 4726, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_09.js": 3390, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_10.js": 3329, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_12.js": 3714, 
+    "devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js": 5145, 
+    "devtools/client/markupview/test/browser_markupview_toggle_01.js": 3730, 
+    "devtools/client/markupview/test/browser_markupview_toggle_02.js": 3691, 
+    "devtools/client/markupview/test/browser_markupview_toggle_03.js": 4166, 
+    "devtools/client/markupview/test/browser_markupview_update-on-navigtion.js": 3818, 
+    "devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js": 4078, 
+    "devtools/client/netmonitor/test/browser_net_aaa_leaktest.js": 3776, 
+    "devtools/client/netmonitor/test/browser_net_accessibility-01.js": 9465, 
+    "devtools/client/netmonitor/test/browser_net_accessibility-02.js": 9419, 
+    "devtools/client/netmonitor/test/browser_net_api-calls.js": 3406, 
+    "devtools/client/netmonitor/test/browser_net_autoscroll.js": 10638, 
+    "devtools/client/netmonitor/test/browser_net_cached-status.js": 3817, 
+    "devtools/client/netmonitor/test/browser_net_complex-params.js": 4835, 
+    "devtools/client/netmonitor/test/browser_net_content-type.js": 5359, 
+    "devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js": 4297, 
+    "devtools/client/netmonitor/test/browser_net_copy_params.js": 4402, 
+    "devtools/client/netmonitor/test/browser_net_copy_response.js": 4343, 
+    "devtools/client/netmonitor/test/browser_net_curl-utils.js": 3531, 
+    "devtools/client/netmonitor/test/browser_net_details-no-duplicated-content.js": 4121, 
+    "devtools/client/netmonitor/test/browser_net_filter-01.js": 7654, 
+    "devtools/client/netmonitor/test/browser_net_filter-02.js": 10866, 
+    "devtools/client/netmonitor/test/browser_net_filter-03.js": 10641, 
+    "devtools/client/netmonitor/test/browser_net_filter-04.js": 4344, 
+    "devtools/client/netmonitor/test/browser_net_footer-summary.js": 7876, 
+    "devtools/client/netmonitor/test/browser_net_html-preview.js": 3992, 
+    "devtools/client/netmonitor/test/browser_net_icon-preview.js": 5345, 
+    "devtools/client/netmonitor/test/browser_net_image-tooltip.js": 5498, 
+    "devtools/client/netmonitor/test/browser_net_json-long.js": 13553, 
+    "devtools/client/netmonitor/test/browser_net_json-malformed.js": 3957, 
+    "devtools/client/netmonitor/test/browser_net_large-response.js": 3404, 
+    "devtools/client/netmonitor/test/browser_net_persistent_logs.js": 3784, 
+    "devtools/client/netmonitor/test/browser_net_post-data-01.js": 3337, 
+    "devtools/client/netmonitor/test/browser_net_prefs-reload.js": 15071, 
+    "devtools/client/netmonitor/test/browser_net_req-resp-bodies.js": 3978, 
+    "devtools/client/netmonitor/test/browser_net_resend.js": 4125, 
+    "devtools/client/netmonitor/test/browser_net_security-state.js": 3782, 
+    "devtools/client/netmonitor/test/browser_net_security-tab-deselect.js": 3401, 
+    "devtools/client/netmonitor/test/browser_net_security-tab-visibility.js": 4613, 
+    "devtools/client/netmonitor/test/browser_net_sort-01.js": 7583, 
+    "devtools/client/netmonitor/test/browser_net_sort-02.js": 7739, 
+    "devtools/client/netmonitor/test/browser_net_sort-03.js": 10294, 
+    "devtools/client/netmonitor/test/browser_net_statistics-01.js": 4253, 
+    "devtools/client/netmonitor/test/browser_net_statistics-02.js": 4900, 
+    "devtools/client/netmonitor/test/browser_net_status-codes.js": 4390, 
+    "devtools/client/netmonitor/test/browser_net_timing-division.js": 5635, 
+    "devtools/client/performance/test/browser_aaa-run-first-leaktest.js": 3922, 
+    "devtools/client/performance/test/browser_markers-cycle-collection.js": 5663, 
+    "devtools/client/performance/test/browser_perf-categories-js-calltree.js": 7688, 
+    "devtools/client/performance/test/browser_perf-clear-01.js": 6499, 
+    "devtools/client/performance/test/browser_perf-clear-02.js": 7684, 
+    "devtools/client/performance/test/browser_perf-columns-js-calltree.js": 7489, 
+    "devtools/client/performance/test/browser_perf-columns-memory-calltree.js": 5427, 
+    "devtools/client/performance/test/browser_perf-compatibility-02.js": 4383, 
+    "devtools/client/performance/test/browser_perf-compatibility-04.js": 4726, 
+    "devtools/client/performance/test/browser_perf-compatibility-05.js": 5828, 
+    "devtools/client/performance/test/browser_perf-compatibility-07.js": 5350, 
+    "devtools/client/performance/test/browser_perf-compatibility-08.js": 6000, 
+    "devtools/client/performance/test/browser_perf-console-record-01.js": 4358, 
+    "devtools/client/performance/test/browser_perf-console-record-02.js": 4518, 
+    "devtools/client/performance/test/browser_perf-console-record-03.js": 4118, 
+    "devtools/client/performance/test/browser_perf-console-record-04.js": 6559, 
+    "devtools/client/performance/test/browser_perf-console-record-05.js": 7694, 
+    "devtools/client/performance/test/browser_perf-console-record-06.js": 6193, 
+    "devtools/client/performance/test/browser_perf-console-record-07.js": 5022, 
+    "devtools/client/performance/test/browser_perf-console-record-08.js": 8244, 
+    "devtools/client/performance/test/browser_perf-console-record-09.js": 3267, 
+    "devtools/client/performance/test/browser_perf-data-massaging-01.js": 5714, 
+    "devtools/client/performance/test/browser_perf-data-samples.js": 4214, 
+    "devtools/client/performance/test/browser_perf-details-01.js": 5107, 
+    "devtools/client/performance/test/browser_perf-details-02.js": 4982, 
+    "devtools/client/performance/test/browser_perf-details-03.js": 7917, 
+    "devtools/client/performance/test/browser_perf-details-04.js": 7457, 
+    "devtools/client/performance/test/browser_perf-details-05.js": 6441, 
+    "devtools/client/performance/test/browser_perf-details-06.js": 6284, 
+    "devtools/client/performance/test/browser_perf-details-07.js": 4967, 
+    "devtools/client/performance/test/browser_perf-details-calltree-render.js": 7373, 
+    "devtools/client/performance/test/browser_perf-details-flamegraph-render.js": 7079, 
+    "devtools/client/performance/test/browser_perf-details-memory-calltree-render.js": 7306, 
+    "devtools/client/performance/test/browser_perf-details-memory-flamegraph-render.js": 7016, 
+    "devtools/client/performance/test/browser_perf-details-waterfall-render.js": 6486, 
+    "devtools/client/performance/test/browser_perf-events-calltree.js": 4586, 
+    "devtools/client/performance/test/browser_perf-front-profiler-02.js": 3293, 
+    "devtools/client/performance/test/browser_perf-front-profiler-03.js": 4835, 
+    "devtools/client/performance/test/browser_perf-front-profiler-04.js": 4725, 
+    "devtools/client/performance/test/browser_perf-highlighted.js": 5287, 
+    "devtools/client/performance/test/browser_perf-jit-view-01.js": 6934, 
+    "devtools/client/performance/test/browser_perf-jit-view-02.js": 6069, 
+    "devtools/client/performance/test/browser_perf-legacy-front-01.js": 6385, 
+    "devtools/client/performance/test/browser_perf-legacy-front-02.js": 4189, 
+    "devtools/client/performance/test/browser_perf-legacy-front-03.js": 4815, 
+    "devtools/client/performance/test/browser_perf-legacy-front-04.js": 4751, 
+    "devtools/client/performance/test/browser_perf-legacy-front-05.js": 5658, 
+    "devtools/client/performance/test/browser_perf-legacy-front-06.js": 4346, 
+    "devtools/client/performance/test/browser_perf-loading-01.js": 4100, 
+    "devtools/client/performance/test/browser_perf-loading-02.js": 6159, 
+    "devtools/client/performance/test/browser_perf-options-02.js": 4177, 
+    "devtools/client/performance/test/browser_perf-options-allocations.js": 4746, 
+    "devtools/client/performance/test/browser_perf-options-enable-framerate.js": 5054, 
+    "devtools/client/performance/test/browser_perf-options-enable-memory-01.js": 6278, 
+    "devtools/client/performance/test/browser_perf-options-enable-memory-02.js": 6307, 
+    "devtools/client/performance/test/browser_perf-options-enable-optimizations.js": 6682, 
+    "devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-01.js": 5224, 
+    "devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-02.js": 5140, 
+    "devtools/client/performance/test/browser_perf-options-invert-call-tree-01.js": 5127, 
+    "devtools/client/performance/test/browser_perf-options-invert-call-tree-02.js": 4895, 
+    "devtools/client/performance/test/browser_perf-options-invert-flame-graph-01.js": 5175, 
+    "devtools/client/performance/test/browser_perf-options-invert-flame-graph-02.js": 5111, 
+    "devtools/client/performance/test/browser_perf-options-profiler.js": 4538, 
+    "devtools/client/performance/test/browser_perf-options-show-idle-blocks-01.js": 5171, 
+    "devtools/client/performance/test/browser_perf-options-show-idle-blocks-02.js": 5110, 
+    "devtools/client/performance/test/browser_perf-options-show-platform-data-01.js": 7857, 
+    "devtools/client/performance/test/browser_perf-options-show-platform-data-02.js": 5732, 
+    "devtools/client/performance/test/browser_perf-overview-render-01.js": 6622, 
+    "devtools/client/performance/test/browser_perf-overview-render-02.js": 17065, 
+    "devtools/client/performance/test/browser_perf-overview-render-03.js": 16375, 
+    "devtools/client/performance/test/browser_perf-overview-render-04.js": 4775, 
+    "devtools/client/performance/test/browser_perf-overview-selection-01.js": 5402, 
+    "devtools/client/performance/test/browser_perf-overview-selection-02.js": 8407, 
+    "devtools/client/performance/test/browser_perf-overview-selection-03.js": 5697, 
+    "devtools/client/performance/test/browser_perf-overview-time-interval.js": 5383, 
+    "devtools/client/performance/test/browser_perf-recording-model-01.js": 3967, 
+    "devtools/client/performance/test/browser_perf-recording-selected-02.js": 3249, 
+    "devtools/client/performance/test/browser_perf-recording-selected-03.js": 3398, 
+    "devtools/client/performance/test/browser_perf-recording-selected-04.js": 4388, 
+    "devtools/client/performance/test/browser_perf-refresh.js": 3955, 
+    "devtools/client/performance/test/browser_perf-states.js": 5245, 
+    "devtools/client/performance/test/browser_perf-theme-toggle-01.js": 8835, 
+    "devtools/client/performance/test/browser_perf_recordings-io-01.js": 3358, 
+    "devtools/client/performance/test/browser_profiler_tree-view-11.js": 4353, 
+    "devtools/client/performance/test/browser_timeline-filters-02.js": 4161, 
+    "devtools/client/performance/test/browser_timeline-filters.js": 6007, 
+    "devtools/client/performance/test/browser_timeline-waterfall-background.js": 5631, 
+    "devtools/client/performance/test/browser_timeline-waterfall-generic.js": 6463, 
+    "devtools/client/projecteditor/test/browser_projecteditor_delete_file.js": 5010, 
+    "devtools/client/projecteditor/test/browser_projecteditor_editing_01.js": 3803, 
+    "devtools/client/projecteditor/test/browser_projecteditor_external_change.js": 4226, 
+    "devtools/client/projecteditor/test/browser_projecteditor_rename_file.js": 10960, 
+    "devtools/client/projecteditor/test/browser_projecteditor_tree_selection_01.js": 4194, 
+    "devtools/client/projecteditor/test/browser_projecteditor_tree_selection_02.js": 3468, 
+    "devtools/client/responsivedesign/test/browser_responsivecomputedview.js": 4803, 
+    "devtools/client/responsivedesign/test/browser_responsiveruleview.js": 4356, 
+    "devtools/client/scratchpad/test/browser_scratchpad_close_toolbox.js": 4487, 
+    "devtools/client/scratchpad/test/browser_scratchpad_disable_view_menu_items.js": 6957, 
+    "devtools/client/scratchpad/test/browser_scratchpad_restore.js": 4431, 
+    "devtools/client/scratchpad/test/browser_scratchpad_unsaved.js": 3548, 
+    "devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js": 3770, 
+    "devtools/client/shadereditor/test/browser_se_editors-error-gutter.js": 3324, 
+    "devtools/client/shared/test/browser_css_color.js": 3210, 
+    "devtools/client/shared/test/browser_tableWidget_basic.js": 5684, 
+    "devtools/client/shared/test/browser_telemetry_button_eyedropper.js": 4659, 
+    "devtools/client/shared/test/browser_telemetry_button_paintflashing.js": 4289, 
+    "devtools/client/shared/test/browser_telemetry_button_responsive.js": 3260, 
+    "devtools/client/shared/test/browser_telemetry_button_scratchpad.js": 6509, 
+    "devtools/client/shared/test/browser_telemetry_button_tilt.js": 4443, 
+    "devtools/client/shared/test/browser_telemetry_sidebar.js": 7095, 
+    "devtools/client/shared/test/browser_telemetry_toolbox.js": 7083, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_inspector.js": 4773, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js": 4055, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js": 3343, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_netmonitor.js": 3557, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_options.js": 3276, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_styleeditor.js": 3360, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js": 3549, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_webconsole.js": 3438, 
+    "devtools/client/shared/test/browser_toolbar_basic.js": 3950, 
+    "devtools/client/shared/test/browser_toolbar_webconsole_errors_count.js": 3634, 
+    "devtools/client/sourceeditor/test/browser_codemirror.js": 4597, 
+    "devtools/client/sourceeditor/test/browser_vimemacs.js": 35225, 
+    "devtools/client/storage/test/browser_storage_basic.js": 10104, 
+    "devtools/client/storage/test/browser_storage_dynamic_updates.js": 6616, 
+    "devtools/client/storage/test/browser_storage_sidebar.js": 6947, 
+    "devtools/client/storage/test/browser_storage_values.js": 5949, 
+    "devtools/client/styleeditor/test/browser_styleeditor_autocomplete-disabled.js": 3960, 
+    "devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js": 5172, 
+    "devtools/client/styleeditor/test/browser_styleeditor_bug_740541_iframes.js": 3541, 
+    "devtools/client/styleeditor/test/browser_styleeditor_cmd_edit.js": 4046, 
+    "devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js": 3434, 
+    "devtools/client/styleeditor/test/browser_styleeditor_inline_friendly_names.js": 4172, 
+    "devtools/client/styleeditor/test/browser_styleeditor_loading.js": 3185, 
+    "devtools/client/styleeditor/test/browser_styleeditor_media_sidebar.js": 3861, 
+    "devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js": 3381, 
+    "devtools/client/styleeditor/test/browser_styleeditor_missing_stylesheet.js": 3814, 
+    "devtools/client/styleeditor/test/browser_styleeditor_navigate.js": 4238, 
+    "devtools/client/styleeditor/test/browser_styleeditor_reload.js": 5118, 
+    "devtools/client/styleeditor/test/browser_styleeditor_scroll.js": 3489, 
+    "devtools/client/styleeditor/test/browser_styleeditor_sourcemap_large.js": 3571, 
+    "devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js": 7289, 
+    "devtools/client/styleeditor/test/browser_styleeditor_sourcemaps.js": 6423, 
+    "devtools/client/styleeditor/test/browser_styleeditor_transition_rule.js": 4142, 
+    "devtools/client/styleeditor/test/browser_styleeditor_xul.js": 3377, 
+    "devtools/client/styleinspector/test/browser_computedview_browser-styles.js": 6322, 
+    "devtools/client/styleinspector/test/browser_computedview_cycle_color.js": 3470, 
+    "devtools/client/styleinspector/test/browser_computedview_getNodeInfo.js": 3640, 
+    "devtools/client/styleinspector/test/browser_computedview_keybindings_01.js": 3505, 
+    "devtools/client/styleinspector/test/browser_computedview_keybindings_02.js": 4083, 
+    "devtools/client/styleinspector/test/browser_computedview_matched-selectors-toggle.js": 3622, 
+    "devtools/client/styleinspector/test/browser_computedview_matched-selectors_01.js": 3944, 
+    "devtools/client/styleinspector/test/browser_computedview_matched-selectors_02.js": 3440, 
+    "devtools/client/styleinspector/test/browser_computedview_media-queries.js": 3633, 
+    "devtools/client/styleinspector/test/browser_computedview_no-results-placeholder.js": 4025, 
+    "devtools/client/styleinspector/test/browser_computedview_original-source-link.js": 6130, 
+    "devtools/client/styleinspector/test/browser_computedview_pseudo-element_01.js": 4567, 
+    "devtools/client/styleinspector/test/browser_computedview_refresh-on-style-change_01.js": 3616, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter.js": 5152, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter_clear.js": 6340, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter_context-menu.js": 3472, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter_escape-keypress.js": 6345, 
+    "devtools/client/styleinspector/test/browser_computedview_select-and-copy-styles.js": 3773, 
+    "devtools/client/styleinspector/test/browser_computedview_style-editor-link.js": 6267, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-and-reselect.js": 4069, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_01.js": 3337, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_02.js": 3209, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_03.js": 3228, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-svg.js": 3202, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_01.js": 11785, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_02.js": 3300, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_03.js": 3645, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_04.js": 3323, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js": 5311, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js": 4210, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js": 3460, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js": 3341, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_01.js": 7334, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_02.js": 6402, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-new-property_01.js": 5680, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-new-property_02.js": 6634, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js": 3730, 
+    "devtools/client/styleinspector/test/browser_ruleview_content_01.js": 3283, 
+    "devtools/client/styleinspector/test/browser_ruleview_content_02.js": 3195, 
+    "devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js": 3240, 
+    "devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js": 5574, 
+    "devtools/client/styleinspector/test/browser_ruleview_copy_styles.js": 3976, 
+    "devtools/client/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js": 3597, 
+    "devtools/client/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js": 3276, 
+    "devtools/client/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js": 3391, 
+    "devtools/client/styleinspector/test/browser_ruleview_custom.js": 3730, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-cancel.js": 3179, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-commit.js": 3547, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-computed.js": 3395, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-increments.js": 5384, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-order.js": 3465, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_01.js": 3188, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_02.js": 3307, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_03.js": 3309, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_01.js": 4623, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_02.js": 3990, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_03.js": 3417, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_04.js": 3527, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_05.js": 3470, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_06.js": 3389, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_07.js": 3339, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector-commit.js": 3957, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_01.js": 3368, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_02.js": 3860, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_04.js": 3524, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_05.js": 3599, 
+    "devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_01.js": 4278, 
+    "devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_02.js": 3812, 
+    "devtools/client/styleinspector/test/browser_ruleview_eyedropper.js": 4302, 
+    "devtools/client/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js": 3305, 
+    "devtools/client/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js": 3415, 
+    "devtools/client/styleinspector/test/browser_ruleview_inherit.js": 3684, 
+    "devtools/client/styleinspector/test/browser_ruleview_keybindings.js": 3205, 
+    "devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_01.js": 4708, 
+    "devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_02.js": 4470, 
+    "devtools/client/styleinspector/test/browser_ruleview_livepreview.js": 3831, 
+    "devtools/client/styleinspector/test/browser_ruleview_mark_overridden_02.js": 3201, 
+    "devtools/client/styleinspector/test/browser_ruleview_mark_overridden_05.js": 3243, 
+    "devtools/client/styleinspector/test/browser_ruleview_mathml-element.js": 3701, 
+    "devtools/client/styleinspector/test/browser_ruleview_media-queries.js": 3236, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js": 3372, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js": 3401, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js": 3289, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple_properties_01.js": 3229, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple_properties_02.js": 3204, 
+    "devtools/client/styleinspector/test/browser_ruleview_original-source-link.js": 4831, 
+    "devtools/client/styleinspector/test/browser_ruleview_override.js": 4901, 
+    "devtools/client/styleinspector/test/browser_ruleview_pseudo-element_01.js": 5458, 
+    "devtools/client/styleinspector/test/browser_ruleview_pseudo-element_02.js": 3745, 
+    "devtools/client/styleinspector/test/browser_ruleview_pseudo_lock_options.js": 4545, 
+    "devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js": 3406, 
+    "devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js": 3868, 
+    "devtools/client/styleinspector/test/browser_ruleview_refresh-on-style-change.js": 3173, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js": 3597, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_02.js": 3313, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_03.js": 3291, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_04.js": 3316, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_05.js": 3256, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_06.js": 3416, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_07.js": 3263, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_08.js": 3386, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_clear.js": 3280, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js": 3330, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-overridden-property.js": 3290, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_01.js": 3538, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_02.js": 3503, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_03.js": 3234, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_04.js": 3865, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_05.js": 3395, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_06.js": 3384, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_07.js": 3306, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_08.js": 3300, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_09.js": 3258, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_10.js": 3471, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_11.js": 3234, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_12.js": 3628, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_13.js": 3553, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_14.js": 3365, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_15.js": 3424, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_16.js": 3321, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_clear.js": 3307, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js": 3277, 
+    "devtools/client/styleinspector/test/browser_ruleview_select-and-copy-styles.js": 3330, 
+    "devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_02.js": 3250, 
+    "devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_03.js": 3540, 
+    "devtools/client/styleinspector/test/browser_ruleview_selector_highlight.js": 4739, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js": 4957, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_01.js": 4880, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_02.js": 3689, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_03.js": 3341, 
+    "devtools/client/styleinspector/test/browser_ruleview_style-editor-link.js": 5544, 
+    "devtools/client/styleinspector/test/browser_ruleview_urls-clickable.js": 4611, 
+    "devtools/client/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js": 3608, 
+    "devtools/client/styleinspector/test/browser_ruleview_user-agent-styles.js": 12999, 
+    "devtools/client/styleinspector/test/browser_ruleview_user-property-reset.js": 4872, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js": 10071, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js": 3563, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-data-uri.js": 4826, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js": 5173, 
+    "devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js": 6125, 
+    "devtools/client/styleinspector/test/browser_styleinspector_refresh_when_active.js": 4256, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-background-image.js": 3947, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js": 3738, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js": 3828, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js": 3622, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js": 3171, 
+    "devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-01.js": 3429, 
+    "devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-02.js": 3628, 
+    "devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-03.js": 3199, 
+    "devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-04.js": 3324, 
+    "devtools/client/timeline/test/browser_timeline_overview-initial-selection-01.js": 3274, 
+    "devtools/client/timeline/test/browser_timeline_overview-update.js": 3363, 
+    "devtools/client/timeline/test/browser_timeline_recording-without-memory.js": 3666, 
+    "devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js": 4611, 
+    "devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js": 4558, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-click.js": 3483, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js": 3702, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js": 3203, 
+    "devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js": 3879, 
+    "devtools/client/webaudioeditor/test/browser_wa_inspector-width.js": 4077, 
+    "devtools/client/webaudioeditor/test/browser_wa_navigate.js": 3626, 
+    "devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js": 3447, 
+    "devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js": 5327, 
+    "devtools/client/webaudioeditor/test/browser_wa_reset-03.js": 3849, 
+    "devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js": 3707, 
+    "devtools/client/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js": 5470, 
+    "devtools/client/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js": 4853, 
+    "devtools/client/webconsole/test/browser_console_history_persist.js": 6497, 
+    "devtools/client/webconsole/test/browser_console_iframe_messages.js": 3719, 
+    "devtools/client/webconsole/test/browser_console_native_getters.js": 5641, 
+    "devtools/client/webconsole/test/browser_console_optimized_out_vars.js": 3968, 
+    "devtools/client/webconsole/test/browser_console_private_browsing.js": 5279, 
+    "devtools/client/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js": 4810, 
+    "devtools/client/webconsole/test/browser_console_variables_view_highlighter.js": 5594, 
+    "devtools/client/webconsole/test/browser_console_variables_view_while_debugging.js": 3711, 
+    "devtools/client/webconsole/test/browser_console_variables_view_while_debugging_and_inspecting.js": 5181, 
+    "devtools/client/webconsole/test/browser_eval_in_debugger_stackframe.js": 4323, 
+    "devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js": 3476, 
+    "devtools/client/webconsole/test/browser_jsterm_inspect.js": 7231, 
+    "devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js": 3560, 
+    "devtools/client/webconsole/test/browser_webconsole_autocomplete_in_debugger_stackframe.js": 4267, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_593003_iframe_wrong_hud.js": 3706, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_595350_multiple_windows_and_tabs.js": 4885, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_595934_message_categories.js": 6058, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js": 4874, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js": 3478, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_597756_reopen_closed_tab.js": 3748, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_602572_log_bodies_checkbox.js": 6123, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js": 4114, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js": 3647, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_659907_console_dir.js": 5328, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js": 9285, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js": 3911, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js": 3361, 
+    "devtools/client/webconsole/test/browser_webconsole_cached_autocomplete.js": 4756, 
+    "devtools/client/webconsole/test/browser_webconsole_certificate_messages.js": 3530, 
+    "devtools/client/webconsole/test/browser_webconsole_clickable_urls.js": 7432, 
+    "devtools/client/webconsole/test/browser_webconsole_closure_inspection.js": 6972, 
+    "devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js": 4494, 
+    "devtools/client/webconsole/test/browser_webconsole_hsts_invalid-headers.js": 3642, 
+    "devtools/client/webconsole/test/browser_webconsole_inspect-parsed-documents.js": 3387, 
+    "devtools/client/webconsole/test/browser_webconsole_jsterm.js": 3301, 
+    "devtools/client/webconsole/test/browser_webconsole_network_panel.js": 3790, 
+    "devtools/client/webconsole/test/browser_webconsole_output_01.js": 3805, 
+    "devtools/client/webconsole/test/browser_webconsole_output_02.js": 7481, 
+    "devtools/client/webconsole/test/browser_webconsole_output_03.js": 6231, 
+    "devtools/client/webconsole/test/browser_webconsole_output_04.js": 5284, 
+    "devtools/client/webconsole/test/browser_webconsole_output_05.js": 5314, 
+    "devtools/client/webconsole/test/browser_webconsole_output_06.js": 6424, 
+    "devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js": 4538, 
+    "devtools/client/webconsole/test/browser_webconsole_output_dom_elements_02.js": 5507, 
+    "devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js": 3443, 
+    "devtools/client/webconsole/test/browser_webconsole_output_dom_elements_04.js": 4847, 
+    "devtools/client/webconsole/test/browser_webconsole_split.js": 8445, 
+    "devtools/client/webconsole/test/browser_webconsole_split_escape_key.js": 3609, 
+    "devtools/client/webconsole/test/browser_webconsole_split_persist.js": 7189, 
+    "devtools/client/webide/test/browser_tabs.js": 5134, 
+    "devtools/client/webide/test/sidebars/browser_tabs.js": 5627, 
+    "devtools/server/tests/browser/browser_animation_actors_05.js": 3304, 
+    "devtools/server/tests/browser/browser_markers-cycle-collection.js": 6946, 
+    "devtools/server/tests/browser/browser_perf-samples-01.js": 3364, 
+    "devtools/server/tests/browser/browser_storage_dynamic_windows.js": 5281, 
+    "devtools/server/tests/browser/browser_storage_listings.js": 4344
   }
 }
\ No newline at end of file
diff --git a/testing/runtimes/mochitest-e10s-devtools-chrome.runtimes.json b/testing/runtimes/mochitest-e10s-devtools-chrome.runtimes.json
index f6f78871cddd2..37621b5f5f91b 100644
--- a/testing/runtimes/mochitest-e10s-devtools-chrome.runtimes.json
+++ b/testing/runtimes/mochitest-e10s-devtools-chrome.runtimes.json
@@ -1,677 +1,677 @@
 {
   "excluded_test_average": 1680, 
   "runtimes": {
-    "browser/devtools/animationinspector/test/browser_animation_empty_on_invalid_nodes.js": 12285, 
-    "browser/devtools/animationinspector/test/browser_animation_iterationCount_hidden_by_default.js": 5435, 
-    "browser/devtools/animationinspector/test/browser_animation_panel_exists.js": 4363, 
-    "browser/devtools/animationinspector/test/browser_animation_participate_in_inspector_update.js": 8931, 
-    "browser/devtools/animationinspector/test/browser_animation_play_pause_button.js": 6211, 
-    "browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js": 5595, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js": 8908, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_compositor_icon.js": 5493, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_destroy.js": 5814, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js": 9653, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js": 7312, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js": 6095, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_meta_data.js": 5636, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_scrubber_delayed.js": 5410, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_scrubber_enabled.js": 8588, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_scrubber_moves.js": 6014, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_state_after_pause.js": 5654, 
-    "browser/devtools/animationinspector/test/browser_animation_playerWidgets_target_nodes.js": 8359, 
-    "browser/devtools/animationinspector/test/browser_animation_rate_select_shows_presets.js": 5730, 
-    "browser/devtools/animationinspector/test/browser_animation_refresh_on_added_animation.js": 8991, 
-    "browser/devtools/animationinspector/test/browser_animation_refresh_on_removed_animation.js": 12190, 
-    "browser/devtools/animationinspector/test/browser_animation_refresh_when_active.js": 9913, 
-    "browser/devtools/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js": 9449, 
-    "browser/devtools/animationinspector/test/browser_animation_setting_currentTime_works_and_pauses.js": 6998, 
-    "browser/devtools/animationinspector/test/browser_animation_setting_playbackRate_works.js": 5559, 
-    "browser/devtools/animationinspector/test/browser_animation_shows_player_on_valid_node.js": 8780, 
-    "browser/devtools/animationinspector/test/browser_animation_target_highlight_select.js": 13841, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_displays_with_pref.js": 4629, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_header.js": 5449, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_exists.js": 5453, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_scrubber_movable.js": 4118, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_shows_delay.js": 4794, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_shows_iterations.js": 4800, 
-    "browser/devtools/animationinspector/test/browser_animation_timeline_ui.js": 5451, 
-    "browser/devtools/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js": 6372, 
-    "browser/devtools/animationinspector/test/browser_animation_toggle_button_toggles_animations.js": 6716, 
-    "browser/devtools/animationinspector/test/browser_animation_toggle_button_updates_playerWidgets.js": 6231, 
-    "browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js": 5268, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_changes.js": 6050, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js": 10907, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_rate_changes.js": 6160, 
-    "browser/devtools/animationinspector/test/browser_animation_ui_updates_when_animation_time_changes.js": 6306, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-highlight.js": 4223, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-search.js": 3325, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js": 4689, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js": 4009, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-clear.js": 3030, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-02.js": 3493, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js": 3055, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-02.js": 3316, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-slider-02.js": 3935, 
-    "browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js": 3796, 
-    "browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js": 4702, 
-    "browser/devtools/debugger/test/browser_dbg_addon-panels.js": 3745, 
-    "browser/devtools/debugger/test/browser_dbg_addon-sources.js": 4264, 
-    "browser/devtools/debugger/test/browser_dbg_auto-pretty-print-01.js": 3642, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-01.js": 3107, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-02.js": 3357, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-03.js": 3337, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-04.js": 3350, 
-    "browser/devtools/debugger/test/browser_dbg_blackboxing-06.js": 3374, 
-    "browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js": 3612, 
-    "browser/devtools/debugger/test/browser_dbg_break-in-anon.js": 3008, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js": 3399, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js": 5571, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js": 3066, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js": 3189, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js": 3368, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js": 4827, 
-    "browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js": 3440, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location.js": 3252, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location2.js": 4019, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-condition-thrown-message.js": 4274, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js": 3551, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu.js": 10987, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-editor.js": 3506, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-highlight.js": 3460, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-new-script.js": 3579, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-other-tabs.js": 5073, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-pane.js": 3671, 
-    "browser/devtools/debugger/test/browser_dbg_breakpoints-reload.js": 3893, 
-    "browser/devtools/debugger/test/browser_dbg_bug-896139.js": 3970, 
-    "browser/devtools/debugger/test/browser_dbg_closure-inspection.js": 7462, 
-    "browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js": 4720, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-01.js": 9986, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-02.js": 4160, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-03.js": 3447, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-04.js": 4374, 
-    "browser/devtools/debugger/test/browser_dbg_conditional-breakpoints-05.js": 5768, 
-    "browser/devtools/debugger/test/browser_dbg_console-eval.js": 3458, 
-    "browser/devtools/debugger/test/browser_dbg_console-named-eval.js": 3284, 
-    "browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js": 3531, 
-    "browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js": 3443, 
-    "browser/devtools/debugger/test/browser_dbg_editor-contextmenu.js": 3222, 
-    "browser/devtools/debugger/test/browser_dbg_editor-mode.js": 3422, 
-    "browser/devtools/debugger/test/browser_dbg_file-reload.js": 3426, 
-    "browser/devtools/debugger/test/browser_dbg_function-display-name.js": 3522, 
-    "browser/devtools/debugger/test/browser_dbg_host-layout.js": 13617, 
-    "browser/devtools/debugger/test/browser_dbg_location-changes-01-simple.js": 3793, 
-    "browser/devtools/debugger/test/browser_dbg_location-changes-02-blank.js": 3289, 
-    "browser/devtools/debugger/test/browser_dbg_on-pause-highlight.js": 3018, 
-    "browser/devtools/debugger/test/browser_dbg_optimized-out-vars.js": 3544, 
-    "browser/devtools/debugger/test/browser_dbg_pause-exceptions-01.js": 4931, 
-    "browser/devtools/debugger/test/browser_dbg_pause-exceptions-02.js": 4469, 
-    "browser/devtools/debugger/test/browser_dbg_pause-no-step.js": 3212, 
-    "browser/devtools/debugger/test/browser_dbg_pause-warning.js": 5125, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-03.js": 3312, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-04.js": 3253, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-08.js": 3538, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-09.js": 3389, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-11.js": 3761, 
-    "browser/devtools/debugger/test/browser_dbg_pretty-print-on-paused.js": 3629, 
-    "browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js": 3059, 
-    "browser/devtools/debugger/test/browser_dbg_reload-same-script.js": 5718, 
-    "browser/devtools/debugger/test/browser_dbg_scripts-switching-01.js": 3888, 
-    "browser/devtools/debugger/test/browser_dbg_scripts-switching-02.js": 3897, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-01.js": 4636, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-02.js": 4903, 
-    "browser/devtools/debugger/test/browser_dbg_search-basic-03.js": 4004, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-01.js": 4780, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-02.js": 4264, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-04.js": 3504, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-05.js": 5042, 
-    "browser/devtools/debugger/test/browser_dbg_search-global-06.js": 6285, 
-    "browser/devtools/debugger/test/browser_dbg_search-popup-jank.js": 4340, 
-    "browser/devtools/debugger/test/browser_dbg_search-sources-01.js": 4648, 
-    "browser/devtools/debugger/test/browser_dbg_search-sources-02.js": 4809, 
-    "browser/devtools/debugger/test/browser_dbg_search-sources-03.js": 3349, 
-    "browser/devtools/debugger/test/browser_dbg_search-symbols.js": 6866, 
-    "browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-01.js": 3335, 
-    "browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-02.js": 3231, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-01.js": 8966, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-02.js": 4395, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-03.js": 3662, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-04.js": 4565, 
-    "browser/devtools/debugger/test/browser_dbg_server-conditional-bp-05.js": 5054, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-01.js": 3566, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-02.js": 4368, 
-    "browser/devtools/debugger/test/browser_dbg_source-maps-03.js": 3616, 
-    "browser/devtools/debugger/test/browser_dbg_sources-cache.js": 3633, 
-    "browser/devtools/debugger/test/browser_dbg_sources-contextmenu-02.js": 3429, 
-    "browser/devtools/debugger/test/browser_dbg_split-console-paused-reload.js": 7696, 
-    "browser/devtools/debugger/test/browser_dbg_stack-01.js": 3200, 
-    "browser/devtools/debugger/test/browser_dbg_stack-02.js": 3551, 
-    "browser/devtools/debugger/test/browser_dbg_stack-04.js": 3208, 
-    "browser/devtools/debugger/test/browser_dbg_stack-05.js": 3535, 
-    "browser/devtools/debugger/test/browser_dbg_stack-06.js": 3542, 
-    "browser/devtools/debugger/test/browser_dbg_stack-07.js": 4639, 
-    "browser/devtools/debugger/test/browser_dbg_step-out.js": 4322, 
-    "browser/devtools/debugger/test/browser_dbg_terminate-on-tab-close.js": 3123, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-06.js": 3670, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js": 3376, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-data.js": 3071, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-cancel.js": 3467, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-01.js": 14260, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-02.js": 4382, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-value.js": 7150, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-edit-watch.js": 6109, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-01.js": 9750, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-02.js": 10102, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-03.js": 7860, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-04.js": 7244, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-filter-05.js": 7558, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-01.js": 6207, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-02.js": 4285, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-03.js": 9279, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js": 4060, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js": 3177, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-hide-non-enums.js": 3127, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js": 8637, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js": 7491, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js": 3469, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js": 6266, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js": 4727, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js": 3812, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js": 3835, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js": 3849, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js": 3925, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js": 5613, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js": 4042, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js": 4526, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js": 4507, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js": 5817, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js": 5605, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js": 6666, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js": 4846, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js": 10729, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-01.js": 18626, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-02.js": 22085, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-03.js": 4911, 
-    "browser/devtools/debugger/test/browser_dbg_variables-view-webidl.js": 8910, 
-    "browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js": 3766, 
-    "browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js": 10682, 
-    "browser/devtools/eyedropper/test/browser_eyedropper_cmd.js": 3182, 
-    "browser/devtools/fontinspector/test/browser_fontinspector.js": 6435, 
-    "browser/devtools/fontinspector/test/browser_fontinspector_edit-previews-show-all.js": 3196, 
-    "browser/devtools/fontinspector/test/browser_fontinspector_edit-previews.js": 3370, 
-    "browser/devtools/fontinspector/test/browser_fontinspector_theme-change.js": 3385, 
-    "browser/devtools/framework/test/browser_devtools_api.js": 4474, 
-    "browser/devtools/framework/test/browser_keybindings_01.js": 4229, 
-    "browser/devtools/framework/test/browser_new_activation_workflow.js": 3242, 
-    "browser/devtools/framework/test/browser_toolbox_hosts.js": 7420, 
-    "browser/devtools/framework/test/browser_toolbox_hosts_size.js": 5263, 
-    "browser/devtools/framework/test/browser_toolbox_options.js": 5315, 
-    "browser/devtools/framework/test/browser_toolbox_options_disable_buttons.js": 4162, 
-    "browser/devtools/framework/test/browser_toolbox_tabsswitch_shortcuts.js": 6124, 
-    "browser/devtools/framework/test/browser_toolbox_theme_registration.js": 4537, 
-    "browser/devtools/framework/test/browser_toolbox_toggle.js": 9755, 
-    "browser/devtools/framework/test/browser_toolbox_tool_ready.js": 5447, 
-    "browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js": 6195, 
-    "browser/devtools/framework/test/browser_toolbox_view_source_04.js": 3819, 
-    "browser/devtools/framework/test/browser_toolbox_window_reload_target.js": 13519, 
-    "browser/devtools/framework/test/browser_toolbox_window_shortcuts.js": 4591, 
-    "browser/devtools/framework/test/browser_toolbox_window_title_changes.js": 4718, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs.js": 7618, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_keybinding.js": 4622, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_menu.js": 3268, 
-    "browser/devtools/inspector/test/browser_inspector_breadcrumbs_mutations.js": 4294, 
-    "browser/devtools/inspector/test/browser_inspector_delete-selected-node-01.js": 3268, 
-    "browser/devtools/inspector/test/browser_inspector_delete-selected-node-02.js": 4676, 
-    "browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js": 3243, 
-    "browser/devtools/inspector/test/browser_inspector_destroy-after-navigation.js": 3433, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-01.js": 3125, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-02.js": 4140, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-03.js": 3761, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-comments.js": 4330, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_01.js": 3014, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_02.js": 3799, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_03.js": 3189, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_04.js": 3257, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-geometry_05.js": 4029, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-hover_01.js": 4410, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-hover_03.js": 3088, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-iframes.js": 3891, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-inline.js": 6529, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_01.js": 4026, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_02.js": 3727, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-keybinding_03.js": 3033, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-options.js": 3563, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-selector_01.js": 3143, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-xbl.js": 3242, 
-    "browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js": 3550, 
-    "browser/devtools/inspector/test/browser_inspector_iframe-navigation.js": 3034, 
-    "browser/devtools/inspector/test/browser_inspector_infobar_01.js": 4162, 
-    "browser/devtools/inspector/test/browser_inspector_initialization.js": 7620, 
-    "browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js": 3210, 
-    "browser/devtools/inspector/test/browser_inspector_keyboard-shortcuts.js": 3678, 
-    "browser/devtools/inspector/test/browser_inspector_menu-01-sensitivity.js": 5592, 
-    "browser/devtools/inspector/test/browser_inspector_menu-02-copy-items.js": 3605, 
-    "browser/devtools/inspector/test/browser_inspector_menu-03-paste-items.js": 4583, 
-    "browser/devtools/inspector/test/browser_inspector_menu-04-other.js": 4594, 
-    "browser/devtools/inspector/test/browser_inspector_navigation.js": 4824, 
-    "browser/devtools/inspector/test/browser_inspector_pane-toggle-03.js": 3182, 
-    "browser/devtools/inspector/test/browser_inspector_picker-stop-on-destroy.js": 3890, 
-    "browser/devtools/inspector/test/browser_inspector_pseudoclass-lock.js": 4801, 
-    "browser/devtools/inspector/test/browser_inspector_reload-01.js": 3442, 
-    "browser/devtools/inspector/test/browser_inspector_reload-02.js": 3501, 
-    "browser/devtools/inspector/test/browser_inspector_remove-iframe-during-load.js": 3505, 
-    "browser/devtools/inspector/test/browser_inspector_search-01.js": 8325, 
-    "browser/devtools/inspector/test/browser_inspector_search-02.js": 6056, 
-    "browser/devtools/inspector/test/browser_inspector_search-03.js": 6210, 
-    "browser/devtools/inspector/test/browser_inspector_search-04.js": 3960, 
-    "browser/devtools/inspector/test/browser_inspector_search-05.js": 4576, 
-    "browser/devtools/inspector/test/browser_inspector_search-navigation.js": 7580, 
-    "browser/devtools/inspector/test/browser_inspector_search-reserved.js": 5117, 
-    "browser/devtools/inspector/test/browser_inspector_select-docshell.js": 3170, 
-    "browser/devtools/inspector/test/browser_inspector_select-last-selected.js": 8788, 
-    "browser/devtools/inspector/test/browser_inspector_sidebarstate.js": 5631, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_01.js": 6561, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_03.js": 3108, 
-    "browser/devtools/markupview/test/browser_markupview_anonymous_04.js": 3090, 
-    "browser/devtools/markupview/test/browser_markupview_copy_image_data.js": 3715, 
-    "browser/devtools/markupview/test/browser_markupview_css_completion_style_attribute.js": 5810, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js": 3706, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js": 3846, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js": 3591, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js": 6069, 
-    "browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js": 3274, 
-    "browser/devtools/markupview/test/browser_markupview_events_form.js": 3195, 
-    "browser/devtools/markupview/test/browser_markupview_html_edit_01.js": 8015, 
-    "browser/devtools/markupview/test/browser_markupview_html_edit_02.js": 6846, 
-    "browser/devtools/markupview/test/browser_markupview_html_edit_03.js": 5282, 
-    "browser/devtools/markupview/test/browser_markupview_image_tooltip.js": 3050, 
-    "browser/devtools/markupview/test/browser_markupview_keybindings_03.js": 3109, 
-    "browser/devtools/markupview/test/browser_markupview_keybindings_04.js": 3617, 
-    "browser/devtools/markupview/test/browser_markupview_links_01.js": 5603, 
-    "browser/devtools/markupview/test/browser_markupview_links_02.js": 3271, 
-    "browser/devtools/markupview/test/browser_markupview_links_03.js": 3065, 
-    "browser/devtools/markupview/test/browser_markupview_links_04.js": 4575, 
-    "browser/devtools/markupview/test/browser_markupview_links_05.js": 5228, 
-    "browser/devtools/markupview/test/browser_markupview_links_06.js": 5071, 
-    "browser/devtools/markupview/test/browser_markupview_links_07.js": 6044, 
-    "browser/devtools/markupview/test/browser_markupview_load_01.js": 5818, 
-    "browser/devtools/markupview/test/browser_markupview_mutation_01.js": 5638, 
-    "browser/devtools/markupview/test/browser_markupview_mutation_02.js": 3287, 
-    "browser/devtools/markupview/test/browser_markupview_navigation.js": 8900, 
-    "browser/devtools/markupview/test/browser_markupview_node_not_displayed_02.js": 5025, 
-    "browser/devtools/markupview/test/browser_markupview_pagesize_01.js": 3990, 
-    "browser/devtools/markupview/test/browser_markupview_pagesize_02.js": 4256, 
-    "browser/devtools/markupview/test/browser_markupview_search_01.js": 3916, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_01.js": 5996, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_03.js": 3172, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_04.js": 7513, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_05.js": 4448, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_06.js": 4533, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_07.js": 4185, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_08.js": 4083, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_09.js": 3023, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_10.js": 3015, 
-    "browser/devtools/markupview/test/browser_markupview_tag_edit_12.js": 3299, 
-    "browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js": 4529, 
-    "browser/devtools/markupview/test/browser_markupview_toggle_01.js": 3518, 
-    "browser/devtools/markupview/test/browser_markupview_toggle_02.js": 3432, 
-    "browser/devtools/markupview/test/browser_markupview_toggle_03.js": 3911, 
-    "browser/devtools/markupview/test/browser_markupview_update-on-navigtion.js": 3412, 
-    "browser/devtools/netmonitor/har/test/browser_net_har_copy_all_as_har.js": 5050, 
-    "browser/devtools/netmonitor/test/browser_net_aaa_leaktest.js": 4466, 
-    "browser/devtools/netmonitor/test/browser_net_accessibility-01.js": 14089, 
-    "browser/devtools/netmonitor/test/browser_net_accessibility-02.js": 13951, 
-    "browser/devtools/netmonitor/test/browser_net_api-calls.js": 3769, 
-    "browser/devtools/netmonitor/test/browser_net_autoscroll.js": 17125, 
-    "browser/devtools/netmonitor/test/browser_net_cached-status.js": 4320, 
-    "browser/devtools/netmonitor/test/browser_net_complex-params.js": 5646, 
-    "browser/devtools/netmonitor/test/browser_net_content-type.js": 6607, 
-    "browser/devtools/netmonitor/test/browser_net_copy_image_as_data_uri.js": 5469, 
-    "browser/devtools/netmonitor/test/browser_net_copy_params.js": 5270, 
-    "browser/devtools/netmonitor/test/browser_net_copy_response.js": 5451, 
-    "browser/devtools/netmonitor/test/browser_net_curl-utils.js": 4021, 
-    "browser/devtools/netmonitor/test/browser_net_details-no-duplicated-content.js": 4427, 
-    "browser/devtools/netmonitor/test/browser_net_filter-01.js": 11388, 
-    "browser/devtools/netmonitor/test/browser_net_filter-02.js": 15579, 
-    "browser/devtools/netmonitor/test/browser_net_filter-03.js": 14030, 
-    "browser/devtools/netmonitor/test/browser_net_filter-04.js": 5661, 
-    "browser/devtools/netmonitor/test/browser_net_footer-summary.js": 10625, 
-    "browser/devtools/netmonitor/test/browser_net_html-preview.js": 4762, 
-    "browser/devtools/netmonitor/test/browser_net_icon-preview.js": 7639, 
-    "browser/devtools/netmonitor/test/browser_net_image-tooltip.js": 7950, 
-    "browser/devtools/netmonitor/test/browser_net_json-long.js": 10611, 
-    "browser/devtools/netmonitor/test/browser_net_json-malformed.js": 3980, 
-    "browser/devtools/netmonitor/test/browser_net_persistent_logs.js": 4192, 
-    "browser/devtools/netmonitor/test/browser_net_post-data-01.js": 3433, 
-    "browser/devtools/netmonitor/test/browser_net_prefs-reload.js": 14402, 
-    "browser/devtools/netmonitor/test/browser_net_req-resp-bodies.js": 3823, 
-    "browser/devtools/netmonitor/test/browser_net_security-icon-click.js": 3128, 
-    "browser/devtools/netmonitor/test/browser_net_security-redirect.js": 3060, 
-    "browser/devtools/netmonitor/test/browser_net_security-state.js": 3960, 
-    "browser/devtools/netmonitor/test/browser_net_security-tab-deselect.js": 3380, 
-    "browser/devtools/netmonitor/test/browser_net_security-tab-visibility.js": 4390, 
-    "browser/devtools/netmonitor/test/browser_net_security-warnings.js": 3099, 
-    "browser/devtools/netmonitor/test/browser_net_sort-01.js": 10997, 
-    "browser/devtools/netmonitor/test/browser_net_sort-02.js": 11033, 
-    "browser/devtools/netmonitor/test/browser_net_sort-03.js": 13254, 
-    "browser/devtools/netmonitor/test/browser_net_statistics-01.js": 4561, 
-    "browser/devtools/netmonitor/test/browser_net_statistics-02.js": 5159, 
-    "browser/devtools/netmonitor/test/browser_net_status-codes.js": 4756, 
-    "browser/devtools/netmonitor/test/browser_net_timing-division.js": 5709, 
-    "browser/devtools/performance/test/browser_aaa-run-first-leaktest.js": 6152, 
-    "browser/devtools/performance/test/browser_markers-cycle-collection.js": 5901, 
-    "browser/devtools/performance/test/browser_perf-categories-js-calltree.js": 11122, 
-    "browser/devtools/performance/test/browser_perf-clear-01.js": 10881, 
-    "browser/devtools/performance/test/browser_perf-clear-02.js": 13033, 
-    "browser/devtools/performance/test/browser_perf-columns-js-calltree.js": 12169, 
-    "browser/devtools/performance/test/browser_perf-columns-memory-calltree.js": 10493, 
-    "browser/devtools/performance/test/browser_perf-compatibility-02.js": 5219, 
-    "browser/devtools/performance/test/browser_perf-compatibility-04.js": 5296, 
-    "browser/devtools/performance/test/browser_perf-compatibility-05.js": 7262, 
-    "browser/devtools/performance/test/browser_perf-compatibility-07.js": 5999, 
-    "browser/devtools/performance/test/browser_perf-compatibility-08.js": 7686, 
-    "browser/devtools/performance/test/browser_perf-console-record-01.js": 7559, 
-    "browser/devtools/performance/test/browser_perf-console-record-02.js": 7377, 
-    "browser/devtools/performance/test/browser_perf-console-record-03.js": 7227, 
-    "browser/devtools/performance/test/browser_perf-console-record-04.js": 11190, 
-    "browser/devtools/performance/test/browser_perf-console-record-05.js": 15306, 
-    "browser/devtools/performance/test/browser_perf-console-record-06.js": 8975, 
-    "browser/devtools/performance/test/browser_perf-console-record-07.js": 7043, 
-    "browser/devtools/performance/test/browser_perf-console-record-08.js": 13759, 
-    "browser/devtools/performance/test/browser_perf-console-record-09.js": 4380, 
-    "browser/devtools/performance/test/browser_perf-data-massaging-01.js": 6852, 
-    "browser/devtools/performance/test/browser_perf-data-samples.js": 4822, 
-    "browser/devtools/performance/test/browser_perf-details-01.js": 8388, 
-    "browser/devtools/performance/test/browser_perf-details-02.js": 8504, 
-    "browser/devtools/performance/test/browser_perf-details-03.js": 15137, 
-    "browser/devtools/performance/test/browser_perf-details-04.js": 16618, 
-    "browser/devtools/performance/test/browser_perf-details-05.js": 10399, 
-    "browser/devtools/performance/test/browser_perf-details-06.js": 10739, 
-    "browser/devtools/performance/test/browser_perf-details-07.js": 8359, 
-    "browser/devtools/performance/test/browser_perf-details-calltree-render.js": 11891, 
-    "browser/devtools/performance/test/browser_perf-details-flamegraph-render.js": 10649, 
-    "browser/devtools/performance/test/browser_perf-details-memory-calltree-render.js": 7665, 
-    "browser/devtools/performance/test/browser_perf-details-memory-flamegraph-render.js": 10418, 
-    "browser/devtools/performance/test/browser_perf-details-waterfall-render.js": 10655, 
-    "browser/devtools/performance/test/browser_perf-events-calltree.js": 6564, 
-    "browser/devtools/performance/test/browser_perf-front-profiler-02.js": 4033, 
-    "browser/devtools/performance/test/browser_perf-front-profiler-03.js": 5716, 
-    "browser/devtools/performance/test/browser_perf-front-profiler-04.js": 5436, 
-    "browser/devtools/performance/test/browser_perf-highlighted.js": 10630, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-01.js": 10014, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-02.js": 5759, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-03.js": 8029, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-04.js": 8179, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-05.js": 7571, 
-    "browser/devtools/performance/test/browser_perf-legacy-front-06.js": 8666, 
-    "browser/devtools/performance/test/browser_perf-loading-01.js": 7323, 
-    "browser/devtools/performance/test/browser_perf-loading-02.js": 18693, 
-    "browser/devtools/performance/test/browser_perf-options-01.js": 3151, 
-    "browser/devtools/performance/test/browser_perf-options-02.js": 5712, 
-    "browser/devtools/performance/test/browser_perf-options-allocations.js": 7957, 
-    "browser/devtools/performance/test/browser_perf-options-enable-framerate.js": 9407, 
-    "browser/devtools/performance/test/browser_perf-options-enable-memory-01.js": 11105, 
-    "browser/devtools/performance/test/browser_perf-options-enable-memory-02.js": 11196, 
-    "browser/devtools/performance/test/browser_perf-options-enable-optimizations.js": 10844, 
-    "browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-01.js": 8596, 
-    "browser/devtools/performance/test/browser_perf-options-flatten-tree-recursion-02.js": 8817, 
-    "browser/devtools/performance/test/browser_perf-options-invert-call-tree-01.js": 8583, 
-    "browser/devtools/performance/test/browser_perf-options-invert-call-tree-02.js": 8443, 
-    "browser/devtools/performance/test/browser_perf-options-invert-flame-graph-01.js": 8844, 
-    "browser/devtools/performance/test/browser_perf-options-invert-flame-graph-02.js": 8861, 
-    "browser/devtools/performance/test/browser_perf-options-profiler.js": 10289, 
-    "browser/devtools/performance/test/browser_perf-options-show-idle-blocks-01.js": 8890, 
-    "browser/devtools/performance/test/browser_perf-options-show-idle-blocks-02.js": 8851, 
-    "browser/devtools/performance/test/browser_perf-options-show-platform-data-01.js": 10140, 
-    "browser/devtools/performance/test/browser_perf-options-show-platform-data-02.js": 9360, 
-    "browser/devtools/performance/test/browser_perf-overview-render-01.js": 12768, 
-    "browser/devtools/performance/test/browser_perf-overview-render-02.js": 32680, 
-    "browser/devtools/performance/test/browser_perf-overview-render-03.js": 32403, 
-    "browser/devtools/performance/test/browser_perf-overview-render-04.js": 9354, 
-    "browser/devtools/performance/test/browser_perf-overview-selection-01.js": 10565, 
-    "browser/devtools/performance/test/browser_perf-overview-selection-02.js": 16062, 
-    "browser/devtools/performance/test/browser_perf-overview-selection-03.js": 10611, 
-    "browser/devtools/performance/test/browser_perf-overview-time-interval.js": 9961, 
-    "browser/devtools/performance/test/browser_perf-recording-model-01.js": 4653, 
-    "browser/devtools/performance/test/browser_perf-refresh.js": 7192, 
-    "browser/devtools/performance/test/browser_perf-states.js": 9006, 
-    "browser/devtools/performance/test/browser_perf-theme-toggle-01.js": 21376, 
-    "browser/devtools/performance/test/browser_profiler_tree-view-11.js": 9208, 
-    "browser/devtools/performance/test/browser_timeline-filters-02.js": 4277, 
-    "browser/devtools/performance/test/browser_timeline-waterfall-background.js": 9482, 
-    "browser/devtools/performance/test/browser_timeline-waterfall-generic.js": 12514, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_editing_01.js": 3894, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_external_change.js": 4204, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_immediate_destroy.js": 3363, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js": 10015, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js": 4249, 
-    "browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_02.js": 3197, 
-    "browser/devtools/responsivedesign/test/browser_responsive_cmd.js": 3534, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_close_toolbox.js": 4668, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_disable_view_menu_items.js": 6413, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_restore.js": 4266, 
-    "browser/devtools/scratchpad/test/browser_scratchpad_wrong_window_focus.js": 3698, 
-    "browser/devtools/shared/test/browser_css_color.js": 6403, 
-    "browser/devtools/shared/test/browser_tableWidget_basic.js": 14071, 
-    "browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js": 4252, 
-    "browser/devtools/shared/test/browser_tableWidget_mouse_interaction.js": 4687, 
-    "browser/devtools/shared/test/browser_telemetry_button_eyedropper.js": 5156, 
-    "browser/devtools/shared/test/browser_telemetry_button_scratchpad.js": 6860, 
-    "browser/devtools/shared/test/browser_telemetry_sidebar.js": 7034, 
-    "browser/devtools/shared/test/browser_telemetry_toolbox.js": 7094, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js": 3061, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js": 4774, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js": 3864, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js": 3158, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js": 3373, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js": 3140, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_storage.js": 3065, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js": 3227, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js": 3440, 
-    "browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js": 3229, 
-    "browser/devtools/shared/test/browser_toolbar_basic.js": 4254, 
-    "browser/devtools/sourceeditor/test/browser_codemirror.js": 5309, 
-    "browser/devtools/sourceeditor/test/browser_vimemacs.js": 39690, 
-    "browser/devtools/storage/test/browser_storage_basic.js": 11208, 
-    "browser/devtools/storage/test/browser_storage_dynamic_updates.js": 5698, 
-    "browser/devtools/storage/test/browser_storage_sidebar.js": 6482, 
-    "browser/devtools/storage/test/browser_storage_values.js": 5715, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_autocomplete-disabled.js": 5491, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js": 5536, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_bug_740541_iframes.js": 3905, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_enabled.js": 3151, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_fetch-from-cache.js": 3384, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js": 4430, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_loading.js": 3197, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar.js": 4079, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js": 3669, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_missing_stylesheet.js": 3810, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_navigate.js": 5021, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_new.js": 3673, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_private_perwindowpb.js": 3410, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_reload.js": 5506, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_scroll.js": 3556, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js": 3101, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_large.js": 3765, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_sourcemaps.js": 6856, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js": 3194, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_transition_rule.js": 4177, 
-    "browser/devtools/styleeditor/test/browser_styleeditor_xul.js": 2991, 
-    "browser/devtools/styleinspector/test/browser_computedview_browser-styles.js": 6954, 
-    "browser/devtools/styleinspector/test/browser_computedview_cycle_color.js": 3019, 
-    "browser/devtools/styleinspector/test/browser_computedview_getNodeInfo.js": 3409, 
-    "browser/devtools/styleinspector/test/browser_computedview_keybindings_01.js": 3028, 
-    "browser/devtools/styleinspector/test/browser_computedview_keybindings_02.js": 3492, 
-    "browser/devtools/styleinspector/test/browser_computedview_matched-selectors-toggle.js": 3181, 
-    "browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js": 3465, 
-    "browser/devtools/styleinspector/test/browser_computedview_media-queries.js": 3129, 
-    "browser/devtools/styleinspector/test/browser_computedview_no-results-placeholder.js": 3428, 
-    "browser/devtools/styleinspector/test/browser_computedview_original-source-link.js": 5657, 
-    "browser/devtools/styleinspector/test/browser_computedview_pseudo-element_01.js": 3960, 
-    "browser/devtools/styleinspector/test/browser_computedview_refresh-on-style-change_01.js": 3170, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter.js": 4907, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter_clear.js": 6346, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter_context-menu.js": 3311, 
-    "browser/devtools/styleinspector/test/browser_computedview_search-filter_escape-keypress.js": 6283, 
-    "browser/devtools/styleinspector/test/browser_computedview_select-and-copy-styles.js": 3541, 
-    "browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js": 6256, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js": 3944, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js": 3257, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js": 3054, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js": 3226, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js": 3054, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_01.js": 10543, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_02.js": 3033, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_03.js": 3038, 
-    "browser/devtools/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js": 4949, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_01.js": 3056, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-appears-on-swatch-click.js": 3168, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-commit-on-ENTER.js": 3180, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js": 3132, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js": 4742, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js": 3007, 
-    "browser/devtools/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js": 2992, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js": 7150, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_02.js": 6351, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_01.js": 5761, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_02.js": 6863, 
-    "browser/devtools/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js": 3690, 
-    "browser/devtools/styleinspector/test/browser_ruleview_computed-lists_02.js": 3025, 
-    "browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js": 3151, 
-    "browser/devtools/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js": 5211, 
-    "browser/devtools/styleinspector/test/browser_ruleview_copy_styles.js": 3941, 
-    "browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js": 3578, 
-    "browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js": 3267, 
-    "browser/devtools/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js": 3193, 
-    "browser/devtools/styleinspector/test/browser_ruleview_custom.js": 3492, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js": 3232, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-computed.js": 3063, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js": 5351, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-order.js": 3218, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_02.js": 3014, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property-remove_03.js": 3001, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js": 4301, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js": 3586, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_03.js": 3035, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_04.js": 3215, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_05.js": 3143, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_06.js": 3088, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-property_07.js": 3025, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector-commit.js": 3685, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_01.js": 3025, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_02.js": 3451, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_04.js": 3173, 
-    "browser/devtools/styleinspector/test/browser_ruleview_edit-selector_05.js": 3339, 
-    "browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_01.js": 5020, 
-    "browser/devtools/styleinspector/test/browser_ruleview_editable-field-focus_02.js": 4495, 
-    "browser/devtools/styleinspector/test/browser_ruleview_eyedropper.js": 4495, 
-    "browser/devtools/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js": 3361, 
-    "browser/devtools/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js": 3237, 
-    "browser/devtools/styleinspector/test/browser_ruleview_inherited-properties_01.js": 3073, 
-    "browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_01.js": 5374, 
-    "browser/devtools/styleinspector/test/browser_ruleview_keyframes-rule_02.js": 5456, 
-    "browser/devtools/styleinspector/test/browser_ruleview_livepreview.js": 3550, 
-    "browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_02.js": 3010, 
-    "browser/devtools/styleinspector/test/browser_ruleview_mark_overridden_05.js": 3117, 
-    "browser/devtools/styleinspector/test/browser_ruleview_mathml-element.js": 3253, 
-    "browser/devtools/styleinspector/test/browser_ruleview_media-queries.js": 3170, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js": 2995, 
-    "browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js": 3042, 
-    "browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js": 4489, 
-    "browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_01.js": 5061, 
-    "browser/devtools/styleinspector/test/browser_ruleview_pseudo_lock_options.js": 4203, 
-    "browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js": 3063, 
-    "browser/devtools/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js": 3510, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js": 3208, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_06.js": 3112, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_08.js": 3140, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_clear.js": 2991, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js": 3027, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_01.js": 3156, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_02.js": 3341, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_04.js": 4286, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_05.js": 3036, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_06.js": 2991, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_10.js": 3121, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_12.js": 3259, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_13.js": 3200, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_14.js": 3142, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_15.js": 3267, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_16.js": 3121, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_clear.js": 3014, 
-    "browser/devtools/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js": 2991, 
-    "browser/devtools/styleinspector/test/browser_ruleview_select-and-copy-styles.js": 3085, 
-    "browser/devtools/styleinspector/test/browser_ruleview_selector-highlighter_03.js": 3176, 
-    "browser/devtools/styleinspector/test/browser_ruleview_selector_highlight.js": 4295, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js": 4602, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_01.js": 4434, 
-    "browser/devtools/styleinspector/test/browser_ruleview_strict-search-filter_02.js": 3170, 
-    "browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js": 4005, 
-    "browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js": 3134, 
-    "browser/devtools/styleinspector/test/browser_ruleview_user-agent-styles.js": 12622, 
-    "browser/devtools/styleinspector/test/browser_ruleview_user-property-reset.js": 4361, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js": 15029, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js": 3239, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js": 4815, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js": 6067, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_refresh_when_active.js": 3717, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-background-image.js": 3584, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js": 3358, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js": 3178, 
-    "browser/devtools/styleinspector/test/browser_styleinspector_transform-highlighter-02.js": 3165, 
-    "browser/devtools/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js": 4615, 
-    "browser/devtools/webaudioeditor/test/browser_wa_destroy-node-01.js": 9590, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-click.js": 3540, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-render-01.js": 3590, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-render-03.js": 3155, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-selected.js": 3174, 
-    "browser/devtools/webaudioeditor/test/browser_wa_graph-zoom.js": 3328, 
-    "browser/devtools/webaudioeditor/test/browser_wa_inspector-bypass-01.js": 3316, 
-    "browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js": 3929, 
-    "browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js": 4094, 
-    "browser/devtools/webaudioeditor/test/browser_wa_inspector.js": 3112, 
-    "browser/devtools/webaudioeditor/test/browser_wa_navigate.js": 4187, 
-    "browser/devtools/webaudioeditor/test/browser_wa_properties-view-media-nodes.js": 3664, 
-    "browser/devtools/webaudioeditor/test/browser_wa_properties-view-params-objects.js": 3260, 
-    "browser/devtools/webaudioeditor/test/browser_wa_properties-view-params.js": 5903, 
-    "browser/devtools/webaudioeditor/test/browser_wa_properties-view.js": 3110, 
-    "browser/devtools/webaudioeditor/test/browser_wa_reset-02.js": 3262, 
-    "browser/devtools/webaudioeditor/test/browser_wa_reset-03.js": 3970, 
-    "browser/devtools/webaudioeditor/test/browser_webaudio-actor-destroy-node.js": 8216, 
-    "browser/devtools/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js": 4790, 
-    "browser/devtools/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js": 5124, 
-    "browser/devtools/webconsole/test/browser_console_consolejsm_output.js": 3307, 
-    "browser/devtools/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js": 4596, 
-    "browser/devtools/webconsole/test/browser_console_history_persist.js": 6898, 
-    "browser/devtools/webconsole/test/browser_console_keyboard_accessibility.js": 3390, 
-    "browser/devtools/webconsole/test/browser_console_native_getters.js": 5387, 
-    "browser/devtools/webconsole/test/browser_console_server_logging.js": 5517, 
-    "browser/devtools/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js": 4498, 
-    "browser/devtools/webconsole/test/browser_console_variables_view_highlighter.js": 6285, 
-    "browser/devtools/webconsole/test/browser_eval_in_debugger_stackframe2.js": 3583, 
-    "browser/devtools/webconsole/test/browser_jsterm_inspect.js": 6663, 
-    "browser/devtools/webconsole/test/browser_warn_user_about_replaced_api.js": 3542, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_594477_clickable_output.js": 3085, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js": 3832, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js": 3340, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js": 3035, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js": 3624, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js": 3263, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_659907_console_dir.js": 4742, 
-    "browser/devtools/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js": 3443, 
-    "browser/devtools/webconsole/test/browser_webconsole_cached_autocomplete.js": 4445, 
-    "browser/devtools/webconsole/test/browser_webconsole_hpkp_invalid-headers.js": 4754, 
-    "browser/devtools/webconsole/test/browser_webconsole_network_panel.js": 4361, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_02.js": 6708, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_03.js": 6087, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_04.js": 5134, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_05.js": 5136, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_06.js": 6408, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_01.js": 4636, 
-    "browser/devtools/webconsole/test/browser_webconsole_output_dom_elements_03.js": 3176, 
-    "browser/devtools/webconsole/test/browser_webconsole_split.js": 8112, 
-    "browser/devtools/webconsole/test/browser_webconsole_split_escape_key.js": 3379, 
-    "browser/devtools/webconsole/test/browser_webconsole_trackingprotection_errors.js": 3341, 
-    "toolkit/devtools/server/tests/browser/browser_markers-cycle-collection.js": 6062, 
-    "toolkit/devtools/server/tests/browser/browser_perf-samples-01.js": 3560
+    "devtools/client/animationinspector/test/browser_animation_empty_on_invalid_nodes.js": 12285, 
+    "devtools/client/animationinspector/test/browser_animation_iterationCount_hidden_by_default.js": 5435, 
+    "devtools/client/animationinspector/test/browser_animation_panel_exists.js": 4363, 
+    "devtools/client/animationinspector/test/browser_animation_participate_in_inspector_update.js": 8931, 
+    "devtools/client/animationinspector/test/browser_animation_play_pause_button.js": 6211, 
+    "devtools/client/animationinspector/test/browser_animation_playerFronts_are_refreshed.js": 5595, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js": 8908, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_compositor_icon.js": 5493, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_destroy.js": 5814, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_disables_on_finished.js": 9653, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_dont_show_time_after_duration.js": 7312, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_have_control_buttons.js": 6095, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_meta_data.js": 5636, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_scrubber_delayed.js": 5410, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_scrubber_enabled.js": 8588, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_scrubber_moves.js": 6014, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_state_after_pause.js": 5654, 
+    "devtools/client/animationinspector/test/browser_animation_playerWidgets_target_nodes.js": 8359, 
+    "devtools/client/animationinspector/test/browser_animation_rate_select_shows_presets.js": 5730, 
+    "devtools/client/animationinspector/test/browser_animation_refresh_on_added_animation.js": 8991, 
+    "devtools/client/animationinspector/test/browser_animation_refresh_on_removed_animation.js": 12190, 
+    "devtools/client/animationinspector/test/browser_animation_refresh_when_active.js": 9913, 
+    "devtools/client/animationinspector/test/browser_animation_same_nb_of_playerWidgets_and_playerFronts.js": 9449, 
+    "devtools/client/animationinspector/test/browser_animation_setting_currentTime_works_and_pauses.js": 6998, 
+    "devtools/client/animationinspector/test/browser_animation_setting_playbackRate_works.js": 5559, 
+    "devtools/client/animationinspector/test/browser_animation_shows_player_on_valid_node.js": 8780, 
+    "devtools/client/animationinspector/test/browser_animation_target_highlight_select.js": 13841, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_displays_with_pref.js": 4629, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_header.js": 5449, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_scrubber_exists.js": 5453, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_scrubber_movable.js": 4118, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_shows_delay.js": 4794, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_shows_iterations.js": 4800, 
+    "devtools/client/animationinspector/test/browser_animation_timeline_ui.js": 5451, 
+    "devtools/client/animationinspector/test/browser_animation_toggle_button_resets_on_navigate.js": 6372, 
+    "devtools/client/animationinspector/test/browser_animation_toggle_button_toggles_animations.js": 6716, 
+    "devtools/client/animationinspector/test/browser_animation_toggle_button_updates_playerWidgets.js": 6231, 
+    "devtools/client/animationinspector/test/browser_animation_toolbar_exists.js": 5268, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_changes.js": 6050, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_data_changes.js": 10907, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_rate_changes.js": 6160, 
+    "devtools/client/animationinspector/test/browser_animation_ui_updates_when_animation_time_changes.js": 6306, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-highlight.js": 4223, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-search.js": 3325, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-01.js": 4689, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-call-stack-02.js": 4009, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-clear.js": 3030, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-img-thumbnails-02.js": 3493, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-record-02.js": 3055, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-reload-02.js": 3316, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-slider-02.js": 3935, 
+    "devtools/client/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js": 3796, 
+    "devtools/client/debugger/test/browser_dbg_aaa_run_first_leaktest.js": 4702, 
+    "devtools/client/debugger/test/browser_dbg_addon-panels.js": 3745, 
+    "devtools/client/debugger/test/browser_dbg_addon-sources.js": 4264, 
+    "devtools/client/debugger/test/browser_dbg_auto-pretty-print-01.js": 3642, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-01.js": 3107, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-02.js": 3357, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-03.js": 3337, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-04.js": 3350, 
+    "devtools/client/debugger/test/browser_dbg_blackboxing-06.js": 3374, 
+    "devtools/client/debugger/test/browser_dbg_breadcrumbs-access.js": 3612, 
+    "devtools/client/debugger/test/browser_dbg_break-in-anon.js": 3008, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-01.js": 3399, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-02.js": 5571, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-03.js": 3066, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-04.js": 3189, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-05.js": 3368, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-06.js": 4827, 
+    "devtools/client/debugger/test/browser_dbg_break-on-dom-08.js": 3440, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-actual-location.js": 3252, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-actual-location2.js": 4019, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-condition-thrown-message.js": 4274, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-contextmenu-add.js": 3551, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-contextmenu.js": 10987, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-editor.js": 3506, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-highlight.js": 3460, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-new-script.js": 3579, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-other-tabs.js": 5073, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-pane.js": 3671, 
+    "devtools/client/debugger/test/browser_dbg_breakpoints-reload.js": 3893, 
+    "devtools/client/debugger/test/browser_dbg_bug-896139.js": 3970, 
+    "devtools/client/debugger/test/browser_dbg_closure-inspection.js": 7462, 
+    "devtools/client/debugger/test/browser_dbg_cmd-blackbox.js": 4720, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-01.js": 9986, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-02.js": 4160, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-03.js": 3447, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-04.js": 4374, 
+    "devtools/client/debugger/test/browser_dbg_conditional-breakpoints-05.js": 5768, 
+    "devtools/client/debugger/test/browser_dbg_console-eval.js": 3458, 
+    "devtools/client/debugger/test/browser_dbg_console-named-eval.js": 3284, 
+    "devtools/client/debugger/test/browser_dbg_controller-evaluate-01.js": 3531, 
+    "devtools/client/debugger/test/browser_dbg_controller-evaluate-02.js": 3443, 
+    "devtools/client/debugger/test/browser_dbg_editor-contextmenu.js": 3222, 
+    "devtools/client/debugger/test/browser_dbg_editor-mode.js": 3422, 
+    "devtools/client/debugger/test/browser_dbg_file-reload.js": 3426, 
+    "devtools/client/debugger/test/browser_dbg_function-display-name.js": 3522, 
+    "devtools/client/debugger/test/browser_dbg_host-layout.js": 13617, 
+    "devtools/client/debugger/test/browser_dbg_location-changes-01-simple.js": 3793, 
+    "devtools/client/debugger/test/browser_dbg_location-changes-02-blank.js": 3289, 
+    "devtools/client/debugger/test/browser_dbg_on-pause-highlight.js": 3018, 
+    "devtools/client/debugger/test/browser_dbg_optimized-out-vars.js": 3544, 
+    "devtools/client/debugger/test/browser_dbg_pause-exceptions-01.js": 4931, 
+    "devtools/client/debugger/test/browser_dbg_pause-exceptions-02.js": 4469, 
+    "devtools/client/debugger/test/browser_dbg_pause-no-step.js": 3212, 
+    "devtools/client/debugger/test/browser_dbg_pause-warning.js": 5125, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-03.js": 3312, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-04.js": 3253, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-08.js": 3538, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-09.js": 3389, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-11.js": 3761, 
+    "devtools/client/debugger/test/browser_dbg_pretty-print-on-paused.js": 3629, 
+    "devtools/client/debugger/test/browser_dbg_progress-listener-bug.js": 3059, 
+    "devtools/client/debugger/test/browser_dbg_reload-same-script.js": 5718, 
+    "devtools/client/debugger/test/browser_dbg_scripts-switching-01.js": 3888, 
+    "devtools/client/debugger/test/browser_dbg_scripts-switching-02.js": 3897, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-01.js": 4636, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-02.js": 4903, 
+    "devtools/client/debugger/test/browser_dbg_search-basic-03.js": 4004, 
+    "devtools/client/debugger/test/browser_dbg_search-global-01.js": 4780, 
+    "devtools/client/debugger/test/browser_dbg_search-global-02.js": 4264, 
+    "devtools/client/debugger/test/browser_dbg_search-global-04.js": 3504, 
+    "devtools/client/debugger/test/browser_dbg_search-global-05.js": 5042, 
+    "devtools/client/debugger/test/browser_dbg_search-global-06.js": 6285, 
+    "devtools/client/debugger/test/browser_dbg_search-popup-jank.js": 4340, 
+    "devtools/client/debugger/test/browser_dbg_search-sources-01.js": 4648, 
+    "devtools/client/debugger/test/browser_dbg_search-sources-02.js": 4809, 
+    "devtools/client/debugger/test/browser_dbg_search-sources-03.js": 3349, 
+    "devtools/client/debugger/test/browser_dbg_search-symbols.js": 6866, 
+    "devtools/client/debugger/test/browser_dbg_searchbox-help-popup-01.js": 3335, 
+    "devtools/client/debugger/test/browser_dbg_searchbox-help-popup-02.js": 3231, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-01.js": 8966, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-02.js": 4395, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-03.js": 3662, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-04.js": 4565, 
+    "devtools/client/debugger/test/browser_dbg_server-conditional-bp-05.js": 5054, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-01.js": 3566, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-02.js": 4368, 
+    "devtools/client/debugger/test/browser_dbg_source-maps-03.js": 3616, 
+    "devtools/client/debugger/test/browser_dbg_sources-cache.js": 3633, 
+    "devtools/client/debugger/test/browser_dbg_sources-contextmenu-02.js": 3429, 
+    "devtools/client/debugger/test/browser_dbg_split-console-paused-reload.js": 7696, 
+    "devtools/client/debugger/test/browser_dbg_stack-01.js": 3200, 
+    "devtools/client/debugger/test/browser_dbg_stack-02.js": 3551, 
+    "devtools/client/debugger/test/browser_dbg_stack-04.js": 3208, 
+    "devtools/client/debugger/test/browser_dbg_stack-05.js": 3535, 
+    "devtools/client/debugger/test/browser_dbg_stack-06.js": 3542, 
+    "devtools/client/debugger/test/browser_dbg_stack-07.js": 4639, 
+    "devtools/client/debugger/test/browser_dbg_step-out.js": 4322, 
+    "devtools/client/debugger/test/browser_dbg_terminate-on-tab-close.js": 3123, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-06.js": 3670, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-accessibility.js": 3376, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-data.js": 3071, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-cancel.js": 3467, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-getset-01.js": 14260, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-getset-02.js": 4382, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-value.js": 7150, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-edit-watch.js": 6109, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-01.js": 9750, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-02.js": 10102, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-03.js": 7860, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-04.js": 7244, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-filter-05.js": 7558, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-parameters-01.js": 6207, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-parameters-02.js": 4285, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-parameters-03.js": 9279, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frame-with.js": 4060, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js": 3177, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-hide-non-enums.js": 3127, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-large-array-buffer.js": 8637, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-override-01.js": 7491, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-override-02.js": 3469, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-01.js": 6266, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-02.js": 4727, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-03.js": 3812, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-04.js": 3835, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-05.js": 3849, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-06.js": 3925, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-07.js": 5613, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-08.js": 4042, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-09.js": 4526, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-10.js": 4507, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-11.js": 5817, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-12.js": 5605, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-13.js": 6666, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-15.js": 4846, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-popup-16.js": 10729, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-reexpand-01.js": 18626, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-reexpand-02.js": 22085, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-reexpand-03.js": 4911, 
+    "devtools/client/debugger/test/browser_dbg_variables-view-webidl.js": 8910, 
+    "devtools/client/debugger/test/browser_dbg_watch-expressions-01.js": 3766, 
+    "devtools/client/debugger/test/browser_dbg_watch-expressions-02.js": 10682, 
+    "devtools/client/eyedropper/test/browser_eyedropper_cmd.js": 3182, 
+    "devtools/client/fontinspector/test/browser_fontinspector.js": 6435, 
+    "devtools/client/fontinspector/test/browser_fontinspector_edit-previews-show-all.js": 3196, 
+    "devtools/client/fontinspector/test/browser_fontinspector_edit-previews.js": 3370, 
+    "devtools/client/fontinspector/test/browser_fontinspector_theme-change.js": 3385, 
+    "devtools/client/framework/test/browser_devtools_api.js": 4474, 
+    "devtools/client/framework/test/browser_keybindings_01.js": 4229, 
+    "devtools/client/framework/test/browser_new_activation_workflow.js": 3242, 
+    "devtools/client/framework/test/browser_toolbox_hosts.js": 7420, 
+    "devtools/client/framework/test/browser_toolbox_hosts_size.js": 5263, 
+    "devtools/client/framework/test/browser_toolbox_options.js": 5315, 
+    "devtools/client/framework/test/browser_toolbox_options_disable_buttons.js": 4162, 
+    "devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js": 6124, 
+    "devtools/client/framework/test/browser_toolbox_theme_registration.js": 4537, 
+    "devtools/client/framework/test/browser_toolbox_toggle.js": 9755, 
+    "devtools/client/framework/test/browser_toolbox_tool_ready.js": 5447, 
+    "devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js": 6195, 
+    "devtools/client/framework/test/browser_toolbox_view_source_04.js": 3819, 
+    "devtools/client/framework/test/browser_toolbox_window_reload_target.js": 13519, 
+    "devtools/client/framework/test/browser_toolbox_window_shortcuts.js": 4591, 
+    "devtools/client/framework/test/browser_toolbox_window_title_changes.js": 4718, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs.js": 7618, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_keybinding.js": 4622, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_menu.js": 3268, 
+    "devtools/client/inspector/test/browser_inspector_breadcrumbs_mutations.js": 4294, 
+    "devtools/client/inspector/test/browser_inspector_delete-selected-node-01.js": 3268, 
+    "devtools/client/inspector/test/browser_inspector_delete-selected-node-02.js": 4676, 
+    "devtools/client/inspector/test/browser_inspector_delete-selected-node-03.js": 3243, 
+    "devtools/client/inspector/test/browser_inspector_destroy-after-navigation.js": 3433, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-01.js": 3125, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-02.js": 4140, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-03.js": 3761, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-comments.js": 4330, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_01.js": 3014, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_02.js": 3799, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_03.js": 3189, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_04.js": 3257, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-geometry_05.js": 4029, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-hover_01.js": 4410, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-hover_03.js": 3088, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-iframes.js": 3891, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-inline.js": 6529, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_01.js": 4026, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_02.js": 3727, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-keybinding_03.js": 3033, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-options.js": 3563, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-selector_01.js": 3143, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-xbl.js": 3242, 
+    "devtools/client/inspector/test/browser_inspector_highlighter-zoom.js": 3550, 
+    "devtools/client/inspector/test/browser_inspector_iframe-navigation.js": 3034, 
+    "devtools/client/inspector/test/browser_inspector_infobar_01.js": 4162, 
+    "devtools/client/inspector/test/browser_inspector_initialization.js": 7620, 
+    "devtools/client/inspector/test/browser_inspector_keyboard-shortcuts-copy-outerhtml.js": 3210, 
+    "devtools/client/inspector/test/browser_inspector_keyboard-shortcuts.js": 3678, 
+    "devtools/client/inspector/test/browser_inspector_menu-01-sensitivity.js": 5592, 
+    "devtools/client/inspector/test/browser_inspector_menu-02-copy-items.js": 3605, 
+    "devtools/client/inspector/test/browser_inspector_menu-03-paste-items.js": 4583, 
+    "devtools/client/inspector/test/browser_inspector_menu-04-other.js": 4594, 
+    "devtools/client/inspector/test/browser_inspector_navigation.js": 4824, 
+    "devtools/client/inspector/test/browser_inspector_pane-toggle-03.js": 3182, 
+    "devtools/client/inspector/test/browser_inspector_picker-stop-on-destroy.js": 3890, 
+    "devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js": 4801, 
+    "devtools/client/inspector/test/browser_inspector_reload-01.js": 3442, 
+    "devtools/client/inspector/test/browser_inspector_reload-02.js": 3501, 
+    "devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js": 3505, 
+    "devtools/client/inspector/test/browser_inspector_search-01.js": 8325, 
+    "devtools/client/inspector/test/browser_inspector_search-02.js": 6056, 
+    "devtools/client/inspector/test/browser_inspector_search-03.js": 6210, 
+    "devtools/client/inspector/test/browser_inspector_search-04.js": 3960, 
+    "devtools/client/inspector/test/browser_inspector_search-05.js": 4576, 
+    "devtools/client/inspector/test/browser_inspector_search-navigation.js": 7580, 
+    "devtools/client/inspector/test/browser_inspector_search-reserved.js": 5117, 
+    "devtools/client/inspector/test/browser_inspector_select-docshell.js": 3170, 
+    "devtools/client/inspector/test/browser_inspector_select-last-selected.js": 8788, 
+    "devtools/client/inspector/test/browser_inspector_sidebarstate.js": 5631, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_01.js": 6561, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_03.js": 3108, 
+    "devtools/client/markupview/test/browser_markupview_anonymous_04.js": 3090, 
+    "devtools/client/markupview/test/browser_markupview_copy_image_data.js": 3715, 
+    "devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js": 5810, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js": 3706, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js": 3846, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_isDragging.js": 3591, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js": 6069, 
+    "devtools/client/markupview/test/browser_markupview_dragdrop_textSelection.js": 3274, 
+    "devtools/client/markupview/test/browser_markupview_events_form.js": 3195, 
+    "devtools/client/markupview/test/browser_markupview_html_edit_01.js": 8015, 
+    "devtools/client/markupview/test/browser_markupview_html_edit_02.js": 6846, 
+    "devtools/client/markupview/test/browser_markupview_html_edit_03.js": 5282, 
+    "devtools/client/markupview/test/browser_markupview_image_tooltip.js": 3050, 
+    "devtools/client/markupview/test/browser_markupview_keybindings_03.js": 3109, 
+    "devtools/client/markupview/test/browser_markupview_keybindings_04.js": 3617, 
+    "devtools/client/markupview/test/browser_markupview_links_01.js": 5603, 
+    "devtools/client/markupview/test/browser_markupview_links_02.js": 3271, 
+    "devtools/client/markupview/test/browser_markupview_links_03.js": 3065, 
+    "devtools/client/markupview/test/browser_markupview_links_04.js": 4575, 
+    "devtools/client/markupview/test/browser_markupview_links_05.js": 5228, 
+    "devtools/client/markupview/test/browser_markupview_links_06.js": 5071, 
+    "devtools/client/markupview/test/browser_markupview_links_07.js": 6044, 
+    "devtools/client/markupview/test/browser_markupview_load_01.js": 5818, 
+    "devtools/client/markupview/test/browser_markupview_mutation_01.js": 5638, 
+    "devtools/client/markupview/test/browser_markupview_mutation_02.js": 3287, 
+    "devtools/client/markupview/test/browser_markupview_navigation.js": 8900, 
+    "devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js": 5025, 
+    "devtools/client/markupview/test/browser_markupview_pagesize_01.js": 3990, 
+    "devtools/client/markupview/test/browser_markupview_pagesize_02.js": 4256, 
+    "devtools/client/markupview/test/browser_markupview_search_01.js": 3916, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_01.js": 5996, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_03.js": 3172, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_04.js": 7513, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_05.js": 4448, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_06.js": 4533, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_07.js": 4185, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_08.js": 4083, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_09.js": 3023, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_10.js": 3015, 
+    "devtools/client/markupview/test/browser_markupview_tag_edit_12.js": 3299, 
+    "devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js": 4529, 
+    "devtools/client/markupview/test/browser_markupview_toggle_01.js": 3518, 
+    "devtools/client/markupview/test/browser_markupview_toggle_02.js": 3432, 
+    "devtools/client/markupview/test/browser_markupview_toggle_03.js": 3911, 
+    "devtools/client/markupview/test/browser_markupview_update-on-navigtion.js": 3412, 
+    "devtools/client/netmonitor/har/test/browser_net_har_copy_all_as_har.js": 5050, 
+    "devtools/client/netmonitor/test/browser_net_aaa_leaktest.js": 4466, 
+    "devtools/client/netmonitor/test/browser_net_accessibility-01.js": 14089, 
+    "devtools/client/netmonitor/test/browser_net_accessibility-02.js": 13951, 
+    "devtools/client/netmonitor/test/browser_net_api-calls.js": 3769, 
+    "devtools/client/netmonitor/test/browser_net_autoscroll.js": 17125, 
+    "devtools/client/netmonitor/test/browser_net_cached-status.js": 4320, 
+    "devtools/client/netmonitor/test/browser_net_complex-params.js": 5646, 
+    "devtools/client/netmonitor/test/browser_net_content-type.js": 6607, 
+    "devtools/client/netmonitor/test/browser_net_copy_image_as_data_uri.js": 5469, 
+    "devtools/client/netmonitor/test/browser_net_copy_params.js": 5270, 
+    "devtools/client/netmonitor/test/browser_net_copy_response.js": 5451, 
+    "devtools/client/netmonitor/test/browser_net_curl-utils.js": 4021, 
+    "devtools/client/netmonitor/test/browser_net_details-no-duplicated-content.js": 4427, 
+    "devtools/client/netmonitor/test/browser_net_filter-01.js": 11388, 
+    "devtools/client/netmonitor/test/browser_net_filter-02.js": 15579, 
+    "devtools/client/netmonitor/test/browser_net_filter-03.js": 14030, 
+    "devtools/client/netmonitor/test/browser_net_filter-04.js": 5661, 
+    "devtools/client/netmonitor/test/browser_net_footer-summary.js": 10625, 
+    "devtools/client/netmonitor/test/browser_net_html-preview.js": 4762, 
+    "devtools/client/netmonitor/test/browser_net_icon-preview.js": 7639, 
+    "devtools/client/netmonitor/test/browser_net_image-tooltip.js": 7950, 
+    "devtools/client/netmonitor/test/browser_net_json-long.js": 10611, 
+    "devtools/client/netmonitor/test/browser_net_json-malformed.js": 3980, 
+    "devtools/client/netmonitor/test/browser_net_persistent_logs.js": 4192, 
+    "devtools/client/netmonitor/test/browser_net_post-data-01.js": 3433, 
+    "devtools/client/netmonitor/test/browser_net_prefs-reload.js": 14402, 
+    "devtools/client/netmonitor/test/browser_net_req-resp-bodies.js": 3823, 
+    "devtools/client/netmonitor/test/browser_net_security-icon-click.js": 3128, 
+    "devtools/client/netmonitor/test/browser_net_security-redirect.js": 3060, 
+    "devtools/client/netmonitor/test/browser_net_security-state.js": 3960, 
+    "devtools/client/netmonitor/test/browser_net_security-tab-deselect.js": 3380, 
+    "devtools/client/netmonitor/test/browser_net_security-tab-visibility.js": 4390, 
+    "devtools/client/netmonitor/test/browser_net_security-warnings.js": 3099, 
+    "devtools/client/netmonitor/test/browser_net_sort-01.js": 10997, 
+    "devtools/client/netmonitor/test/browser_net_sort-02.js": 11033, 
+    "devtools/client/netmonitor/test/browser_net_sort-03.js": 13254, 
+    "devtools/client/netmonitor/test/browser_net_statistics-01.js": 4561, 
+    "devtools/client/netmonitor/test/browser_net_statistics-02.js": 5159, 
+    "devtools/client/netmonitor/test/browser_net_status-codes.js": 4756, 
+    "devtools/client/netmonitor/test/browser_net_timing-division.js": 5709, 
+    "devtools/client/performance/test/browser_aaa-run-first-leaktest.js": 6152, 
+    "devtools/client/performance/test/browser_markers-cycle-collection.js": 5901, 
+    "devtools/client/performance/test/browser_perf-categories-js-calltree.js": 11122, 
+    "devtools/client/performance/test/browser_perf-clear-01.js": 10881, 
+    "devtools/client/performance/test/browser_perf-clear-02.js": 13033, 
+    "devtools/client/performance/test/browser_perf-columns-js-calltree.js": 12169, 
+    "devtools/client/performance/test/browser_perf-columns-memory-calltree.js": 10493, 
+    "devtools/client/performance/test/browser_perf-compatibility-02.js": 5219, 
+    "devtools/client/performance/test/browser_perf-compatibility-04.js": 5296, 
+    "devtools/client/performance/test/browser_perf-compatibility-05.js": 7262, 
+    "devtools/client/performance/test/browser_perf-compatibility-07.js": 5999, 
+    "devtools/client/performance/test/browser_perf-compatibility-08.js": 7686, 
+    "devtools/client/performance/test/browser_perf-console-record-01.js": 7559, 
+    "devtools/client/performance/test/browser_perf-console-record-02.js": 7377, 
+    "devtools/client/performance/test/browser_perf-console-record-03.js": 7227, 
+    "devtools/client/performance/test/browser_perf-console-record-04.js": 11190, 
+    "devtools/client/performance/test/browser_perf-console-record-05.js": 15306, 
+    "devtools/client/performance/test/browser_perf-console-record-06.js": 8975, 
+    "devtools/client/performance/test/browser_perf-console-record-07.js": 7043, 
+    "devtools/client/performance/test/browser_perf-console-record-08.js": 13759, 
+    "devtools/client/performance/test/browser_perf-console-record-09.js": 4380, 
+    "devtools/client/performance/test/browser_perf-data-massaging-01.js": 6852, 
+    "devtools/client/performance/test/browser_perf-data-samples.js": 4822, 
+    "devtools/client/performance/test/browser_perf-details-01.js": 8388, 
+    "devtools/client/performance/test/browser_perf-details-02.js": 8504, 
+    "devtools/client/performance/test/browser_perf-details-03.js": 15137, 
+    "devtools/client/performance/test/browser_perf-details-04.js": 16618, 
+    "devtools/client/performance/test/browser_perf-details-05.js": 10399, 
+    "devtools/client/performance/test/browser_perf-details-06.js": 10739, 
+    "devtools/client/performance/test/browser_perf-details-07.js": 8359, 
+    "devtools/client/performance/test/browser_perf-details-calltree-render.js": 11891, 
+    "devtools/client/performance/test/browser_perf-details-flamegraph-render.js": 10649, 
+    "devtools/client/performance/test/browser_perf-details-memory-calltree-render.js": 7665, 
+    "devtools/client/performance/test/browser_perf-details-memory-flamegraph-render.js": 10418, 
+    "devtools/client/performance/test/browser_perf-details-waterfall-render.js": 10655, 
+    "devtools/client/performance/test/browser_perf-events-calltree.js": 6564, 
+    "devtools/client/performance/test/browser_perf-front-profiler-02.js": 4033, 
+    "devtools/client/performance/test/browser_perf-front-profiler-03.js": 5716, 
+    "devtools/client/performance/test/browser_perf-front-profiler-04.js": 5436, 
+    "devtools/client/performance/test/browser_perf-highlighted.js": 10630, 
+    "devtools/client/performance/test/browser_perf-legacy-front-01.js": 10014, 
+    "devtools/client/performance/test/browser_perf-legacy-front-02.js": 5759, 
+    "devtools/client/performance/test/browser_perf-legacy-front-03.js": 8029, 
+    "devtools/client/performance/test/browser_perf-legacy-front-04.js": 8179, 
+    "devtools/client/performance/test/browser_perf-legacy-front-05.js": 7571, 
+    "devtools/client/performance/test/browser_perf-legacy-front-06.js": 8666, 
+    "devtools/client/performance/test/browser_perf-loading-01.js": 7323, 
+    "devtools/client/performance/test/browser_perf-loading-02.js": 18693, 
+    "devtools/client/performance/test/browser_perf-options-01.js": 3151, 
+    "devtools/client/performance/test/browser_perf-options-02.js": 5712, 
+    "devtools/client/performance/test/browser_perf-options-allocations.js": 7957, 
+    "devtools/client/performance/test/browser_perf-options-enable-framerate.js": 9407, 
+    "devtools/client/performance/test/browser_perf-options-enable-memory-01.js": 11105, 
+    "devtools/client/performance/test/browser_perf-options-enable-memory-02.js": 11196, 
+    "devtools/client/performance/test/browser_perf-options-enable-optimizations.js": 10844, 
+    "devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-01.js": 8596, 
+    "devtools/client/performance/test/browser_perf-options-flatten-tree-recursion-02.js": 8817, 
+    "devtools/client/performance/test/browser_perf-options-invert-call-tree-01.js": 8583, 
+    "devtools/client/performance/test/browser_perf-options-invert-call-tree-02.js": 8443, 
+    "devtools/client/performance/test/browser_perf-options-invert-flame-graph-01.js": 8844, 
+    "devtools/client/performance/test/browser_perf-options-invert-flame-graph-02.js": 8861, 
+    "devtools/client/performance/test/browser_perf-options-profiler.js": 10289, 
+    "devtools/client/performance/test/browser_perf-options-show-idle-blocks-01.js": 8890, 
+    "devtools/client/performance/test/browser_perf-options-show-idle-blocks-02.js": 8851, 
+    "devtools/client/performance/test/browser_perf-options-show-platform-data-01.js": 10140, 
+    "devtools/client/performance/test/browser_perf-options-show-platform-data-02.js": 9360, 
+    "devtools/client/performance/test/browser_perf-overview-render-01.js": 12768, 
+    "devtools/client/performance/test/browser_perf-overview-render-02.js": 32680, 
+    "devtools/client/performance/test/browser_perf-overview-render-03.js": 32403, 
+    "devtools/client/performance/test/browser_perf-overview-render-04.js": 9354, 
+    "devtools/client/performance/test/browser_perf-overview-selection-01.js": 10565, 
+    "devtools/client/performance/test/browser_perf-overview-selection-02.js": 16062, 
+    "devtools/client/performance/test/browser_perf-overview-selection-03.js": 10611, 
+    "devtools/client/performance/test/browser_perf-overview-time-interval.js": 9961, 
+    "devtools/client/performance/test/browser_perf-recording-model-01.js": 4653, 
+    "devtools/client/performance/test/browser_perf-refresh.js": 7192, 
+    "devtools/client/performance/test/browser_perf-states.js": 9006, 
+    "devtools/client/performance/test/browser_perf-theme-toggle-01.js": 21376, 
+    "devtools/client/performance/test/browser_profiler_tree-view-11.js": 9208, 
+    "devtools/client/performance/test/browser_timeline-filters-02.js": 4277, 
+    "devtools/client/performance/test/browser_timeline-waterfall-background.js": 9482, 
+    "devtools/client/performance/test/browser_timeline-waterfall-generic.js": 12514, 
+    "devtools/client/projecteditor/test/browser_projecteditor_editing_01.js": 3894, 
+    "devtools/client/projecteditor/test/browser_projecteditor_external_change.js": 4204, 
+    "devtools/client/projecteditor/test/browser_projecteditor_immediate_destroy.js": 3363, 
+    "devtools/client/projecteditor/test/browser_projecteditor_rename_file.js": 10015, 
+    "devtools/client/projecteditor/test/browser_projecteditor_tree_selection_01.js": 4249, 
+    "devtools/client/projecteditor/test/browser_projecteditor_tree_selection_02.js": 3197, 
+    "devtools/client/responsivedesign/test/browser_responsive_cmd.js": 3534, 
+    "devtools/client/scratchpad/test/browser_scratchpad_close_toolbox.js": 4668, 
+    "devtools/client/scratchpad/test/browser_scratchpad_disable_view_menu_items.js": 6413, 
+    "devtools/client/scratchpad/test/browser_scratchpad_restore.js": 4266, 
+    "devtools/client/scratchpad/test/browser_scratchpad_wrong_window_focus.js": 3698, 
+    "devtools/client/shared/test/browser_css_color.js": 6403, 
+    "devtools/client/shared/test/browser_tableWidget_basic.js": 14071, 
+    "devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js": 4252, 
+    "devtools/client/shared/test/browser_tableWidget_mouse_interaction.js": 4687, 
+    "devtools/client/shared/test/browser_telemetry_button_eyedropper.js": 5156, 
+    "devtools/client/shared/test/browser_telemetry_button_scratchpad.js": 6860, 
+    "devtools/client/shared/test/browser_telemetry_sidebar.js": 7034, 
+    "devtools/client/shared/test/browser_telemetry_toolbox.js": 7094, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_canvasdebugger.js": 3061, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_inspector.js": 4774, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js": 3864, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js": 3158, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_netmonitor.js": 3373, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_options.js": 3140, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_storage.js": 3065, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_styleeditor.js": 3227, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_webaudioeditor.js": 3440, 
+    "devtools/client/shared/test/browser_telemetry_toolboxtabs_webconsole.js": 3229, 
+    "devtools/client/shared/test/browser_toolbar_basic.js": 4254, 
+    "devtools/client/sourceeditor/test/browser_codemirror.js": 5309, 
+    "devtools/client/sourceeditor/test/browser_vimemacs.js": 39690, 
+    "devtools/client/storage/test/browser_storage_basic.js": 11208, 
+    "devtools/client/storage/test/browser_storage_dynamic_updates.js": 5698, 
+    "devtools/client/storage/test/browser_storage_sidebar.js": 6482, 
+    "devtools/client/storage/test/browser_storage_values.js": 5715, 
+    "devtools/client/styleeditor/test/browser_styleeditor_autocomplete-disabled.js": 5491, 
+    "devtools/client/styleeditor/test/browser_styleeditor_autocomplete.js": 5536, 
+    "devtools/client/styleeditor/test/browser_styleeditor_bug_740541_iframes.js": 3905, 
+    "devtools/client/styleeditor/test/browser_styleeditor_enabled.js": 3151, 
+    "devtools/client/styleeditor/test/browser_styleeditor_fetch-from-cache.js": 3384, 
+    "devtools/client/styleeditor/test/browser_styleeditor_inline_friendly_names.js": 4430, 
+    "devtools/client/styleeditor/test/browser_styleeditor_loading.js": 3197, 
+    "devtools/client/styleeditor/test/browser_styleeditor_media_sidebar.js": 4079, 
+    "devtools/client/styleeditor/test/browser_styleeditor_media_sidebar_sourcemaps.js": 3669, 
+    "devtools/client/styleeditor/test/browser_styleeditor_missing_stylesheet.js": 3810, 
+    "devtools/client/styleeditor/test/browser_styleeditor_navigate.js": 5021, 
+    "devtools/client/styleeditor/test/browser_styleeditor_new.js": 3673, 
+    "devtools/client/styleeditor/test/browser_styleeditor_private_perwindowpb.js": 3410, 
+    "devtools/client/styleeditor/test/browser_styleeditor_reload.js": 5506, 
+    "devtools/client/styleeditor/test/browser_styleeditor_scroll.js": 3556, 
+    "devtools/client/styleeditor/test/browser_styleeditor_selectstylesheet.js": 3101, 
+    "devtools/client/styleeditor/test/browser_styleeditor_sourcemap_large.js": 3765, 
+    "devtools/client/styleeditor/test/browser_styleeditor_sourcemaps.js": 6856, 
+    "devtools/client/styleeditor/test/browser_styleeditor_sv_keynav.js": 3194, 
+    "devtools/client/styleeditor/test/browser_styleeditor_transition_rule.js": 4177, 
+    "devtools/client/styleeditor/test/browser_styleeditor_xul.js": 2991, 
+    "devtools/client/styleinspector/test/browser_computedview_browser-styles.js": 6954, 
+    "devtools/client/styleinspector/test/browser_computedview_cycle_color.js": 3019, 
+    "devtools/client/styleinspector/test/browser_computedview_getNodeInfo.js": 3409, 
+    "devtools/client/styleinspector/test/browser_computedview_keybindings_01.js": 3028, 
+    "devtools/client/styleinspector/test/browser_computedview_keybindings_02.js": 3492, 
+    "devtools/client/styleinspector/test/browser_computedview_matched-selectors-toggle.js": 3181, 
+    "devtools/client/styleinspector/test/browser_computedview_matched-selectors_01.js": 3465, 
+    "devtools/client/styleinspector/test/browser_computedview_media-queries.js": 3129, 
+    "devtools/client/styleinspector/test/browser_computedview_no-results-placeholder.js": 3428, 
+    "devtools/client/styleinspector/test/browser_computedview_original-source-link.js": 5657, 
+    "devtools/client/styleinspector/test/browser_computedview_pseudo-element_01.js": 3960, 
+    "devtools/client/styleinspector/test/browser_computedview_refresh-on-style-change_01.js": 3170, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter.js": 4907, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter_clear.js": 6346, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter_context-menu.js": 3311, 
+    "devtools/client/styleinspector/test/browser_computedview_search-filter_escape-keypress.js": 6283, 
+    "devtools/client/styleinspector/test/browser_computedview_select-and-copy-styles.js": 3541, 
+    "devtools/client/styleinspector/test/browser_computedview_style-editor-link.js": 6256, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-and-reselect.js": 3944, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_01.js": 3257, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_02.js": 3054, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-cancel_03.js": 3226, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-property-svg.js": 3054, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_01.js": 10543, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_02.js": 3033, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_03.js": 3038, 
+    "devtools/client/styleinspector/test/browser_ruleview_add-rule_pseudo_class.js": 4949, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-and-image-tooltip_01.js": 3056, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-appears-on-swatch-click.js": 3168, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-commit-on-ENTER.js": 3180, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js": 3132, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-multiple-changes.js": 4742, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-revert-on-ESC.js": 3007, 
+    "devtools/client/styleinspector/test/browser_ruleview_colorpicker-swatch-displayed.js": 2992, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_01.js": 7150, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-existing-property_02.js": 6351, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-new-property_01.js": 5761, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-new-property_02.js": 6863, 
+    "devtools/client/styleinspector/test/browser_ruleview_completion-popup-hidden-after-navigation.js": 3690, 
+    "devtools/client/styleinspector/test/browser_ruleview_computed-lists_02.js": 3025, 
+    "devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-01.js": 3151, 
+    "devtools/client/styleinspector/test/browser_ruleview_context-menu-show-mdn-docs-03.js": 5211, 
+    "devtools/client/styleinspector/test/browser_ruleview_copy_styles.js": 3941, 
+    "devtools/client/styleinspector/test/browser_ruleview_cubicbezier-appears-on-swatch-click.js": 3578, 
+    "devtools/client/styleinspector/test/browser_ruleview_cubicbezier-commit-on-ENTER.js": 3267, 
+    "devtools/client/styleinspector/test/browser_ruleview_cubicbezier-revert-on-ESC.js": 3193, 
+    "devtools/client/styleinspector/test/browser_ruleview_custom.js": 3492, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-commit.js": 3232, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-computed.js": 3063, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-increments.js": 5351, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-order.js": 3218, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_02.js": 3014, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property-remove_03.js": 3001, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_01.js": 4301, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_02.js": 3586, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_03.js": 3035, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_04.js": 3215, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_05.js": 3143, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_06.js": 3088, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-property_07.js": 3025, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector-commit.js": 3685, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_01.js": 3025, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_02.js": 3451, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_04.js": 3173, 
+    "devtools/client/styleinspector/test/browser_ruleview_edit-selector_05.js": 3339, 
+    "devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_01.js": 5020, 
+    "devtools/client/styleinspector/test/browser_ruleview_editable-field-focus_02.js": 4495, 
+    "devtools/client/styleinspector/test/browser_ruleview_eyedropper.js": 4495, 
+    "devtools/client/styleinspector/test/browser_ruleview_filtereditor-appears-on-swatch-click.js": 3361, 
+    "devtools/client/styleinspector/test/browser_ruleview_filtereditor-commit-on-ENTER.js": 3237, 
+    "devtools/client/styleinspector/test/browser_ruleview_inherited-properties_01.js": 3073, 
+    "devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_01.js": 5374, 
+    "devtools/client/styleinspector/test/browser_ruleview_keyframes-rule_02.js": 5456, 
+    "devtools/client/styleinspector/test/browser_ruleview_livepreview.js": 3550, 
+    "devtools/client/styleinspector/test/browser_ruleview_mark_overridden_02.js": 3010, 
+    "devtools/client/styleinspector/test/browser_ruleview_mark_overridden_05.js": 3117, 
+    "devtools/client/styleinspector/test/browser_ruleview_mathml-element.js": 3253, 
+    "devtools/client/styleinspector/test/browser_ruleview_media-queries.js": 3170, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js": 2995, 
+    "devtools/client/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js": 3042, 
+    "devtools/client/styleinspector/test/browser_ruleview_original-source-link.js": 4489, 
+    "devtools/client/styleinspector/test/browser_ruleview_pseudo-element_01.js": 5061, 
+    "devtools/client/styleinspector/test/browser_ruleview_pseudo_lock_options.js": 4203, 
+    "devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_01.js": 3063, 
+    "devtools/client/styleinspector/test/browser_ruleview_refresh-on-attribute-change_02.js": 3510, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_01.js": 3208, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_06.js": 3112, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_08.js": 3140, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_clear.js": 2991, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter-computed-list_expander.js": 3027, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_01.js": 3156, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_02.js": 3341, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_04.js": 4286, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_05.js": 3036, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_06.js": 2991, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_10.js": 3121, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_12.js": 3259, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_13.js": 3200, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_14.js": 3142, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_15.js": 3267, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_16.js": 3121, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_clear.js": 3014, 
+    "devtools/client/styleinspector/test/browser_ruleview_search-filter_escape-keypress.js": 2991, 
+    "devtools/client/styleinspector/test/browser_ruleview_select-and-copy-styles.js": 3085, 
+    "devtools/client/styleinspector/test/browser_ruleview_selector-highlighter_03.js": 3176, 
+    "devtools/client/styleinspector/test/browser_ruleview_selector_highlight.js": 4295, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter-computed-list_01.js": 4602, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_01.js": 4434, 
+    "devtools/client/styleinspector/test/browser_ruleview_strict-search-filter_02.js": 3170, 
+    "devtools/client/styleinspector/test/browser_ruleview_urls-clickable.js": 4005, 
+    "devtools/client/styleinspector/test/browser_ruleview_user-agent-styles-uneditable.js": 3134, 
+    "devtools/client/styleinspector/test/browser_ruleview_user-agent-styles.js": 12622, 
+    "devtools/client/styleinspector/test/browser_ruleview_user-property-reset.js": 4361, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js": 15029, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-color_02.js": 3239, 
+    "devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js": 4815, 
+    "devtools/client/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js": 6067, 
+    "devtools/client/styleinspector/test/browser_styleinspector_refresh_when_active.js": 3717, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-background-image.js": 3584, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js": 3358, 
+    "devtools/client/styleinspector/test/browser_styleinspector_tooltip-multiple-background-images.js": 3178, 
+    "devtools/client/styleinspector/test/browser_styleinspector_transform-highlighter-02.js": 3165, 
+    "devtools/client/webaudioeditor/test/browser_audionode-actor-connectnode-disconnect.js": 4615, 
+    "devtools/client/webaudioeditor/test/browser_wa_destroy-node-01.js": 9590, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-click.js": 3540, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-render-01.js": 3590, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-render-03.js": 3155, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-selected.js": 3174, 
+    "devtools/client/webaudioeditor/test/browser_wa_graph-zoom.js": 3328, 
+    "devtools/client/webaudioeditor/test/browser_wa_inspector-bypass-01.js": 3316, 
+    "devtools/client/webaudioeditor/test/browser_wa_inspector-toggle.js": 3929, 
+    "devtools/client/webaudioeditor/test/browser_wa_inspector-width.js": 4094, 
+    "devtools/client/webaudioeditor/test/browser_wa_inspector.js": 3112, 
+    "devtools/client/webaudioeditor/test/browser_wa_navigate.js": 4187, 
+    "devtools/client/webaudioeditor/test/browser_wa_properties-view-media-nodes.js": 3664, 
+    "devtools/client/webaudioeditor/test/browser_wa_properties-view-params-objects.js": 3260, 
+    "devtools/client/webaudioeditor/test/browser_wa_properties-view-params.js": 5903, 
+    "devtools/client/webaudioeditor/test/browser_wa_properties-view.js": 3110, 
+    "devtools/client/webaudioeditor/test/browser_wa_reset-02.js": 3262, 
+    "devtools/client/webaudioeditor/test/browser_wa_reset-03.js": 3970, 
+    "devtools/client/webaudioeditor/test/browser_webaudio-actor-destroy-node.js": 8216, 
+    "devtools/client/webconsole/test/browser_bug1045902_console_csp_ignore_reflected_xss_message.js": 4790, 
+    "devtools/client/webconsole/test/browser_bug_862916_console_dir_and_filter_off.js": 5124, 
+    "devtools/client/webconsole/test/browser_console_consolejsm_output.js": 3307, 
+    "devtools/client/webconsole/test/browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js": 4596, 
+    "devtools/client/webconsole/test/browser_console_history_persist.js": 6898, 
+    "devtools/client/webconsole/test/browser_console_keyboard_accessibility.js": 3390, 
+    "devtools/client/webconsole/test/browser_console_native_getters.js": 5387, 
+    "devtools/client/webconsole/test/browser_console_server_logging.js": 5517, 
+    "devtools/client/webconsole/test/browser_console_variables_view_dont_sort_non_sortable_classes_properties.js": 4498, 
+    "devtools/client/webconsole/test/browser_console_variables_view_highlighter.js": 6285, 
+    "devtools/client/webconsole/test/browser_eval_in_debugger_stackframe2.js": 3583, 
+    "devtools/client/webconsole/test/browser_jsterm_inspect.js": 6663, 
+    "devtools/client/webconsole/test/browser_warn_user_about_replaced_api.js": 3542, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_594477_clickable_output.js": 3085, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_597460_filter_scroll.js": 3832, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_601667_filter_buttons.js": 3340, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_613642_maintain_scroll.js": 3035, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js": 3624, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_658368_time_methods.js": 3263, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_659907_console_dir.js": 4742, 
+    "devtools/client/webconsole/test/browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js": 3443, 
+    "devtools/client/webconsole/test/browser_webconsole_cached_autocomplete.js": 4445, 
+    "devtools/client/webconsole/test/browser_webconsole_hpkp_invalid-headers.js": 4754, 
+    "devtools/client/webconsole/test/browser_webconsole_network_panel.js": 4361, 
+    "devtools/client/webconsole/test/browser_webconsole_output_02.js": 6708, 
+    "devtools/client/webconsole/test/browser_webconsole_output_03.js": 6087, 
+    "devtools/client/webconsole/test/browser_webconsole_output_04.js": 5134, 
+    "devtools/client/webconsole/test/browser_webconsole_output_05.js": 5136, 
+    "devtools/client/webconsole/test/browser_webconsole_output_06.js": 6408, 
+    "devtools/client/webconsole/test/browser_webconsole_output_dom_elements_01.js": 4636, 
+    "devtools/client/webconsole/test/browser_webconsole_output_dom_elements_03.js": 3176, 
+    "devtools/client/webconsole/test/browser_webconsole_split.js": 8112, 
+    "devtools/client/webconsole/test/browser_webconsole_split_escape_key.js": 3379, 
+    "devtools/client/webconsole/test/browser_webconsole_trackingprotection_errors.js": 3341, 
+    "devtools/server/tests/browser/browser_markers-cycle-collection.js": 6062, 
+    "devtools/server/tests/browser/browser_perf-samples-01.js": 3560
   }
 }
\ No newline at end of file
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 15ec292c8de46..3a60d03a64756 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -2193,7 +2193,7 @@ <h1><a id="angle"></a>ANGLE License</h1>
     <h1><a id="acorn"></a>acorn License</h1>
 
     <p>This license applies to all files in
-      <span class="path">toolkit/devtools/acorn</span>.
+      <span class="path">devtools/shared/acorn</span>.
     </p>
 <pre>
 Copyright (C) 2012 by Marijn Haverbeke &lt;marijnh@gmail.com&gt;
@@ -2722,8 +2722,8 @@ <h1><a id="chromium"></a>Chromium License</h1>
     <h1><a id="codemirror"></a>CodeMirror License</h1>
 
     <p>This license applies to all files in
-      <span class="path">browser/devtools/sourceeditor/codemirror</span> and
-      to specified files in the <span class="path">browser/devtools/sourceeditor/test/</span>:
+      <span class="path">devtools/client/sourceeditor/codemirror</span> and
+      to specified files in the <span class="path">devtools/client/sourceeditor/test/</span>:
     </p>
     <ul>
       <li><span class="path">cm_comment_test.js</span></li>
@@ -2765,7 +2765,7 @@ <h1><a id="codemirror"></a>CodeMirror License</h1>
     <h1><a id="cubic-bezier"></a>cubic-bezier License</h1>
 
     <p>This license applies to the file
-    <span class="path">browser/devtools/shared/widgets/CubicBezierWidget.js
+    <span class="path">devtools/client/shared/widgets/CubicBezierWidget.js
     </span>.</p>
 <pre>
 Copyright (c) 2013 Lea Verou. All rights reserved.
@@ -2795,7 +2795,7 @@ <h1><a id="cubic-bezier"></a>cubic-bezier License</h1>
     <h1><a id="d3"></a>D3 License</h1>
 
     <p>This license applies to the file
-      <span class="path">browser/devtools/shared/d3.js</span>.
+      <span class="path">devtools/client/shared/d3.js</span>.
     </p>
 <pre>
 Copyright (c) 2014, Michael Bostock
@@ -2832,7 +2832,7 @@ <h1><a id="d3"></a>D3 License</h1>
     <h1><a id="dagre-d3"></a>Dagre-D3 License</h1>
 
     <p>This license applies to the file
-      <span class="path">browser/devtools/webaudioeditor/lib/dagre-d3.js</span>.
+      <span class="path">devtools/client/webaudioeditor/lib/dagre-d3.js</span>.
     </p>
 <pre>
 Copyright (c) 2013 Chris Pettitt
@@ -3014,7 +3014,7 @@ <h1><a id="expat"></a>Expat License</h1>
     <h1><a id="firebug"></a>Firebug License</h1>
 
     <p>This license applies to the code
-    <span class="path">toolkit/devtools/webconsole/network-helper.js</span>.</p>
+    <span class="path">devtools/shared/webconsole/network-helper.js</span>.</p>
 
 <pre>
 Copyright (c) 2007, Parakey Inc.
@@ -4418,7 +4418,7 @@ <h1><a id="qcms"></a>qcms License</h1>
     <h1><a id="qrcode-generator"></a>QR Code Generator License</h1>
 
     <p>This license applies to certain files in the directory
-      <span class="path">toolkit/devtools/qrcode/encoder/</span>.</p>
+      <span class="path">devtools/shared/qrcode/encoder/</span>.</p>
 <pre>
 Copyright (c) 2009 Kazuhiko Arase
 
@@ -4515,7 +4515,7 @@ <h1><a id="xdg"></a>Red Hat xdg_user_dir_lookup License</h1>
     <h1><a id="redux"></a>Redux License</h1>
 
     <p>This license applies to the file
-    <span class="path">browser/devtools/shared/vendor/redux.js</span>.</p>
+    <span class="path">devtools/client/shared/vendor/redux.js</span>.</p>
 <pre>
 Copyright (c) 2015 Dan Abramov
 
diff --git a/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd b/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd
index 5f104e7c23d9a..da53477f27694 100644
--- a/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd
+++ b/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd
@@ -4,7 +4,7 @@
 
 <!-- LOCALIZATION NOTE : FILE This file contains the CSS Coverage Report
    - strings. See the 'csscoverage' command for more information, and
-   - browser/devtools/styleeditor/styleeditor.xul for context -->
+   - devtools/client/styleeditor/styleeditor.xul for context -->
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
    - keep it in English, or another language commonly spoken among web developers.