Bug 912121 - Update misc. DevTools paths and comments. rs=devtools

--HG--
extra : commitid : BSf4D59s9HF
extra : rebase_source : 4d14e1aa3ad93bbb426861336e8b703bc1e0b3af

.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

.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$

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.
    */

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;

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

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,

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");

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";

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}">
  *

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(".");

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";

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.',

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: {}

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() {

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() {

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',

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() {

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() {

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) {

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() {

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() {

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;

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");

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 = { };

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() {

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";
 

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";
 

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;

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");

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.

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)

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";
 

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;
 

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", {

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) {

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