diff --git a/toolkit/devtools/Loader.jsm b/toolkit/devtools/Loader.jsm index 055817771a..c6e5d08e71 100644 --- a/toolkit/devtools/Loader.jsm +++ b/toolkit/devtools/Loader.jsm @@ -78,7 +78,7 @@ BuiltinProvider.prototype = { // When you add a line to this mapping, don't forget to make a // corresponding addition to the SrcdirProvider mapping below as well. "": "resource://gre/modules/jetpack/", - "main": "resource:///modules/devtools/main.js", + "main": "resource://gre/modules/devtools/main.js", "devtools": "resource:///modules/devtools", "devtools/toolkit": "resource://gre/modules/devtools", "devtools/server": "resource://gre/modules/devtools/server", @@ -94,7 +94,7 @@ BuiltinProvider.prototype = { "devtools/async-utils": "resource://gre/modules/devtools/async-utils", "devtools/content-observer": "resource://gre/modules/devtools/content-observer", "gcli": "resource://gre/modules/devtools/gcli", - "projecteditor": "resource:///modules/devtools/projecteditor", + "projecteditor": "resource://gre/modules/devtools/projecteditor", "acorn": "resource://gre/modules/devtools/acorn", "acorn/util/walk": "resource://gre/modules/devtools/acorn/walk.js", "tern": "resource://gre/modules/devtools/tern", diff --git a/toolkit/devtools/animationinspector/animation-controller.js b/toolkit/devtools/animationinspector/animation-controller.js index d16567c04d..6a7835bce7 100644 --- a/toolkit/devtools/animationinspector/animation-controller.js +++ b/toolkit/devtools/animationinspector/animation-controller.js @@ -11,7 +11,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/Loader.jsm"); Cu.import("resource://gre/modules/devtools/Console.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); devtools.lazyRequireGetter(this, "promise"); devtools.lazyRequireGetter(this, "EventEmitter", diff --git a/toolkit/devtools/animationinspector/test/head.js b/toolkit/devtools/animationinspector/test/head.js index 9488ebaabd..9dba9be78a 100644 --- a/toolkit/devtools/animationinspector/test/head.js +++ b/toolkit/devtools/animationinspector/test/head.js @@ -5,12 +5,12 @@ "use strict"; const Cu = Components.utils; -const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +const {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); const TargetFactory = devtools.TargetFactory; const {console} = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {}); -const {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +const {ViewHelpers} = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); // All tests are asynchronous waitForExplicitFinish(); diff --git a/toolkit/devtools/app-manager/content/connection-footer.js b/toolkit/devtools/app-manager/content/connection-footer.js index 5e96a48e91..4ff809a4d7 100644 --- a/toolkit/devtools/app-manager/content/connection-footer.js +++ b/toolkit/devtools/app-manager/content/connection-footer.js @@ -5,7 +5,7 @@ const Cu = Components.utils; const Ci = Components.interfaces; Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {Simulator} = Cu.import("resource://gre/modules/devtools/Simulator.jsm") const {Devices} = Cu.import("resource://gre/modules/devtools/Devices.jsm"); diff --git a/toolkit/devtools/app-manager/content/device.js b/toolkit/devtools/app-manager/content/device.js index 5945adda43..9c64f90da1 100644 --- a/toolkit/devtools/app-manager/content/device.js +++ b/toolkit/devtools/app-manager/content/device.js @@ -5,7 +5,7 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/devtools/dbg-client.jsm"); -const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +const {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {require} = devtools; diff --git a/toolkit/devtools/app-manager/content/index.js b/toolkit/devtools/app-manager/content/index.js index 3208ea2634..e909f53959 100644 --- a/toolkit/devtools/app-manager/content/index.js +++ b/toolkit/devtools/app-manager/content/index.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const {utils: Cu, interfaces: Ci} = Components; -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {require} = devtools; const {ConnectionManager, Connection} = require("devtools/client/connection-manager"); diff --git a/toolkit/devtools/app-manager/content/manifest-editor.js b/toolkit/devtools/app-manager/content/manifest-editor.js index 3ba1ea4c12..fc154f170a 100644 --- a/toolkit/devtools/app-manager/content/manifest-editor.js +++ b/toolkit/devtools/app-manager/content/manifest-editor.js @@ -5,7 +5,7 @@ Cu.import("resource://gre/modules/osfile.jsm"); const {VariablesView} = - Cu.import("resource:///modules/devtools/VariablesView.jsm", {}); + Cu.import("resource://gre/modules/devtools/VariablesView.jsm", {}); const VARIABLES_VIEW_URL = "chrome://global/content/devtools/widgets/VariablesView.xul"; diff --git a/toolkit/devtools/app-manager/content/projects.js b/toolkit/devtools/app-manager/content/projects.js index 788b7a51d7..275554c33f 100644 --- a/toolkit/devtools/app-manager/content/projects.js +++ b/toolkit/devtools/app-manager/content/projects.js @@ -6,7 +6,7 @@ const Cc = Components.classes; const Ci = Components.interfaces; const Cu = Components.utils; const Cr = Components.results; -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {require} = devtools; const {ConnectionManager, Connection} = require("devtools/client/connection-manager"); diff --git a/toolkit/devtools/app-manager/test/test_connection_store.html b/toolkit/devtools/app-manager/test/test_connection_store.html index aa7046eb93..a46f42c627 100644 --- a/toolkit/devtools/app-manager/test/test_connection_store.html +++ b/toolkit/devtools/app-manager/test/test_connection_store.html @@ -36,7 +36,7 @@ Bug 901519 - [app manager] data store for connections SimpleTest.waitForExplicitFinish(); Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource:///modules/devtools/gDevTools.jsm"); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {require} = devtools; diff --git a/toolkit/devtools/app-manager/test/test_device_store.html b/toolkit/devtools/app-manager/test/test_device_store.html index aede53af8d..2328aeeff5 100644 --- a/toolkit/devtools/app-manager/test/test_device_store.html +++ b/toolkit/devtools/app-manager/test/test_device_store.html @@ -34,7 +34,7 @@ Bug 901520 - [app manager] data store for device SimpleTest.waitForExplicitFinish(); Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource:///modules/devtools/gDevTools.jsm"); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); diff --git a/toolkit/devtools/app-manager/test/test_remain_connected.html b/toolkit/devtools/app-manager/test/test_remain_connected.html index 819e3d6c07..8f30e72cef 100644 --- a/toolkit/devtools/app-manager/test/test_remain_connected.html +++ b/toolkit/devtools/app-manager/test/test_remain_connected.html @@ -29,7 +29,7 @@ Bug 912646 - Closing app toolbox causes phone to disconnect window.onload = function() { SimpleTest.waitForExplicitFinish(); - Cu.import("resource:///modules/devtools/gDevTools.jsm"); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); diff --git a/toolkit/devtools/app-manager/test/test_template.html b/toolkit/devtools/app-manager/test/test_template.html index 7022c7012a..b875b17db8 100644 --- a/toolkit/devtools/app-manager/test/test_template.html +++ b/toolkit/devtools/app-manager/test/test_template.html @@ -158,7 +158,7 @@ SimpleTest.waitForExplicitFinish(); const Cu = Components.utils; - Cu.import("resource:///modules/devtools/gDevTools.jsm"); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {require} = devtools; const ObservableObject = require("devtools/shared/observable-object"); diff --git a/toolkit/devtools/canvasdebugger/canvasdebugger.js b/toolkit/devtools/canvasdebugger/canvasdebugger.js index ec32493cc5..3966218420 100644 --- a/toolkit/devtools/canvasdebugger/canvasdebugger.js +++ b/toolkit/devtools/canvasdebugger/canvasdebugger.js @@ -7,8 +7,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/SideMenuWidget.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/SideMenuWidget.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require; const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise; diff --git a/toolkit/devtools/canvasdebugger/test/head.js b/toolkit/devtools/canvasdebugger/test/head.js index 9031d5e8a1..67bde213db 100644 --- a/toolkit/devtools/canvasdebugger/test/head.js +++ b/toolkit/devtools/canvasdebugger/test/head.js @@ -14,7 +14,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", false); let { generateUUID } = Cc['@mozilla.org/uuid-generator;1'].getService(Ci.nsIUUIDGenerator); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {}); diff --git a/toolkit/devtools/debugger/debugger-commands.js b/toolkit/devtools/debugger/debugger-commands.js index 72824c4468..1c17787a88 100644 --- a/toolkit/devtools/debugger/debugger-commands.js +++ b/toolkit/devtools/debugger/debugger-commands.js @@ -7,7 +7,7 @@ const { Cc, Ci, Cu } = require("chrome"); const gcli = require("gcli/index"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); /** * The commands and converters that are exported to GCLI diff --git a/toolkit/devtools/debugger/debugger-controller.js b/toolkit/devtools/debugger/debugger-controller.js index 49566ff15f..ac99431e7b 100644 --- a/toolkit/devtools/debugger/debugger-controller.js +++ b/toolkit/devtools/debugger/debugger-controller.js @@ -96,12 +96,12 @@ const FRAME_TYPE = { Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); -Cu.import("resource:///modules/devtools/SimpleListWidget.jsm"); -Cu.import("resource:///modules/devtools/BreadcrumbsWidget.jsm"); -Cu.import("resource:///modules/devtools/SideMenuWidget.jsm"); -Cu.import("resource:///modules/devtools/VariablesView.jsm"); -Cu.import("resource:///modules/devtools/VariablesViewController.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/SimpleListWidget.jsm"); +Cu.import("resource://gre/modules/devtools/BreadcrumbsWidget.jsm"); +Cu.import("resource://gre/modules/devtools/SideMenuWidget.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesView.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesViewController.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require; const promise = require("devtools/toolkit/deprecated-sync-thenables"); @@ -114,7 +114,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Parser", - "resource:///modules/devtools/Parser.jsm"); + "resource://gre/modules/devtools/Parser.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "devtools", "resource://gre/modules/devtools/Loader.jsm"); diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-01.js b/toolkit/devtools/debugger/test/browser_dbg_parser-01.js index f2bb87c0a9..59f8fee3be 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-01.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-01.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); let source = "let x = 42;"; let parser = new Parser(); diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-02.js b/toolkit/devtools/debugger/test/browser_dbg_parser-02.js index 45508d864c..11a3891b45 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-02.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-02.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); let source = "let x + 42;"; let parser = new Parser(); diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-03.js b/toolkit/devtools/debugger/test/browser_dbg_parser-03.js index a4c0fce916..d629e3e7ed 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-03.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-03.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); let source = [ "", diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-04.js b/toolkit/devtools/debugger/test/browser_dbg_parser-04.js index 2ef653bf36..83d2627a4a 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-04.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-04.js @@ -6,7 +6,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); let source = [ "", diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-05.js b/toolkit/devtools/debugger/test/browser_dbg_parser-05.js index 4c1d935a26..1c4d0a3454 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-05.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-05.js @@ -7,7 +7,7 @@ */ function test() { - let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {}); + let { Parser } = Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); let source = [ "let a = [];", diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-06.js b/toolkit/devtools/debugger/test/browser_dbg_parser-06.js index cab13235e4..3bbcde1404 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-06.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-06.js @@ -8,7 +8,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); function verify(source, predicate, [sline, scol], [eline, ecol]) { let ast = Parser.reflectionAPI.parse(source); diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-07.js b/toolkit/devtools/debugger/test/browser_dbg_parser-07.js index 099c16301d..7ae0b8f958 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-07.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-07.js @@ -7,7 +7,7 @@ */ function test() { - let { ParserHelpers } = Cu.import("resource:///modules/devtools/Parser.jsm", {}); + let { ParserHelpers } = Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); let node1 = { loc: { start: { line: 1, column: 10 }, diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-08.js b/toolkit/devtools/debugger/test/browser_dbg_parser-08.js index 0286d9be27..0f19402753 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-08.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-08.js @@ -7,7 +7,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); function verify(source, predicate, details) { let { name, chain } = details; diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-09.js b/toolkit/devtools/debugger/test/browser_dbg_parser-09.js index a8a9ad2c35..40c5aaa9a6 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-09.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-09.js @@ -8,7 +8,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); function verify(source, predicate, details) { let { name, chain } = details; diff --git a/toolkit/devtools/debugger/test/browser_dbg_parser-10.js b/toolkit/devtools/debugger/test/browser_dbg_parser-10.js index af44ebdf64..87f1a1cedf 100644 --- a/toolkit/devtools/debugger/test/browser_dbg_parser-10.js +++ b/toolkit/devtools/debugger/test/browser_dbg_parser-10.js @@ -7,7 +7,7 @@ function test() { let { Parser, ParserHelpers, SyntaxTreeVisitor } = - Cu.import("resource:///modules/devtools/Parser.jsm", {}); + Cu.import("resource://gre/modules/devtools/Parser.jsm", {}); function verify(source, predicate, string) { let ast = Parser.reflectionAPI.parse(source); diff --git a/toolkit/devtools/debugger/test/head.js b/toolkit/devtools/debugger/test/head.js index f510a56f74..7a6dbe953a 100644 --- a/toolkit/devtools/debugger/test/head.js +++ b/toolkit/devtools/debugger/test/head.js @@ -14,11 +14,11 @@ Services.prefs.setBoolPref("devtools.debugger.log", false); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise: promise } = Cu.import("resource://gre/modules/devtools/deprecated-sync-thenables.js", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let { require } = devtools; let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {}); -let { BrowserToolboxProcess } = Cu.import("resource:///modules/devtools/ToolboxProcess.jsm", {}); +let { BrowserToolboxProcess } = Cu.import("resource://gre/modules/devtools/ToolboxProcess.jsm", {}); let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {}); let { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {}); diff --git a/toolkit/devtools/devtools-clhandler.js b/toolkit/devtools/devtools-clhandler.js index 45ab9d3638..d0b878ffdf 100644 --- a/toolkit/devtools/devtools-clhandler.js +++ b/toolkit/devtools/devtools-clhandler.js @@ -42,7 +42,7 @@ devtoolsCommandlineHandler.prototype = { if (!window) { let devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools; // Load the browser devtools main module as the loader's main module. - Cu.import("resource:///modules/devtools/gDevTools.jsm"); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); let hudservice = devtools.require("devtools/webconsole/hudservice"); let console = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).console; hudservice.toggleBrowserConsole().then(null, console.error); @@ -78,7 +78,7 @@ devtoolsCommandlineHandler.prototype = { if (!this._isRemoteDebuggingEnabled()) { return; } - Cu.import("resource:///modules/devtools/ToolboxProcess.jsm"); + Cu.import("resource://gre/modules/devtools/ToolboxProcess.jsm"); BrowserToolboxProcess.init(); if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) { diff --git a/toolkit/devtools/eyedropper/eyedropper.js b/toolkit/devtools/eyedropper/eyedropper.js index 4ae5387618..c3f9a73265 100644 --- a/toolkit/devtools/eyedropper/eyedropper.js +++ b/toolkit/devtools/eyedropper/eyedropper.js @@ -133,7 +133,7 @@ function Eyedropper(chromeWindow, opts = { copyOnSelect: true, context: "other" }; let mm = this._contentTab.linkedBrowser.messageManager; - mm.loadFrameScript("resource:///modules/devtools/eyedropper/eyedropper-child.js", true); + mm.loadFrameScript("resource://gre/modules/devtools/eyedropper/eyedropper-child.js", true); // record if this was opened via the picker or standalone var telemetry = new Telemetry(); diff --git a/toolkit/devtools/fontinspector/test/browser_fontinspector.js b/toolkit/devtools/fontinspector/test/browser_fontinspector.js index 978ba3f3dc..2c903be47b 100644 --- a/toolkit/devtools/fontinspector/test/browser_fontinspector.js +++ b/toolkit/devtools/fontinspector/test/browser_fontinspector.js @@ -2,7 +2,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ let tempScope = {}; -let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let TargetFactory = devtools.TargetFactory; diff --git a/toolkit/devtools/framework/connect/connect.js b/toolkit/devtools/framework/connect/connect.js index add5723a5c..89107164b0 100644 --- a/toolkit/devtools/framework/connect/connect.js +++ b/toolkit/devtools/framework/connect/connect.js @@ -11,7 +11,7 @@ Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/dbg-client.jsm"); -let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); diff --git a/toolkit/devtools/framework/test/browser_toolbox_custom_host.js b/toolkit/devtools/framework/test/browser_toolbox_custom_host.js index 618f1aa310..94987f2e79 100644 --- a/toolkit/devtools/framework/test/browser_toolbox_custom_host.js +++ b/toolkit/devtools/framework/test/browser_toolbox_custom_host.js @@ -5,7 +5,7 @@ function test() { Cu.import("resource://gre/modules/Services.jsm"); let temp = {} - Cu.import("resource:///modules/devtools/gDevTools.jsm", temp); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm", temp); let DevTools = temp.DevTools; Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm", temp); let LayoutHelpers = temp.LayoutHelpers; diff --git a/toolkit/devtools/framework/test/browser_toolbox_hosts.js b/toolkit/devtools/framework/test/browser_toolbox_hosts.js index 50c033c92d..ada29538f5 100644 --- a/toolkit/devtools/framework/test/browser_toolbox_hosts.js +++ b/toolkit/devtools/framework/test/browser_toolbox_hosts.js @@ -3,7 +3,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ let temp = {} -Cu.import("resource:///modules/devtools/gDevTools.jsm", temp); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm", temp); let DevTools = temp.DevTools; Cu.import("resource://gre/modules/devtools/Loader.jsm", temp); diff --git a/toolkit/devtools/framework/test/browser_toolbox_raise.js b/toolkit/devtools/framework/test/browser_toolbox_raise.js index ca2e7611be..2e4555fdca 100644 --- a/toolkit/devtools/framework/test/browser_toolbox_raise.js +++ b/toolkit/devtools/framework/test/browser_toolbox_raise.js @@ -4,7 +4,7 @@ Cu.import("resource://gre/modules/Services.jsm"); let temp = {} -Cu.import("resource:///modules/devtools/gDevTools.jsm", temp); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm", temp); let DevTools = temp.DevTools; Cu.import("resource://gre/modules/devtools/Loader.jsm", temp); diff --git a/toolkit/devtools/framework/toolbox-highlighter-utils.js b/toolkit/devtools/framework/toolbox-highlighter-utils.js index ddf7c6b7f8..6e4b6295a7 100644 --- a/toolkit/devtools/framework/toolbox-highlighter-utils.js +++ b/toolkit/devtools/framework/toolbox-highlighter-utils.js @@ -7,7 +7,7 @@ const {Cc, Ci, Cu} = require("chrome"); const {Promise: promise} = require("resource://gre/modules/Promise.jsm"); Cu.import("resource://gre/modules/Task.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); /** * Client-side highlighter shared module. diff --git a/toolkit/devtools/framework/toolbox-hosts.js b/toolkit/devtools/framework/toolbox-hosts.js index fbbb1a0c63..3e783305de 100644 --- a/toolkit/devtools/framework/toolbox-hosts.js +++ b/toolkit/devtools/framework/toolbox-hosts.js @@ -8,7 +8,7 @@ const {Cu} = require("chrome"); const EventEmitter = require("devtools/toolkit/event-emitter"); const {Promise: promise} = require("resource://gre/modules/Promise.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource:///modules/devtools/DOMHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/DOMHelpers.jsm"); /** * A toolbox host represents an object that contains a toolbox (e.g. the diff --git a/toolkit/devtools/framework/toolbox-options.js b/toolkit/devtools/framework/toolbox-options.js index d9d5c462da..543f37fb36 100644 --- a/toolkit/devtools/framework/toolbox-options.js +++ b/toolkit/devtools/framework/toolbox-options.js @@ -8,7 +8,7 @@ const {Cu, Cc, Ci} = require("chrome"); const Services = require("Services"); const promise = require("promise"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "CustomizeMode", "resource:///modules/CustomizeMode.jsm"); const kDeveditionChangedNotification = "devedition-theme-state-changed"; const DEVEDITION_THEME_PREF = "browser.devedition.theme.enabled"; diff --git a/toolkit/devtools/framework/toolbox-process-window.js b/toolkit/devtools/framework/toolbox-process-window.js index 7cc5c9dff0..2687a0221d 100644 --- a/toolkit/devtools/framework/toolbox-process-window.js +++ b/toolkit/devtools/framework/toolbox-process-window.js @@ -5,13 +5,13 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components; -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {}); let { ViewHelpers } = - Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); + Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); /** diff --git a/toolkit/devtools/framework/toolbox.js b/toolkit/devtools/framework/toolbox.js index 9a289e7a63..bff88ffda9 100644 --- a/toolkit/devtools/framework/toolbox.js +++ b/toolkit/devtools/framework/toolbox.js @@ -21,14 +21,14 @@ let {showDoorhanger} = require("devtools/shared/doorhanger"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); -Cu.import("resource:///modules/devtools/scratchpad-manager.jsm"); -Cu.import("resource:///modules/devtools/DOMHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/scratchpad-manager.jsm"); +Cu.import("resource://gre/modules/devtools/DOMHelpers.jsm"); Cu.import("resource://gre/modules/Task.jsm"); loader.lazyGetter(this, "Hosts", () => require("devtools/framework/toolbox-hosts").Hosts); -loader.lazyImporter(this, "CommandUtils", "resource:///modules/devtools/DeveloperToolbar.jsm"); +loader.lazyImporter(this, "CommandUtils", "resource://gre/modules/devtools/DeveloperToolbar.jsm"); loader.lazyGetter(this, "toolboxStrings", () => { let bundle = Services.strings.createBundle("chrome://global/locale/devtools/toolbox.properties"); diff --git a/toolkit/devtools/gcli/commands/appcache.js b/toolkit/devtools/gcli/commands/appcache.js index af98663b14..5fcf6511fb 100644 --- a/toolkit/devtools/gcli/commands/appcache.js +++ b/toolkit/devtools/gcli/commands/appcache.js @@ -6,7 +6,7 @@ const gcli = require("gcli/index"); -loader.lazyImporter(this, "AppCacheUtils", "resource:///modules/devtools/AppCacheUtils.jsm"); +loader.lazyImporter(this, "AppCacheUtils", "resource://gre/modules/devtools/AppCacheUtils.jsm"); exports.items = [ { diff --git a/toolkit/devtools/gcli/commands/calllog.js b/toolkit/devtools/gcli/commands/calllog.js index 30c944d760..48ec271db7 100644 --- a/toolkit/devtools/gcli/commands/calllog.js +++ b/toolkit/devtools/gcli/commands/calllog.js @@ -8,7 +8,7 @@ const { Cc, Ci, Cu } = require("chrome"); const TargetFactory = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.TargetFactory; const gcli = require("gcli/index"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); loader.lazyGetter(this, "Debugger", () => { let global = Cu.getGlobalForObject({}); diff --git a/toolkit/devtools/gcli/commands/csscoverage.js b/toolkit/devtools/gcli/commands/csscoverage.js index 7ef8387d8b..570c4bc1c6 100644 --- a/toolkit/devtools/gcli/commands/csscoverage.js +++ b/toolkit/devtools/gcli/commands/csscoverage.js @@ -6,7 +6,7 @@ const { Cc, Ci } = require("chrome"); -const { gDevTools } = require("resource:///modules/devtools/gDevTools.jsm"); +const { gDevTools } = require("resource://gre/modules/devtools/gDevTools.jsm"); const promise = require("resource://gre/modules/Promise.jsm").Promise; const domtemplate = require("gcli/util/domtemplate"); @@ -15,7 +15,7 @@ const l10n = csscoverage.l10n; const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "Chart", "resource:///modules/devtools/Chart.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "Chart", "resource://gre/modules/devtools/Chart.jsm"); /** * The commands/converters for GCLI diff --git a/toolkit/devtools/inspector/breadcrumbs.js b/toolkit/devtools/inspector/breadcrumbs.js index bec1d87d32..c517ae7b2c 100644 --- a/toolkit/devtools/inspector/breadcrumbs.js +++ b/toolkit/devtools/inspector/breadcrumbs.js @@ -10,9 +10,9 @@ const PSEUDO_CLASSES = [":hover", ":active", ":focus"]; const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/DOMHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/DOMHelpers.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const ELLIPSIS = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data; const MAX_LABEL_LENGTH = 40; diff --git a/toolkit/devtools/inspector/inspector-commands.js b/toolkit/devtools/inspector/inspector-commands.js index 793935b2ad..23918559e3 100644 --- a/toolkit/devtools/inspector/inspector-commands.js +++ b/toolkit/devtools/inspector/inspector-commands.js @@ -20,7 +20,7 @@ exports.items = [{ ], exec: function(args, context) { let target = context.environment.target; - let gDevTools = require("resource:///modules/devtools/gDevTools.jsm").gDevTools; + let gDevTools = require("resource://gre/modules/devtools/gDevTools.jsm").gDevTools; return gDevTools.showToolbox(target, "inspector").then(toolbox => { toolbox.getCurrentPanel().selection.setNode(args.selector, "gcli"); diff --git a/toolkit/devtools/layoutview/test/head.js b/toolkit/devtools/layoutview/test/head.js index 5e3aa0ce20..9f297b3438 100644 --- a/toolkit/devtools/layoutview/test/head.js +++ b/toolkit/devtools/layoutview/test/head.js @@ -5,7 +5,7 @@ "use strict"; const Cu = Components.utils; -let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let TargetFactory = devtools.TargetFactory; let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); diff --git a/toolkit/devtools/layoutview/view.js b/toolkit/devtools/layoutview/view.js index 18798e2ed2..6af17ba738 100644 --- a/toolkit/devtools/layoutview/view.js +++ b/toolkit/devtools/layoutview/view.js @@ -14,7 +14,7 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/Loader.jsm"); Cu.import("resource://gre/modules/devtools/Console.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); const {InplaceEditor, editableItem} = devtools.require("devtools/shared/inplace-editor"); diff --git a/toolkit/devtools/main.js b/toolkit/devtools/main.js index 825743d312..1089badf78 100644 --- a/toolkit/devtools/main.js +++ b/toolkit/devtools/main.js @@ -8,7 +8,7 @@ const {Cc, Ci, Cu} = require("chrome"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); Object.defineProperty(exports, "Toolbox", { get: () => require("devtools/framework/toolbox").Toolbox diff --git a/toolkit/devtools/markupview/markup-view.js b/toolkit/devtools/markupview/markup-view.js index b6cefdb735..fcf0fa4765 100644 --- a/toolkit/devtools/markupview/markup-view.js +++ b/toolkit/devtools/markupview/markup-view.js @@ -17,7 +17,7 @@ const NEW_SELECTION_HIGHLIGHTER_TIMER = 1000; const {UndoStack} = require("devtools/shared/undo"); const {editableField, InplaceEditor} = require("devtools/shared/inplace-editor"); -const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +const {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); const {HTMLEditor} = require("devtools/markupview/html-editor"); const promise = require("resource://gre/modules/Promise.jsm").Promise; const {Tooltip} = require("devtools/shared/widgets/Tooltip"); diff --git a/toolkit/devtools/netmonitor/netmonitor-controller.js b/toolkit/devtools/netmonitor/netmonitor-controller.js index 574e7862ab..24d274bf5c 100644 --- a/toolkit/devtools/netmonitor/netmonitor-controller.js +++ b/toolkit/devtools/netmonitor/netmonitor-controller.js @@ -109,10 +109,10 @@ const ACTIVITY_TYPE = { Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/SideMenuWidget.jsm"); -Cu.import("resource:///modules/devtools/VariablesView.jsm"); -Cu.import("resource:///modules/devtools/VariablesViewController.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/SideMenuWidget.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesView.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesViewController.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require; const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise; @@ -122,13 +122,13 @@ const {Tooltip} = require("devtools/shared/widgets/Tooltip"); const {ToolSidebar} = require("devtools/framework/sidebar"); XPCOMUtils.defineLazyModuleGetter(this, "Chart", - "resource:///modules/devtools/Chart.jsm"); + "resource://gre/modules/devtools/Chart.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Curl", - "resource:///modules/devtools/Curl.jsm"); + "resource://gre/modules/devtools/Curl.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "CurlUtils", - "resource:///modules/devtools/Curl.jsm"); + "resource://gre/modules/devtools/Curl.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); diff --git a/toolkit/devtools/netmonitor/test/head.js b/toolkit/devtools/netmonitor/test/head.js index 768527583f..d10e082ef7 100644 --- a/toolkit/devtools/netmonitor/test/head.js +++ b/toolkit/devtools/netmonitor/test/head.js @@ -7,9 +7,9 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); -let { CurlUtils } = Cu.import("resource:///modules/devtools/Curl.jsm", {}); +let { CurlUtils } = Cu.import("resource://gre/modules/devtools/Curl.jsm", {}); let TargetFactory = devtools.TargetFactory; let Toolbox = devtools.Toolbox; diff --git a/toolkit/devtools/performance/modules/front.js b/toolkit/devtools/performance/modules/front.js index 076d0de1a2..917ff9eae3 100644 --- a/toolkit/devtools/performance/modules/front.js +++ b/toolkit/devtools/performance/modules/front.js @@ -21,7 +21,7 @@ loader.lazyRequireGetter(this, "compatibility", "devtools/performance/compatibility"); loader.lazyImporter(this, "gDevTools", - "resource:///modules/devtools/gDevTools.jsm"); + "resource://gre/modules/devtools/gDevTools.jsm"); loader.lazyImporter(this, "setTimeout", "resource://gre/modules/Timer.jsm"); loader.lazyImporter(this, "clearTimeout", diff --git a/toolkit/devtools/performance/performance-controller.js b/toolkit/devtools/performance/performance-controller.js index c02836cb39..87b2c9cb9d 100644 --- a/toolkit/devtools/performance/performance-controller.js +++ b/toolkit/devtools/performance/performance-controller.js @@ -8,7 +8,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/Loader.jsm"); Cu.import("resource://gre/modules/devtools/Console.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); devtools.lazyRequireGetter(this, "Services"); devtools.lazyRequireGetter(this, "promise"); @@ -43,15 +43,15 @@ devtools.lazyRequireGetter(this, "OptionsView", "devtools/shared/options-view", true); devtools.lazyImporter(this, "CanvasGraphUtils", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); devtools.lazyImporter(this, "LineGraphWidget", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); devtools.lazyImporter(this, "FlameGraphUtils", - "resource:///modules/devtools/FlameGraph.jsm"); + "resource://gre/modules/devtools/FlameGraph.jsm"); devtools.lazyImporter(this, "FlameGraph", - "resource:///modules/devtools/FlameGraph.jsm"); + "resource://gre/modules/devtools/FlameGraph.jsm"); devtools.lazyImporter(this, "SideMenuWidget", - "resource:///modules/devtools/SideMenuWidget.jsm"); + "resource://gre/modules/devtools/SideMenuWidget.jsm"); const BRANCH_NAME = "devtools.performance.ui."; diff --git a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-01.js b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-01.js index fbd8c381d6..ee12a0788c 100644 --- a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-01.js +++ b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-01.js @@ -6,8 +6,8 @@ * works as advertised. */ -let { AbstractTreeItem } = Cu.import("resource:///modules/devtools/AbstractTreeItem.jsm", {}); -let { Heritage } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +let { AbstractTreeItem } = Cu.import("resource://gre/modules/devtools/AbstractTreeItem.jsm", {}); +let { Heritage } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); function spawnTest () { let container = document.createElement("vbox"); diff --git a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-02.js b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-02.js index f31b208365..84bcf55cef 100644 --- a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-02.js +++ b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-02.js @@ -6,8 +6,8 @@ * has a functional public API. */ -let { AbstractTreeItem } = Cu.import("resource:///modules/devtools/AbstractTreeItem.jsm", {}); -let { Heritage } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +let { AbstractTreeItem } = Cu.import("resource://gre/modules/devtools/AbstractTreeItem.jsm", {}); +let { Heritage } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); function spawnTest () { let container = document.createElement("vbox"); diff --git a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-03.js b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-03.js index 89c5c43110..bef4049fc3 100644 --- a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-03.js +++ b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-03.js @@ -6,8 +6,8 @@ * is keyboard accessible. */ -let { AbstractTreeItem } = Cu.import("resource:///modules/devtools/AbstractTreeItem.jsm", {}); -let { Heritage } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +let { AbstractTreeItem } = Cu.import("resource://gre/modules/devtools/AbstractTreeItem.jsm", {}); +let { Heritage } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); function spawnTest () { let container = document.createElement("vbox"); diff --git a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-04.js b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-04.js index c3f0636c81..b901b967f7 100644 --- a/toolkit/devtools/performance/test/browser_profiler_tree-abstract-04.js +++ b/toolkit/devtools/performance/test/browser_profiler_tree-abstract-04.js @@ -5,8 +5,8 @@ * Tests that the treeview expander arrow doesn't react to dblclick events. */ -let { AbstractTreeItem } = Cu.import("resource:///modules/devtools/AbstractTreeItem.jsm", {}); -let { Heritage } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +let { AbstractTreeItem } = Cu.import("resource://gre/modules/devtools/AbstractTreeItem.jsm", {}); +let { Heritage } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); function spawnTest () { let container = document.createElement("vbox"); diff --git a/toolkit/devtools/performance/test/head.js b/toolkit/devtools/performance/test/head.js index 33242833c0..b0227bb90b 100644 --- a/toolkit/devtools/performance/test/head.js +++ b/toolkit/devtools/performance/test/head.js @@ -9,7 +9,7 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {}); let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); let { merge } = devtools.require("sdk/util/object"); diff --git a/toolkit/devtools/profiler/profiler.js b/toolkit/devtools/profiler/profiler.js index 2e0ffad146..35dc75aa2f 100644 --- a/toolkit/devtools/profiler/profiler.js +++ b/toolkit/devtools/profiler/profiler.js @@ -7,7 +7,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/Loader.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); devtools.lazyRequireGetter(this, "Services"); devtools.lazyRequireGetter(this, "promise"); @@ -36,13 +36,13 @@ devtools.lazyImporter(this, "FileUtils", devtools.lazyImporter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm"); devtools.lazyImporter(this, "LineGraphWidget", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); devtools.lazyImporter(this, "BarGraphWidget", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); devtools.lazyImporter(this, "CanvasGraphUtils", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); devtools.lazyImporter(this, "SideMenuWidget", - "resource:///modules/devtools/SideMenuWidget.jsm"); + "resource://gre/modules/devtools/SideMenuWidget.jsm"); const RECORDING_DATA_DISPLAY_DELAY = 10; // ms const FRAMERATE_CALC_INTERVAL = 16; // ms diff --git a/toolkit/devtools/profiler/test/head.js b/toolkit/devtools/profiler/test/head.js index 5e4dd0b87c..cef394dce0 100644 --- a/toolkit/devtools/profiler/test/head.js +++ b/toolkit/devtools/profiler/test/head.js @@ -14,7 +14,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", false); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {}); diff --git a/toolkit/devtools/profiler/utils/shared.js b/toolkit/devtools/profiler/utils/shared.js index 429efa2e50..e1475e4182 100644 --- a/toolkit/devtools/profiler/utils/shared.js +++ b/toolkit/devtools/profiler/utils/shared.js @@ -17,7 +17,7 @@ loader.lazyRequireGetter(this, "DevToolsUtils", "devtools/toolkit/DevToolsUtils"); loader.lazyImporter(this, "gDevTools", - "resource:///modules/devtools/gDevTools.jsm"); + "resource://gre/modules/devtools/gDevTools.jsm"); /** * A cache of all ProfilerConnection instances. The keys are Toolbox objects. diff --git a/toolkit/devtools/projecteditor/lib/helpers/l10n.js b/toolkit/devtools/projecteditor/lib/helpers/l10n.js index 38809c5ca9..ccf6282705 100644 --- a/toolkit/devtools/projecteditor/lib/helpers/l10n.js +++ b/toolkit/devtools/projecteditor/lib/helpers/l10n.js @@ -9,7 +9,7 @@ */ const { Cu, Cc, Ci } = require("chrome"); -const { ViewHelpers } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +const { ViewHelpers } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); const ITCHPAD_STRINGS_URI = "chrome://global/locale/devtools/projecteditor.properties"; const L10N = new ViewHelpers.L10N(ITCHPAD_STRINGS_URI).stringBundle; diff --git a/toolkit/devtools/projecteditor/lib/projecteditor.js b/toolkit/devtools/projecteditor/lib/projecteditor.js index 7152a7292f..ac93fe2c20 100644 --- a/toolkit/devtools/projecteditor/lib/projecteditor.js +++ b/toolkit/devtools/projecteditor/lib/projecteditor.js @@ -16,8 +16,8 @@ const { on, forget } = require("projecteditor/helpers/event"); const { emit } = require("sdk/event/core"); const { merge } = require("sdk/util/object"); const promise = require("projecteditor/helpers/promise"); -const { ViewHelpers } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); -const { DOMHelpers } = Cu.import("resource:///modules/devtools/DOMHelpers.jsm"); +const { ViewHelpers } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); +const { DOMHelpers } = Cu.import("resource://gre/modules/devtools/DOMHelpers.jsm"); const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const ITCHPAD_URL = "chrome://global/content/devtools/projecteditor.xul"; const { confirm } = require("projecteditor/helpers/prompts"); diff --git a/toolkit/devtools/responsivedesign/responsivedesign.jsm b/toolkit/devtools/responsivedesign/responsivedesign.jsm index 189f7190e0..1b7fcf9f3b 100644 --- a/toolkit/devtools/responsivedesign/responsivedesign.jsm +++ b/toolkit/devtools/responsivedesign/responsivedesign.jsm @@ -9,9 +9,9 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); XPCOMUtils.defineLazyModuleGetter(this, "SystemAppProxy", "resource://gre/modules/SystemAppProxy.jsm"); @@ -143,7 +143,7 @@ function ResponsiveUI(aWindow, aTab) this.mm.addMessageListener("ResponsiveMode:Start:Done", childOn); let requiresFloatingScrollbars = !this.mainWindow.matchMedia("(-moz-overlay-scrollbars)").matches; - this.mm.loadFrameScript("resource:///modules/devtools/responsivedesign-child.js", true); + this.mm.loadFrameScript("resource://gre/modules/devtools/responsivedesign-child.js", true); this.mm.addMessageListener("ResponsiveMode:ChildScriptReady", () => { this.mm.sendAsyncMessage("ResponsiveMode:Start", { requiresFloatingScrollbars: requiresFloatingScrollbars diff --git a/toolkit/devtools/responsivedesign/test/head.js b/toolkit/devtools/responsivedesign/test/head.js index 882ebf2096..aa31da38b0 100644 --- a/toolkit/devtools/responsivedesign/test/head.js +++ b/toolkit/devtools/responsivedesign/test/head.js @@ -5,7 +5,7 @@ const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); -let {devtools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let {devtools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let TargetFactory = devtools.TargetFactory; // Import the GCLI test helper diff --git a/toolkit/devtools/scratchpad/scratchpad.js b/toolkit/devtools/scratchpad/scratchpad.js index 54d8d1f3d7..9bead2da36 100644 --- a/toolkit/devtools/scratchpad/scratchpad.js +++ b/toolkit/devtools/scratchpad/scratchpad.js @@ -51,19 +51,19 @@ const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}) Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/NetUtil.jsm"); -Cu.import("resource:///modules/devtools/scratchpad-manager.jsm"); +Cu.import("resource://gre/modules/devtools/scratchpad-manager.jsm"); Cu.import("resource://gre/modules/jsdebugger.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); Cu.import("resource://gre/modules/osfile.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/reflect.jsm"); Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "VariablesView", - "resource:///modules/devtools/VariablesView.jsm"); + "resource://gre/modules/devtools/VariablesView.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "VariablesViewController", - "resource:///modules/devtools/VariablesViewController.jsm"); + "resource://gre/modules/devtools/VariablesViewController.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "EnvironmentClient", "resource://gre/modules/devtools/dbg-client.jsm"); diff --git a/toolkit/devtools/server/actors/csscoverage.js b/toolkit/devtools/server/actors/csscoverage.js index 08d6cc4476..ea2e19b89f 100644 --- a/toolkit/devtools/server/actors/csscoverage.js +++ b/toolkit/devtools/server/actors/csscoverage.js @@ -14,7 +14,7 @@ const protocol = require("devtools/server/protocol"); const { method, custom, RetVal, Arg } = protocol; loader.lazyGetter(this, "gDevTools", () => { - return require("resource:///modules/devtools/gDevTools.jsm").gDevTools; + return require("resource://gre/modules/devtools/gDevTools.jsm").gDevTools; }); loader.lazyGetter(this, "DOMUtils", () => { return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils) diff --git a/toolkit/devtools/server/actors/gcli.js b/toolkit/devtools/server/actors/gcli.js index f35d8c9885..61921257d1 100644 --- a/toolkit/devtools/server/actors/gcli.js +++ b/toolkit/devtools/server/actors/gcli.js @@ -10,7 +10,7 @@ var XPCOMUtils = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {}).XPCOMUti XPCOMUtils.defineLazyModuleGetter(this, "console", "resource://gre/modules/devtools/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "CommandUtils", - "resource:///modules/devtools/DeveloperToolbar.jsm"); + "resource://gre/modules/devtools/DeveloperToolbar.jsm"); XPCOMUtils.defineLazyGetter(this, "Requisition", function() { return require("gcli/cli").Requisition; diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js index 8673097220..719b187130 100644 --- a/toolkit/devtools/server/actors/inspector.js +++ b/toolkit/devtools/server/actors/inspector.js @@ -117,7 +117,7 @@ HELPER_SHEET += ":-moz-devtools-highlighted { outline: 2px dashed #F06!important Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); loader.lazyGetter(this, "DOMParser", function() { return Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser); diff --git a/toolkit/devtools/server/tests/unit/test_blackboxing-06.js b/toolkit/devtools/server/tests/unit/test_blackboxing-06.js index 795d478e51..962bf8ec95 100644 --- a/toolkit/devtools/server/tests/unit/test_blackboxing-06.js +++ b/toolkit/devtools/server/tests/unit/test_blackboxing-06.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_breakpoint-20.js b/toolkit/devtools/server/tests/unit/test_breakpoint-20.js index 4d34e4ca99..8ab4b6c141 100644 --- a/toolkit/devtools/server/tests/unit/test_breakpoint-20.js +++ b/toolkit/devtools/server/tests/unit/test_breakpoint-20.js @@ -11,7 +11,7 @@ var gClient; var gTraceClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-01.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-01.js index cdf63fb3f0..f656a28143 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-01.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-01.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-02.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-02.js index 144da5d51e..4f60640d32 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-02.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-02.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import("resource:///modules/devtools/SourceMap.jsm"); +Components.utils.import("resource://gre/modules/devtools/SourceMap.jsm"); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-03.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-03.js index 11d680d4c8..b0b37218f0 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-03.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-03.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js index 53b836926f..3e1bb8dcc3 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); // Deep in the complicated labyrinth of code that this test invokes, beneath // debugger callbacks, sandboxes and nested event loops, lies an exception. diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js index 19a1c45719..db47458d90 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); // Deep in the complicated labyrinth of code that this test invokes, beneath // debugger callbacks, sandboxes and nested event loops, lies an exception. diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js index 5b7e9dcd4a..aaf0d86dec 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js @@ -10,7 +10,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import("resource:///modules/devtools/SourceMap.jsm"); +Components.utils.import("resource://gre/modules/devtools/SourceMap.jsm"); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js index ef6d10ff60..ab1d7e5d40 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import("resource:///modules/devtools/SourceMap.jsm"); +Components.utils.import("resource://gre/modules/devtools/SourceMap.jsm"); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js index a56a824762..4495476048 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js @@ -10,7 +10,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import("resource:///modules/devtools/SourceMap.jsm"); +Components.utils.import("resource://gre/modules/devtools/SourceMap.jsm"); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js index e5d13c9c6a..d40f7baece 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-10.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-10.js index a9fbae2838..df4b84470b 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-10.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-10.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { initTestDebuggerServer(); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-11.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-11.js index f6c461932c..ca66ec7e90 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-11.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-11.js @@ -9,7 +9,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { initTestDebuggerServer(); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-12.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-12.js index b8b034b9d0..2b74dedc01 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-12.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-12.js @@ -10,7 +10,7 @@ var gDebuggee; var gClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { initTestDebuggerServer(); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js index 4593dda99b..88b5c626e1 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js @@ -10,7 +10,7 @@ var gClient; var gThreadClient; var gTabClient; -Components.utils.import("resource:///modules/devtools/SourceMap.jsm"); +Components.utils.import("resource://gre/modules/devtools/SourceMap.jsm"); function run_test() { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-14.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-14.js index 46e1e8bf06..5d1011cc3e 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-14.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-14.js @@ -10,7 +10,7 @@ var gClient; var gTraceClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { initTestTracerServer(); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-15.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-15.js index 04fde807dc..1fd3f7d98a 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-15.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-15.js @@ -11,7 +11,7 @@ var gClient; var gTraceClient; var gThreadClient; -Components.utils.import('resource:///modules/devtools/SourceMap.jsm'); +Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm'); function run_test() { diff --git a/toolkit/devtools/shadereditor/shadereditor.js b/toolkit/devtools/shadereditor/shadereditor.js index 957371d65f..f41a170445 100644 --- a/toolkit/devtools/shadereditor/shadereditor.js +++ b/toolkit/devtools/shadereditor/shadereditor.js @@ -8,8 +8,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Task.jsm"); -Cu.import("resource:///modules/devtools/SideMenuWidget.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/SideMenuWidget.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/devtools/Console.jsm"); const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require; diff --git a/toolkit/devtools/shadereditor/test/head.js b/toolkit/devtools/shadereditor/test/head.js index c08cf66363..3f27e0dee9 100644 --- a/toolkit/devtools/shadereditor/test/head.js +++ b/toolkit/devtools/shadereditor/test/head.js @@ -12,7 +12,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", false); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {}); diff --git a/toolkit/devtools/shared/autocomplete-popup.js b/toolkit/devtools/shared/autocomplete-popup.js index b2828ac839..595167cd5e 100644 --- a/toolkit/devtools/shared/autocomplete-popup.js +++ b/toolkit/devtools/shared/autocomplete-popup.js @@ -9,7 +9,7 @@ const {Cc, Ci, Cu} = require("chrome"); const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); /** * Autocomplete popup UI implementation. diff --git a/toolkit/devtools/shared/doorhanger.js b/toolkit/devtools/shared/doorhanger.js index fc172f4362..9ada392f97 100644 --- a/toolkit/devtools/shared/doorhanger.js +++ b/toolkit/devtools/shared/doorhanger.js @@ -6,7 +6,7 @@ const { Ci, Cc } = require("chrome"); const { Services } = require("resource://gre/modules/Services.jsm"); -const { DOMHelpers } = require("resource:///modules/devtools/DOMHelpers.jsm"); +const { DOMHelpers } = require("resource://gre/modules/devtools/DOMHelpers.jsm"); const { Task } = require("resource://gre/modules/Task.jsm"); const { Promise } = require("resource://gre/modules/Promise.jsm"); const { setTimeout } = require("sdk/timers"); diff --git a/toolkit/devtools/shared/profiler/global.js b/toolkit/devtools/shared/profiler/global.js index 89b41a9dbe..569ab2171f 100644 --- a/toolkit/devtools/shared/profiler/global.js +++ b/toolkit/devtools/shared/profiler/global.js @@ -5,7 +5,7 @@ const {Cc, Ci, Cu, Cr} = require("chrome"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); /** * Localization convenience methods. diff --git a/toolkit/devtools/shared/profiler/tree-view.js b/toolkit/devtools/shared/profiler/tree-view.js index 9a05e5deef..ff8c145d48 100644 --- a/toolkit/devtools/shared/profiler/tree-view.js +++ b/toolkit/devtools/shared/profiler/tree-view.js @@ -9,9 +9,9 @@ loader.lazyRequireGetter(this, "L10N", "devtools/shared/profiler/global", true); loader.lazyImporter(this, "Heritage", - "resource:///modules/devtools/ViewHelpers.jsm"); + "resource://gre/modules/devtools/ViewHelpers.jsm"); loader.lazyImporter(this, "AbstractTreeItem", - "resource:///modules/devtools/AbstractTreeItem.jsm"); + "resource://gre/modules/devtools/AbstractTreeItem.jsm"); const MILLISECOND_UNITS = L10N.getStr("table.ms"); const PERCENTAGE_UNITS = L10N.getStr("table.percentage"); diff --git a/toolkit/devtools/shared/test/browser_flame-graph-01.js b/toolkit/devtools/shared/test/browser_flame-graph-01.js index 733841b9e8..0abeb1b83b 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-01.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-01.js @@ -3,7 +3,7 @@ // Tests that flame graph widget works properly. -let {FlameGraph} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraph} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_flame-graph-02.js b/toolkit/devtools/shared/test/browser_flame-graph-02.js index ce01e43548..d29076004f 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-02.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-02.js @@ -3,7 +3,7 @@ // Tests that flame graph widgets may have a fixed width or height. -let {FlameGraph} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraph} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_flame-graph-03a.js b/toolkit/devtools/shared/test/browser_flame-graph-03a.js index 2913f60dd2..e0b07b8e63 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-03a.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-03a.js @@ -8,7 +8,7 @@ let TEST_BOUNDS = { startTime: 0, endTime: 150 }; let TEST_WIDTH = 200; let TEST_HEIGHT = 100; -let {FlameGraph} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraph} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_flame-graph-03b.js b/toolkit/devtools/shared/test/browser_flame-graph-03b.js index 707ed9ec2a..5ab550b4ce 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-03b.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-03b.js @@ -9,7 +9,7 @@ let TEST_WIDTH = 200; let TEST_HEIGHT = 100; let TEST_DPI_DENSITIY = 2; -let {FlameGraph} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraph} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_flame-graph-04.js b/toolkit/devtools/shared/test/browser_flame-graph-04.js index 44cdf4e032..0557542add 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-04.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-04.js @@ -6,8 +6,8 @@ let HTML_NS = "http://www.w3.org/1999/xhtml"; let FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE = 8; // px let FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY = "sans-serif"; -let {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); -let {FlameGraph} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {ViewHelpers} = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); +let {FlameGraph} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); let L10N = new ViewHelpers.L10N(); diff --git a/toolkit/devtools/shared/test/browser_flame-graph-utils-01.js b/toolkit/devtools/shared/test/browser_flame-graph-utils-01.js index e31341d597..3a937ab99e 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-utils-01.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-utils-01.js @@ -4,7 +4,7 @@ // Tests that text metrics and data conversion from profiler samples // widget work properly in the flame graph. -let {FlameGraphUtils} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraphUtils} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); add_task(function*() { yield promiseTab("about:blank"); diff --git a/toolkit/devtools/shared/test/browser_flame-graph-utils-02.js b/toolkit/devtools/shared/test/browser_flame-graph-utils-02.js index 2104b87b07..62abf58eae 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-utils-02.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-utils-02.js @@ -3,7 +3,7 @@ // Tests consecutive duplicate frames are removed from the flame graph data. -let {FlameGraphUtils} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraphUtils} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); add_task(function*() { yield promiseTab("about:blank"); diff --git a/toolkit/devtools/shared/test/browser_flame-graph-utils-03.js b/toolkit/devtools/shared/test/browser_flame-graph-utils-03.js index 562236d112..7061b945a4 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-utils-03.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-utils-03.js @@ -3,7 +3,7 @@ // Tests if platform frames are removed from the flame graph data. -let {FlameGraphUtils} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraphUtils} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {FrameNode} = devtools.require("devtools/shared/profiler/tree-model"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_flame-graph-utils-04.js b/toolkit/devtools/shared/test/browser_flame-graph-utils-04.js index 907f85c4c0..6c32a91360 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-utils-04.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-utils-04.js @@ -3,7 +3,7 @@ // Tests if (idle) nodes are added when necessary in the flame graph data. -let {FlameGraphUtils} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraphUtils} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let {FrameNode} = devtools.require("devtools/shared/profiler/tree-model"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_flame-graph-utils-05.js b/toolkit/devtools/shared/test/browser_flame-graph-utils-05.js index ca65f253aa..6b588ffdd3 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-utils-05.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-utils-05.js @@ -3,7 +3,7 @@ // Tests that flame graph data is cached, and that the cache may be cleared. -let {FlameGraphUtils} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraphUtils} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); add_task(function*() { yield promiseTab("about:blank"); diff --git a/toolkit/devtools/shared/test/browser_flame-graph-utils-hash.js b/toolkit/devtools/shared/test/browser_flame-graph-utils-hash.js index e5509e4828..351b0cd7d2 100644 --- a/toolkit/devtools/shared/test/browser_flame-graph-utils-hash.js +++ b/toolkit/devtools/shared/test/browser_flame-graph-utils-hash.js @@ -3,7 +3,7 @@ // Tests if (idle) nodes are added when necessary in the flame graph data. -let {FlameGraphUtils} = Cu.import("resource:///modules/devtools/FlameGraph.jsm", {}); +let {FlameGraphUtils} = Cu.import("resource://gre/modules/devtools/FlameGraph.jsm", {}); let test = Task.async(function*() { let hash1 = FlameGraphUtils._getStringHash("abc"); diff --git a/toolkit/devtools/shared/test/browser_graphs-01.js b/toolkit/devtools/shared/test/browser_graphs-01.js index 3a4555d1cd..ceddb4c00d 100644 --- a/toolkit/devtools/shared/test/browser_graphs-01.js +++ b/toolkit/devtools/shared/test/browser_graphs-01.js @@ -3,7 +3,7 @@ // Tests that graph widgets works properly. -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-02.js b/toolkit/devtools/shared/test/browser_graphs-02.js index 907cb5701d..2ba09d0d24 100644 --- a/toolkit/devtools/shared/test/browser_graphs-02.js +++ b/toolkit/devtools/shared/test/browser_graphs-02.js @@ -5,7 +5,7 @@ const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-03.js b/toolkit/devtools/shared/test/browser_graphs-03.js index b97acbffc6..4e64f0739d 100644 --- a/toolkit/devtools/shared/test/browser_graphs-03.js +++ b/toolkit/devtools/shared/test/browser_graphs-03.js @@ -4,7 +4,7 @@ // Tests that graph widgets can handle clients getting/setting the // selection or cursor. -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-04.js b/toolkit/devtools/shared/test/browser_graphs-04.js index 2d90b09bfa..b5e1e3d294 100644 --- a/toolkit/devtools/shared/test/browser_graphs-04.js +++ b/toolkit/devtools/shared/test/browser_graphs-04.js @@ -3,7 +3,7 @@ // Tests that graph widgets can correctly compare selections and cursors. -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-05.js b/toolkit/devtools/shared/test/browser_graphs-05.js index 78fdfbf06f..1954be185b 100644 --- a/toolkit/devtools/shared/test/browser_graphs-05.js +++ b/toolkit/devtools/shared/test/browser_graphs-05.js @@ -5,7 +5,7 @@ const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-06.js b/toolkit/devtools/shared/test/browser_graphs-06.js index 781b0ed9cf..ef313c2bff 100644 --- a/toolkit/devtools/shared/test/browser_graphs-06.js +++ b/toolkit/devtools/shared/test/browser_graphs-06.js @@ -5,7 +5,7 @@ const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-07a.js b/toolkit/devtools/shared/test/browser_graphs-07a.js index d0828b2ee5..c8b679a21a 100644 --- a/toolkit/devtools/shared/test/browser_graphs-07a.js +++ b/toolkit/devtools/shared/test/browser_graphs-07a.js @@ -4,7 +4,7 @@ // Tests if selecting, resizing, moving selections and zooming in/out works. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-07b.js b/toolkit/devtools/shared/test/browser_graphs-07b.js index fe24cf64fd..75b6b85de4 100644 --- a/toolkit/devtools/shared/test/browser_graphs-07b.js +++ b/toolkit/devtools/shared/test/browser_graphs-07b.js @@ -4,7 +4,7 @@ // Tests if selections can't be added via clicking, while not allowed. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-08.js b/toolkit/devtools/shared/test/browser_graphs-08.js index 158e12823c..f288311ee7 100644 --- a/toolkit/devtools/shared/test/browser_graphs-08.js +++ b/toolkit/devtools/shared/test/browser_graphs-08.js @@ -4,7 +4,7 @@ // Tests if a selection is dropped when clicking outside of it. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-09a.js b/toolkit/devtools/shared/test/browser_graphs-09a.js index ff59ce9974..323c778ca7 100644 --- a/toolkit/devtools/shared/test/browser_graphs-09a.js +++ b/toolkit/devtools/shared/test/browser_graphs-09a.js @@ -4,7 +4,7 @@ // Tests that line graphs properly create the gutter and tooltips. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-09b.js b/toolkit/devtools/shared/test/browser_graphs-09b.js index 0cae0d4679..df7e25fe59 100644 --- a/toolkit/devtools/shared/test/browser_graphs-09b.js +++ b/toolkit/devtools/shared/test/browser_graphs-09b.js @@ -4,7 +4,7 @@ // Tests that line graphs properly use the tooltips configuration properties. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-09c.js b/toolkit/devtools/shared/test/browser_graphs-09c.js index 97e4dd7e57..ce8f884e40 100644 --- a/toolkit/devtools/shared/test/browser_graphs-09c.js +++ b/toolkit/devtools/shared/test/browser_graphs-09c.js @@ -4,7 +4,7 @@ // Tests that line graphs hide the tooltips when there's no data available. const TEST_DATA = []; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-09d.js b/toolkit/devtools/shared/test/browser_graphs-09d.js index c56163aa6b..03e6885ece 100644 --- a/toolkit/devtools/shared/test/browser_graphs-09d.js +++ b/toolkit/devtools/shared/test/browser_graphs-09d.js @@ -5,7 +5,7 @@ // the 'min' and 'max' tooltip is too small. const TEST_DATA = [{ delta: 100, value: 60 }, { delta: 200, value: 59.9 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-09e.js b/toolkit/devtools/shared/test/browser_graphs-09e.js index 2f75f30996..aca0956800 100644 --- a/toolkit/devtools/shared/test/browser_graphs-09e.js +++ b/toolkit/devtools/shared/test/browser_graphs-09e.js @@ -7,7 +7,7 @@ const NO_DATA = []; const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-09f.js b/toolkit/devtools/shared/test/browser_graphs-09f.js index 7b43a4c412..3ef7666650 100644 --- a/toolkit/devtools/shared/test/browser_graphs-09f.js +++ b/toolkit/devtools/shared/test/browser_graphs-09f.js @@ -5,7 +5,7 @@ // gutter/tooltips and lines. const TEST_DATA = [{ delta: 100, value: 60 }, { delta: 200, value: 1 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-10a.js b/toolkit/devtools/shared/test/browser_graphs-10a.js index c5f2f8d948..b1a07330db 100644 --- a/toolkit/devtools/shared/test/browser_graphs-10a.js +++ b/toolkit/devtools/shared/test/browser_graphs-10a.js @@ -4,7 +4,7 @@ // Tests that graphs properly handle resizing. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-10b.js b/toolkit/devtools/shared/test/browser_graphs-10b.js index ddb0f5a0f1..3ae10012ca 100644 --- a/toolkit/devtools/shared/test/browser_graphs-10b.js +++ b/toolkit/devtools/shared/test/browser_graphs-10b.js @@ -5,7 +5,7 @@ // the graph dimensions stay the same. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-11a.js b/toolkit/devtools/shared/test/browser_graphs-11a.js index 51f8b5a023..881670fd19 100644 --- a/toolkit/devtools/shared/test/browser_graphs-11a.js +++ b/toolkit/devtools/shared/test/browser_graphs-11a.js @@ -3,7 +3,7 @@ // Tests that bar graph create a legend as expected. -let {BarGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {BarGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); const CATEGORIES = [ diff --git a/toolkit/devtools/shared/test/browser_graphs-11b.js b/toolkit/devtools/shared/test/browser_graphs-11b.js index bf283e2d3c..69147b95fa 100644 --- a/toolkit/devtools/shared/test/browser_graphs-11b.js +++ b/toolkit/devtools/shared/test/browser_graphs-11b.js @@ -3,7 +3,7 @@ // Tests that bar graph's legend items handle mouseover/mouseout. -let {BarGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {BarGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); const CATEGORIES = [ diff --git a/toolkit/devtools/shared/test/browser_graphs-12.js b/toolkit/devtools/shared/test/browser_graphs-12.js index 1517f3efb2..a6e6fec42a 100644 --- a/toolkit/devtools/shared/test/browser_graphs-12.js +++ b/toolkit/devtools/shared/test/browser_graphs-12.js @@ -3,7 +3,7 @@ // Tests that canvas graphs can have their selection linked. -let {LineGraphWidget, BarGraphWidget, CanvasGraphUtils} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget, BarGraphWidget, CanvasGraphUtils} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-13.js b/toolkit/devtools/shared/test/browser_graphs-13.js index f0f09203c7..ae50d51cf3 100644 --- a/toolkit/devtools/shared/test/browser_graphs-13.js +++ b/toolkit/devtools/shared/test/browser_graphs-13.js @@ -3,7 +3,7 @@ // Tests that graph widgets may have a fixed width or height. -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_graphs-14.js b/toolkit/devtools/shared/test/browser_graphs-14.js index ce7b96a5d7..6ff5f692ae 100644 --- a/toolkit/devtools/shared/test/browser_graphs-14.js +++ b/toolkit/devtools/shared/test/browser_graphs-14.js @@ -4,7 +4,7 @@ // Tests that graph widgets correctly emit mouse input events. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; -let {LineGraphWidget} = Cu.import("resource:///modules/devtools/Graphs.jsm", {}); +let {LineGraphWidget} = Cu.import("resource://gre/modules/devtools/Graphs.jsm", {}); let {Promise} = devtools.require("resource://gre/modules/Promise.jsm"); add_task(function*() { diff --git a/toolkit/devtools/shared/test/browser_num-l10n.js b/toolkit/devtools/shared/test/browser_num-l10n.js index a7a70abaaa..5152c6d767 100644 --- a/toolkit/devtools/shared/test/browser_num-l10n.js +++ b/toolkit/devtools/shared/test/browser_num-l10n.js @@ -3,7 +3,7 @@ // Tests that ViewHelpers.Prefs work properly. -let {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +let {ViewHelpers} = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); function test() { let l10n = new ViewHelpers.L10N(); diff --git a/toolkit/devtools/shared/test/browser_prefs.js b/toolkit/devtools/shared/test/browser_prefs.js index 3d6b99c0ae..878fe0ee5d 100644 --- a/toolkit/devtools/shared/test/browser_prefs.js +++ b/toolkit/devtools/shared/test/browser_prefs.js @@ -3,7 +3,7 @@ // Tests that ViewHelpers.Prefs work properly. -let {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +let {ViewHelpers} = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); function test() { let Prefs = new ViewHelpers.Prefs("devtools.debugger", { diff --git a/toolkit/devtools/shared/test/browser_toolbar_webconsole_errors_count.js b/toolkit/devtools/shared/test/browser_toolbar_webconsole_errors_count.js index 8d6ed78bbf..6bf757cd85 100644 --- a/toolkit/devtools/shared/test/browser_toolbar_webconsole_errors_count.js +++ b/toolkit/devtools/shared/test/browser_toolbar_webconsole_errors_count.js @@ -6,7 +6,7 @@ function test() { const TEST_URI = TEST_URI_ROOT + "browser_toolbar_webconsole_errors_count.html"; - let gDevTools = Cu.import("resource:///modules/devtools/gDevTools.jsm", + let gDevTools = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}).gDevTools; let webconsole = document.getElementById("developer-toolbar-toolbox-button"); diff --git a/toolkit/devtools/shared/test/head.js b/toolkit/devtools/shared/test/head.js index 121f75f690..4d643138c4 100644 --- a/toolkit/devtools/shared/test/head.js +++ b/toolkit/devtools/shared/test/head.js @@ -5,8 +5,8 @@ let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let {TargetFactory, require} = devtools; let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {}); -let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); -const {DOMHelpers} = Cu.import("resource:///modules/devtools/DOMHelpers.jsm", {}); +let {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); +const {DOMHelpers} = Cu.import("resource://gre/modules/devtools/DOMHelpers.jsm", {}); const {Hosts} = require("devtools/framework/toolbox-hosts"); gDevTools.testing = true; diff --git a/toolkit/devtools/shared/test/unit/test_VariablesView_getString_promise.js b/toolkit/devtools/shared/test/unit/test_VariablesView_getString_promise.js index 3c42e3ffba..4a0e4ad3cb 100644 --- a/toolkit/devtools/shared/test/unit/test_VariablesView_getString_promise.js +++ b/toolkit/devtools/shared/test/unit/test_VariablesView_getString_promise.js @@ -5,7 +5,7 @@ const Cu = Components.utils; const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); -const { VariablesView } = Cu.import("resource:///modules/devtools/VariablesView.jsm", {}); +const { VariablesView } = Cu.import("resource://gre/modules/devtools/VariablesView.jsm", {}); const PENDING = { "type": "object", diff --git a/toolkit/devtools/shared/theme-switching.js b/toolkit/devtools/shared/theme-switching.js index 5eba60c092..664312a706 100644 --- a/toolkit/devtools/shared/theme-switching.js +++ b/toolkit/devtools/shared/theme-switching.js @@ -103,7 +103,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components; Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource:///modules/devtools/gDevTools.jsm"); + Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {devtools} = Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {}); const StylesheetUtils = devtools.require("sdk/stylesheet/utils"); diff --git a/toolkit/devtools/shared/theme.js b/toolkit/devtools/shared/theme.js index e839592b6b..9e0361521e 100644 --- a/toolkit/devtools/shared/theme.js +++ b/toolkit/devtools/shared/theme.js @@ -12,7 +12,7 @@ const { Cu } = require("chrome"); const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {}); loader.lazyRequireGetter(this, "Services"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); const themeURIs = { light: "chrome://global/skin/devtools/light-theme.css", diff --git a/toolkit/devtools/shared/timeline/global.js b/toolkit/devtools/shared/timeline/global.js index 97b2562479..fdd8c8e6f1 100644 --- a/toolkit/devtools/shared/timeline/global.js +++ b/toolkit/devtools/shared/timeline/global.js @@ -5,7 +5,7 @@ const {Cc, Ci, Cu, Cr} = require("chrome"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); /** * Localization convenience methods. diff --git a/toolkit/devtools/shared/timeline/markers-overview.js b/toolkit/devtools/shared/timeline/markers-overview.js index 5ad805eaa7..58b67a51ba 100644 --- a/toolkit/devtools/shared/timeline/markers-overview.js +++ b/toolkit/devtools/shared/timeline/markers-overview.js @@ -11,8 +11,8 @@ const {Cc, Ci, Cu, Cr} = require("chrome"); -Cu.import("resource:///modules/devtools/Graphs.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/Graphs.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const { colorUtils: { setAlpha }} = require("devtools/css-color"); const { getColor } = require("devtools/shared/theme"); diff --git a/toolkit/devtools/shared/timeline/memory-overview.js b/toolkit/devtools/shared/timeline/memory-overview.js index 7e097c44cf..50db29f051 100644 --- a/toolkit/devtools/shared/timeline/memory-overview.js +++ b/toolkit/devtools/shared/timeline/memory-overview.js @@ -10,8 +10,8 @@ const {Cc, Ci, Cu, Cr} = require("chrome"); -Cu.import("resource:///modules/devtools/Graphs.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/Graphs.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const { colorUtils: { setAlpha }} = require("devtools/css-color"); const { getColor } = require("devtools/shared/theme"); diff --git a/toolkit/devtools/shared/timeline/waterfall.js b/toolkit/devtools/shared/timeline/waterfall.js index 8093d30885..2c0f1d0a3b 100644 --- a/toolkit/devtools/shared/timeline/waterfall.js +++ b/toolkit/devtools/shared/timeline/waterfall.js @@ -14,9 +14,9 @@ loader.lazyRequireGetter(this, "L10N", "devtools/shared/timeline/global", true); loader.lazyImporter(this, "setNamedTimeout", - "resource:///modules/devtools/ViewHelpers.jsm"); + "resource://gre/modules/devtools/ViewHelpers.jsm"); loader.lazyImporter(this, "clearNamedTimeout", - "resource:///modules/devtools/ViewHelpers.jsm"); + "resource://gre/modules/devtools/ViewHelpers.jsm"); loader.lazyRequireGetter(this, "EventEmitter", "devtools/toolkit/event-emitter"); diff --git a/toolkit/devtools/shared/widgets/AbstractTreeItem.jsm b/toolkit/devtools/shared/widgets/AbstractTreeItem.jsm index 308ef30361..0add0c9777 100644 --- a/toolkit/devtools/shared/widgets/AbstractTreeItem.jsm +++ b/toolkit/devtools/shared/widgets/AbstractTreeItem.jsm @@ -8,7 +8,7 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); XPCOMUtils.defineLazyModuleGetter(this, "console", "resource://gre/modules/devtools/Console.jsm"); diff --git a/toolkit/devtools/shared/widgets/BreadcrumbsWidget.jsm b/toolkit/devtools/shared/widgets/BreadcrumbsWidget.jsm index 0e6920e3b1..fdad43a5f6 100644 --- a/toolkit/devtools/shared/widgets/BreadcrumbsWidget.jsm +++ b/toolkit/devtools/shared/widgets/BreadcrumbsWidget.jsm @@ -10,7 +10,7 @@ const Cu = Components.utils; const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); this.EXPORTED_SYMBOLS = ["BreadcrumbsWidget"]; diff --git a/toolkit/devtools/shared/widgets/Chart.jsm b/toolkit/devtools/shared/widgets/Chart.jsm index 3c6bd5b54a..582df8162c 100644 --- a/toolkit/devtools/shared/widgets/Chart.jsm +++ b/toolkit/devtools/shared/widgets/Chart.jsm @@ -19,7 +19,7 @@ const HOVERED_SLICE_TRANSLATE_DISTANCE_RATIO = 20; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); this.EXPORTED_SYMBOLS = ["Chart"]; diff --git a/toolkit/devtools/shared/widgets/FastListWidget.js b/toolkit/devtools/shared/widgets/FastListWidget.js index ffdb23025a..550f51efe6 100644 --- a/toolkit/devtools/shared/widgets/FastListWidget.js +++ b/toolkit/devtools/shared/widgets/FastListWidget.js @@ -7,7 +7,7 @@ const EventEmitter = require("devtools/toolkit/event-emitter"); const { Cu, Ci } = require("chrome"); -const { ViewHelpers } = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); +const { ViewHelpers } = Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm", {}); /** * A list menu widget that attempts to be very fast. diff --git a/toolkit/devtools/shared/widgets/FlameGraph.jsm b/toolkit/devtools/shared/widgets/FlameGraph.jsm index 386636b186..32edcd1cd9 100644 --- a/toolkit/devtools/shared/widgets/FlameGraph.jsm +++ b/toolkit/devtools/shared/widgets/FlameGraph.jsm @@ -5,8 +5,8 @@ const Cu = Components.utils; -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); -Cu.import("resource:///modules/devtools/Graphs.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/Graphs.jsm"); const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise; const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {}); diff --git a/toolkit/devtools/shared/widgets/Graphs.jsm b/toolkit/devtools/shared/widgets/Graphs.jsm index 0777251d5d..b908fe5e16 100644 --- a/toolkit/devtools/shared/widgets/Graphs.jsm +++ b/toolkit/devtools/shared/widgets/Graphs.jsm @@ -5,7 +5,7 @@ const Cu = Components.utils; -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise; const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {}); @@ -23,7 +23,7 @@ this.EXPORTED_SYMBOLS = [ const HTML_NS = "http://www.w3.org/1999/xhtml"; const GRAPH_SRC = "chrome://global/content/devtools/graphs-frame.xhtml"; -const WORKER_URL = "resource:///modules/devtools/GraphsWorker.js"; +const WORKER_URL = "resource://gre/modules/devtools/GraphsWorker.js"; const L10N = new ViewHelpers.L10N(); // Generic constants. diff --git a/toolkit/devtools/shared/widgets/SideMenuWidget.jsm b/toolkit/devtools/shared/widgets/SideMenuWidget.jsm index 9f79e6c893..5a1116b09e 100644 --- a/toolkit/devtools/shared/widgets/SideMenuWidget.jsm +++ b/toolkit/devtools/shared/widgets/SideMenuWidget.jsm @@ -8,7 +8,7 @@ const Ci = Components.interfaces; const Cu = Components.utils; -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); this.EXPORTED_SYMBOLS = ["SideMenuWidget"]; diff --git a/toolkit/devtools/shared/widgets/SimpleListWidget.jsm b/toolkit/devtools/shared/widgets/SimpleListWidget.jsm index 92c8a40b65..9b3df27f2c 100644 --- a/toolkit/devtools/shared/widgets/SimpleListWidget.jsm +++ b/toolkit/devtools/shared/widgets/SimpleListWidget.jsm @@ -8,7 +8,7 @@ const Ci = Components.interfaces; const Cu = Components.utils; -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); this.EXPORTED_SYMBOLS = ["SimpleListWidget"]; diff --git a/toolkit/devtools/shared/widgets/Tooltip.js b/toolkit/devtools/shared/widgets/Tooltip.js index 4b5f4fecce..335abbdc87 100644 --- a/toolkit/devtools/shared/widgets/Tooltip.js +++ b/toolkit/devtools/shared/widgets/Tooltip.js @@ -23,13 +23,13 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "setNamedTimeout", - "resource:///modules/devtools/ViewHelpers.jsm"); + "resource://gre/modules/devtools/ViewHelpers.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "clearNamedTimeout", - "resource:///modules/devtools/ViewHelpers.jsm"); + "resource://gre/modules/devtools/ViewHelpers.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "VariablesView", - "resource:///modules/devtools/VariablesView.jsm"); + "resource://gre/modules/devtools/VariablesView.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "VariablesViewController", - "resource:///modules/devtools/VariablesViewController.jsm"); + "resource://gre/modules/devtools/VariablesViewController.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); diff --git a/toolkit/devtools/shared/widgets/VariablesView.jsm b/toolkit/devtools/shared/widgets/VariablesView.jsm index 282ce4fc41..5f8f244f57 100644 --- a/toolkit/devtools/shared/widgets/VariablesView.jsm +++ b/toolkit/devtools/shared/widgets/VariablesView.jsm @@ -20,7 +20,7 @@ const ITEM_FLASH_DURATION = 300 // ms Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm"); Cu.import("resource://gre/modules/Task.jsm"); diff --git a/toolkit/devtools/shared/widgets/VariablesViewController.jsm b/toolkit/devtools/shared/widgets/VariablesViewController.jsm index 91b4373036..d7de598fb6 100644 --- a/toolkit/devtools/shared/widgets/VariablesViewController.jsm +++ b/toolkit/devtools/shared/widgets/VariablesViewController.jsm @@ -10,8 +10,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); -Cu.import("resource:///modules/devtools/VariablesView.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesView.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "devtools", "resource://gre/modules/devtools/Loader.jsm"); diff --git a/toolkit/devtools/sourcemap/tests/unit/test_api.js b/toolkit/devtools/sourcemap/tests/unit/test_api.js index 7622e728ce..7c8ff0a2e4 100644 --- a/toolkit/devtools/sourcemap/tests/unit/test_api.js +++ b/toolkit/devtools/sourcemap/tests/unit/test_api.js @@ -19,7 +19,7 @@ define("test/source-map/test-api", ["require", "exports", "module"], function (r sourceMap = require('source-map'); } catch (e) { sourceMap = {}; - Components.utils.import('resource:///modules/devtools/SourceMap.jsm', sourceMap); + Components.utils.import('resource://gre/modules/devtools/SourceMap.jsm', sourceMap); } exports['test that the api is properly exposed in the top level'] = function (assert, util) { diff --git a/toolkit/devtools/storage/ui.js b/toolkit/devtools/storage/ui.js index 7f60acf704..7f50ff07f2 100644 --- a/toolkit/devtools/storage/ui.js +++ b/toolkit/devtools/storage/ui.js @@ -17,9 +17,9 @@ XPCOMUtils.defineLazyGetter(this, "TableWidget", XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter", "resource://gre/modules/devtools/event-emitter.js"); XPCOMUtils.defineLazyModuleGetter(this, "ViewHelpers", - "resource:///modules/devtools/ViewHelpers.jsm"); + "resource://gre/modules/devtools/ViewHelpers.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "VariablesView", - "resource:///modules/devtools/VariablesView.jsm"); + "resource://gre/modules/devtools/VariablesView.jsm"); let Telemetry = require("devtools/shared/telemetry"); diff --git a/toolkit/devtools/styleeditor/StyleEditorUI.jsm b/toolkit/devtools/styleeditor/StyleEditorUI.jsm index e9832d3d26..f256263731 100644 --- a/toolkit/devtools/styleeditor/StyleEditorUI.jsm +++ b/toolkit/devtools/styleeditor/StyleEditorUI.jsm @@ -17,10 +17,10 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); Cu.import("resource://gre/modules/osfile.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); -Cu.import("resource:///modules/devtools/StyleEditorUtil.jsm"); -Cu.import("resource:///modules/devtools/SplitView.jsm"); -Cu.import("resource:///modules/devtools/StyleSheetEditor.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/StyleEditorUtil.jsm"); +Cu.import("resource://gre/modules/devtools/SplitView.jsm"); +Cu.import("resource://gre/modules/devtools/StyleSheetEditor.jsm"); const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", diff --git a/toolkit/devtools/styleeditor/StyleSheetEditor.jsm b/toolkit/devtools/styleeditor/StyleSheetEditor.jsm index 141ea7c606..15a21a69ad 100644 --- a/toolkit/devtools/styleeditor/StyleSheetEditor.jsm +++ b/toolkit/devtools/styleeditor/StyleSheetEditor.jsm @@ -22,7 +22,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); Cu.import("resource://gre/modules/osfile.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/event-emitter.js"); -Cu.import("resource:///modules/devtools/StyleEditorUtil.jsm"); +Cu.import("resource://gre/modules/devtools/StyleEditorUtil.jsm"); const LOAD_ERROR = "error-load"; const SAVE_ERROR = "error-save"; diff --git a/toolkit/devtools/styleeditor/styleeditor-commands.js b/toolkit/devtools/styleeditor/styleeditor-commands.js index dd2c75bc44..dd151627f2 100644 --- a/toolkit/devtools/styleeditor/styleeditor-commands.js +++ b/toolkit/devtools/styleeditor/styleeditor-commands.js @@ -32,7 +32,7 @@ exports.items = [{ ], exec: function(args, context) { let target = context.environment.target; - let gDevTools = require("resource:///modules/devtools/gDevTools.jsm").gDevTools; + let gDevTools = require("resource://gre/modules/devtools/gDevTools.jsm").gDevTools; return gDevTools.showToolbox(target, "styleeditor").then(function(toolbox) { let styleEditor = toolbox.getCurrentPanel(); styleEditor.selectStyleSheet(args.resource.element, args.line); diff --git a/toolkit/devtools/styleeditor/styleeditor-panel.js b/toolkit/devtools/styleeditor/styleeditor-panel.js index 9de08e5ee7..89b8d1ca9c 100644 --- a/toolkit/devtools/styleeditor/styleeditor-panel.js +++ b/toolkit/devtools/styleeditor/styleeditor-panel.js @@ -12,8 +12,8 @@ Cu.import("resource://gre/modules/Services.jsm"); let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); let EventEmitter = require("devtools/toolkit/event-emitter"); -Cu.import("resource:///modules/devtools/StyleEditorUI.jsm"); -Cu.import("resource:///modules/devtools/StyleEditorUtil.jsm"); +Cu.import("resource://gre/modules/devtools/StyleEditorUI.jsm"); +Cu.import("resource://gre/modules/devtools/StyleEditorUtil.jsm"); loader.lazyGetter(this, "StyleSheetsFront", () => require("devtools/server/actors/stylesheets").StyleSheetsFront); diff --git a/toolkit/devtools/styleinspector/computed-view.js b/toolkit/devtools/styleinspector/computed-view.js index 5e1cd3ffbe..b5f7bdce8a 100644 --- a/toolkit/devtools/styleinspector/computed-view.js +++ b/toolkit/devtools/styleinspector/computed-view.js @@ -13,7 +13,7 @@ const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); const {EventEmitter} = require("devtools/toolkit/event-emitter"); const {OutputParser} = require("devtools/output-parser"); const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils"); -const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +const {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); const overlays = require("devtools/styleinspector/style-inspector-overlays"); Cu.import("resource://gre/modules/Services.jsm"); diff --git a/toolkit/devtools/styleinspector/rule-view.js b/toolkit/devtools/styleinspector/rule-view.js index 87e7475571..618eaf3698 100644 --- a/toolkit/devtools/styleinspector/rule-view.js +++ b/toolkit/devtools/styleinspector/rule-view.js @@ -11,7 +11,7 @@ const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); const {CssLogic} = require("devtools/styleinspector/css-logic"); const {InplaceEditor, editableField, editableItem} = require("devtools/shared/inplace-editor"); const {ELEMENT_STYLE, PSEUDO_ELEMENTS} = require("devtools/server/actors/styles"); -const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +const {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); const {OutputParser} = require("devtools/output-parser"); const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils"); const {parseSingleValue, parseDeclarations} = require("devtools/styleinspector/css-parsing-utils"); diff --git a/toolkit/devtools/styleinspector/style-inspector.js b/toolkit/devtools/styleinspector/style-inspector.js index 1a63111e2b..f5806ffca0 100644 --- a/toolkit/devtools/styleinspector/style-inspector.js +++ b/toolkit/devtools/styleinspector/style-inspector.js @@ -10,7 +10,7 @@ const {Tools} = require("main"); Cu.import("resource://gre/modules/Services.jsm"); const {PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils"); -loader.lazyGetter(this, "gDevTools", () => Cu.import("resource:///modules/devtools/gDevTools.jsm", {}).gDevTools); +loader.lazyGetter(this, "gDevTools", () => Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}).gDevTools); loader.lazyGetter(this, "RuleView", () => require("devtools/styleinspector/rule-view")); loader.lazyGetter(this, "ComputedView", () => require("devtools/styleinspector/computed-view")); loader.lazyGetter(this, "_strings", () => Services.strings diff --git a/toolkit/devtools/styleinspector/test/head.js b/toolkit/devtools/styleinspector/test/head.js index c030cf5770..4fc9f85931 100644 --- a/toolkit/devtools/styleinspector/test/head.js +++ b/toolkit/devtools/styleinspector/test/head.js @@ -5,7 +5,7 @@ "use strict"; const Cu = Components.utils; -let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let {gDevTools} = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let TargetFactory = devtools.TargetFactory; let {CssHtmlTree} = devtools.require("devtools/styleinspector/computed-view"); diff --git a/toolkit/devtools/tilt/tilt-visualizer.js b/toolkit/devtools/tilt/tilt-visualizer.js index 94c27a40ab..bd74c6e742 100644 --- a/toolkit/devtools/tilt/tilt-visualizer.js +++ b/toolkit/devtools/tilt/tilt-visualizer.js @@ -14,7 +14,7 @@ let {EPSILON, TiltMath, vec3, mat4, quat4} = require("devtools/tilt/tilt-math"); let {TargetFactory} = require("devtools/framework/target"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const ELEMENT_MIN_SIZE = 4; const INVISIBLE_ELEMENTS = { @@ -54,8 +54,8 @@ const ARCBALL_ZOOM_MAX = 500; const ARCBALL_RESET_SPHERICAL_FACTOR = 0.1; const ARCBALL_RESET_LINEAR_FACTOR = 0.01; -const TILT_CRAFTER = "resource:///modules/devtools/tilt/TiltWorkerCrafter.js"; -const TILT_PICKER = "resource:///modules/devtools/tilt/TiltWorkerPicker.js"; +const TILT_CRAFTER = "resource://gre/modules/devtools/tilt/TiltWorkerCrafter.js"; +const TILT_PICKER = "resource://gre/modules/devtools/tilt/TiltWorkerPicker.js"; /** diff --git a/toolkit/devtools/timeline/test/head.js b/toolkit/devtools/timeline/test/head.js index 74b185aa36..ce43e49681 100644 --- a/toolkit/devtools/timeline/test/head.js +++ b/toolkit/devtools/timeline/test/head.js @@ -18,7 +18,7 @@ Services.prefs.setBoolPref("devtools.timeline.enabled", true); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let TargetFactory = devtools.TargetFactory; diff --git a/toolkit/devtools/timeline/timeline.js b/toolkit/devtools/timeline/timeline.js index f70a6b3cbc..cd34513db9 100644 --- a/toolkit/devtools/timeline/timeline.js +++ b/toolkit/devtools/timeline/timeline.js @@ -8,8 +8,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/devtools/Loader.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); devtools.lazyRequireGetter(this, "promise"); devtools.lazyRequireGetter(this, "EventEmitter", @@ -27,7 +27,7 @@ devtools.lazyRequireGetter(this, "TIMELINE_BLUEPRINT", "devtools/shared/timeline/global", true); devtools.lazyImporter(this, "CanvasGraphUtils", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); devtools.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); diff --git a/toolkit/devtools/webaudioeditor/includes.js b/toolkit/devtools/webaudioeditor/includes.js index d4f51d5e19..a5518464b4 100644 --- a/toolkit/devtools/webaudioeditor/includes.js +++ b/toolkit/devtools/webaudioeditor/includes.js @@ -7,8 +7,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource:///modules/devtools/ViewHelpers.jsm"); -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/ViewHelpers.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools; const { require } = devtools; @@ -24,7 +24,7 @@ const L10N = new ViewHelpers.L10N(STRINGS_URI); const Telemetry = require("devtools/shared/telemetry"); const telemetry = new Telemetry(); devtools.lazyImporter(this, "LineGraphWidget", - "resource:///modules/devtools/Graphs.jsm"); + "resource://gre/modules/devtools/Graphs.jsm"); // `AUDIO_NODE_DEFINITION` defined in the controller's initialization, // which describes all the properties of an AudioNode diff --git a/toolkit/devtools/webaudioeditor/test/head.js b/toolkit/devtools/webaudioeditor/test/head.js index bdfe593033..ca96753581 100644 --- a/toolkit/devtools/webaudioeditor/test/head.js +++ b/toolkit/devtools/webaudioeditor/test/head.js @@ -13,7 +13,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", false); let { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); let { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); -let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {}); +let { gDevTools } = Cu.import("resource://gre/modules/devtools/gDevTools.jsm", {}); let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); let { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator); diff --git a/toolkit/devtools/webaudioeditor/views/properties.js b/toolkit/devtools/webaudioeditor/views/properties.js index 29ea0a410a..fd132a4c0a 100644 --- a/toolkit/devtools/webaudioeditor/views/properties.js +++ b/toolkit/devtools/webaudioeditor/views/properties.js @@ -3,8 +3,8 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -Cu.import("resource:///modules/devtools/VariablesView.jsm"); -Cu.import("resource:///modules/devtools/VariablesViewController.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesView.jsm"); +Cu.import("resource://gre/modules/devtools/VariablesViewController.jsm"); const GENERIC_VARIABLES_VIEW_SETTINGS = { searchEnabled: false, diff --git a/toolkit/devtools/webconsole/console-commands.js b/toolkit/devtools/webconsole/console-commands.js index 471362c08b..dd9516d666 100644 --- a/toolkit/devtools/webconsole/console-commands.js +++ b/toolkit/devtools/webconsole/console-commands.js @@ -5,7 +5,7 @@ "use strict"; const gcli = require("gcli/index"); -const { gDevTools } = require("resource:///modules/devtools/gDevTools.jsm"); +const { gDevTools } = require("resource://gre/modules/devtools/gDevTools.jsm"); exports.items = [ { diff --git a/toolkit/devtools/webconsole/console-output.js b/toolkit/devtools/webconsole/console-output.js index b8450fb44a..6991aa8a65 100644 --- a/toolkit/devtools/webconsole/console-output.js +++ b/toolkit/devtools/webconsole/console-output.js @@ -7,9 +7,9 @@ const {Cc, Ci, Cu} = require("chrome"); -loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm"); -loader.lazyImporter(this, "escapeHTML", "resource:///modules/devtools/VariablesView.jsm"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "VariablesView", "resource://gre/modules/devtools/VariablesView.jsm"); +loader.lazyImporter(this, "escapeHTML", "resource://gre/modules/devtools/VariablesView.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); loader.lazyImporter(this, "Task", "resource://gre/modules/Task.jsm"); loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); loader.lazyImporter(this, "ObjectClient", "resource://gre/modules/devtools/dbg-client.jsm"); diff --git a/toolkit/devtools/webconsole/hudservice.js b/toolkit/devtools/webconsole/hudservice.js index 2f0129a741..1cee3ea7e0 100644 --- a/toolkit/devtools/webconsole/hudservice.js +++ b/toolkit/devtools/webconsole/hudservice.js @@ -14,7 +14,7 @@ let Heritage = require("sdk/core/heritage"); loader.lazyGetter(this, "Telemetry", () => require("devtools/shared/telemetry")); loader.lazyGetter(this, "WebConsoleFrame", () => require("devtools/webconsole/webconsole").WebConsoleFrame); loader.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); loader.lazyImporter(this, "devtools", "resource://gre/modules/devtools/Loader.jsm"); loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm"); loader.lazyImporter(this, "DebuggerServer", "resource://gre/modules/devtools/dbg-server.jsm"); diff --git a/toolkit/devtools/webconsole/panel.js b/toolkit/devtools/webconsole/panel.js index f5c0e0cfd5..9dbcd96df3 100644 --- a/toolkit/devtools/webconsole/panel.js +++ b/toolkit/devtools/webconsole/panel.js @@ -10,7 +10,7 @@ loader.lazyImporter(this, "devtools", "resource://gre/modules/devtools/Loader.js loader.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise"); loader.lazyGetter(this, "HUDService", () => require("devtools/webconsole/hudservice")); loader.lazyGetter(this, "EventEmitter", () => require("devtools/toolkit/event-emitter")); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); /** * A DevToolPanel that controls the Web Console. diff --git a/toolkit/devtools/webconsole/utils.js b/toolkit/devtools/webconsole/utils.js index 4284d95baf..60ddfbaa94 100644 --- a/toolkit/devtools/webconsole/utils.js +++ b/toolkit/devtools/webconsole/utils.js @@ -15,9 +15,9 @@ loader.lazyImporter(this, "LayoutHelpers", "resource://gre/modules/devtools/Layo // TODO: Bug 842672 - toolkit/ imports modules from browser/. // Note that these are only used in JSTermHelpers, see $0 and pprint(). -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); loader.lazyImporter(this, "devtools", "resource://gre/modules/devtools/Loader.jsm"); -loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm"); +loader.lazyImporter(this, "VariablesView", "resource://gre/modules/devtools/VariablesView.jsm"); loader.lazyImporter(this, "DevToolsUtils", "resource://gre/modules/devtools/DevToolsUtils.jsm"); // Match the function name from the result of toString() or toSource(). diff --git a/toolkit/devtools/webconsole/webconsole.js b/toolkit/devtools/webconsole/webconsole.js index ad3e9983a6..576cb3752d 100644 --- a/toolkit/devtools/webconsole/webconsole.js +++ b/toolkit/devtools/webconsole/webconsole.js @@ -28,10 +28,10 @@ loader.lazyGetter(this, "Messages", () => require("devtools/webconsole/console-output").Messages); loader.lazyImporter(this, "EnvironmentClient", "resource://gre/modules/devtools/dbg-client.jsm"); loader.lazyImporter(this, "ObjectClient", "resource://gre/modules/devtools/dbg-client.jsm"); -loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm"); -loader.lazyImporter(this, "VariablesViewController", "resource:///modules/devtools/VariablesViewController.jsm"); +loader.lazyImporter(this, "VariablesView", "resource://gre/modules/devtools/VariablesView.jsm"); +loader.lazyImporter(this, "VariablesViewController", "resource://gre/modules/devtools/VariablesViewController.jsm"); loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); -loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm"); +loader.lazyImporter(this, "gDevTools", "resource://gre/modules/devtools/gDevTools.jsm"); const STRINGS_URI = "chrome://global/locale/devtools/webconsole.properties"; let l10n = new WebConsoleUtils.l10n(STRINGS_URI); diff --git a/toolkit/devtools/webide/content/details.js b/toolkit/devtools/webide/content/details.js index 79739b6772..6b792fd10c 100644 --- a/toolkit/devtools/webide/content/details.js +++ b/toolkit/devtools/webide/content/details.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const Cu = Components.utils; -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {Services} = Cu.import("resource://gre/modules/Services.jsm"); const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools; const {AppProjects} = require("devtools/app-manager/app-projects"); diff --git a/toolkit/devtools/webide/content/logs.js b/toolkit/devtools/webide/content/logs.js index 76b403b177..6f9ef98717 100644 --- a/toolkit/devtools/webide/content/logs.js +++ b/toolkit/devtools/webide/content/logs.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const Cu = Components.utils; -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools; const {AppManager} = require("devtools/webide/app-manager"); diff --git a/toolkit/devtools/webide/content/monitor.js b/toolkit/devtools/webide/content/monitor.js index 08dd4cb92e..6268dfc241 100644 --- a/toolkit/devtools/webide/content/monitor.js +++ b/toolkit/devtools/webide/content/monitor.js @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const Cu = Components.utils; -Cu.import('resource:///modules/devtools/gDevTools.jsm'); +Cu.import('resource://gre/modules/devtools/gDevTools.jsm'); const {require} = Cu.import('resource://gre/modules/devtools/Loader.jsm', {}).devtools; const {Services} = Cu.import('resource://gre/modules/Services.jsm'); const {AppManager} = require('devtools/webide/app-manager'); diff --git a/toolkit/devtools/webide/content/webide.js b/toolkit/devtools/webide/content/webide.js index 1afa0eba16..1b3a895728 100644 --- a/toolkit/devtools/webide/content/webide.js +++ b/toolkit/devtools/webide/content/webide.js @@ -6,7 +6,7 @@ const Cc = Components.classes; const Cu = Components.utils; const Ci = Components.interfaces; -Cu.import("resource:///modules/devtools/gDevTools.jsm"); +Cu.import("resource://gre/modules/devtools/gDevTools.jsm"); Cu.import("resource://gre/modules/Task.jsm"); const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});