diff --git a/addon-sdk/source/lib/sdk/console/plain-text.js b/addon-sdk/source/lib/sdk/console/plain-text.js index c0cfc94e1ef..0e44cf106d5 100644 --- a/addon-sdk/source/lib/sdk/console/plain-text.js +++ b/addon-sdk/source/lib/sdk/console/plain-text.js @@ -12,7 +12,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome"); const self = require("../self"); const prefs = require("../preferences/service"); const { merge } = require("../util/object"); -const { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const { ConsoleAPI } = Cu.import("resource://gre/modules/Console.jsm", {}); const DEFAULT_LOG_LEVEL = "error"; const ADDON_LOG_LEVEL_PREF = "extensions." + self.id + ".sdk.console.logLevel"; diff --git a/addon-sdk/source/lib/toolkit/loader.js b/addon-sdk/source/lib/toolkit/loader.js index 4ec45483cb5..fad56020c13 100644 --- a/addon-sdk/source/lib/toolkit/loader.js +++ b/addon-sdk/source/lib/toolkit/loader.js @@ -798,7 +798,7 @@ function Loader(options) { globals: { get console() { // Import Console.jsm from here to prevent loading it until someone uses it - let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm"); + let { ConsoleAPI } = Cu.import("resource://gre/modules/Console.jsm"); let console = new ConsoleAPI({ consoleID: options.id ? "addon/" + options.id : "" }); diff --git a/addon-sdk/test/head.js b/addon-sdk/test/head.js index 88e548fcf07..2afb673e753 100644 --- a/addon-sdk/test/head.js +++ b/addon-sdk/test/head.js @@ -5,7 +5,7 @@ const { utils: Cu } = Components; const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const LoaderModule = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {}).Loader; -const { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const { console } = Cu.import("resource://gre/modules/Console.jsm", {}); var { Loader, main, Module, Require, unload } = LoaderModule; diff --git a/browser/components/customizableui/logging.js b/browser/components/customizableui/logging.js index 8e049371579..93c4b765a01 100644 --- a/browser/components/customizableui/logging.js +++ b/browser/components/customizableui/logging.js @@ -5,7 +5,7 @@ #endif XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); var gDebug = false; try { diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index a6a692e3edd..fcd8bcc25f3 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -64,7 +64,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyGetter(this, "DownloadsLogger", () => { - let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let { ConsoleAPI } = Cu.import("resource://gre/modules/Console.jsm", {}); let consoleOptions = { maxLogLevelPref: "browser.download.loglevel", prefix: "Downloads" diff --git a/browser/components/loop/modules/LoopContacts.jsm b/browser/components/loop/modules/LoopContacts.jsm index c5a440f6fef..24553b91c37 100644 --- a/browser/components/loop/modules/LoopContacts.jsm +++ b/browser/components/loop/modules/LoopContacts.jsm @@ -7,7 +7,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "LoopStorage", "resource:///modules/loop/LoopStorage.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Promise", diff --git a/browser/components/loop/modules/MozLoopService.jsm b/browser/components/loop/modules/MozLoopService.jsm index 7de2d97d5ff..ff603d0831f 100644 --- a/browser/components/loop/modules/MozLoopService.jsm +++ b/browser/components/loop/modules/MozLoopService.jsm @@ -182,7 +182,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gWM", // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref. XPCOMUtils.defineLazyGetter(this, "log", () => { - let ConsoleAPI = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).ConsoleAPI; + let ConsoleAPI = Cu.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI; let consoleOptions = { maxLogLevelPref: PREF_LOG_LEVEL, prefix: "Loop" diff --git a/browser/components/sessionstore/SessionFile.jsm b/browser/components/sessionstore/SessionFile.jsm index b01a3bc9ba4..63c47d43da0 100644 --- a/browser/components/sessionstore/SessionFile.jsm +++ b/browser/components/sessionstore/SessionFile.jsm @@ -38,7 +38,7 @@ Cu.import("resource://gre/modules/AsyncShutdown.jsm"); Cu.import("resource://gre/modules/Preferences.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "RunState", "resource:///modules/sessionstore/RunState.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch", diff --git a/browser/components/sessionstore/SessionSaver.jsm b/browser/components/sessionstore/SessionSaver.jsm index 10a5edd30eb..98c2ca12ad2 100644 --- a/browser/components/sessionstore/SessionSaver.jsm +++ b/browser/components/sessionstore/SessionSaver.jsm @@ -18,7 +18,7 @@ Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", this); XPCOMUtils.defineLazyModuleGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter", "resource:///modules/sessionstore/PrivacyFilter.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "SessionStore", diff --git a/browser/components/sessionstore/SessionStorage.jsm b/browser/components/sessionstore/SessionStorage.jsm index a2322e0181f..4feed6b437c 100644 --- a/browser/components/sessionstore/SessionStorage.jsm +++ b/browser/components/sessionstore/SessionStorage.jsm @@ -13,7 +13,7 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); // Returns the principal for a given |frame| contained in a given |docShell|. function getPrincipalForFrame(docShell, frame) { diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm index d3f33954099..56ab39dd320 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm @@ -131,7 +131,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gScreenManager", XPCOMUtils.defineLazyServiceGetter(this, "Telemetry", "@mozilla.org/base/telemetry;1", "nsITelemetry"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow", "resource:///modules/RecentWindow.jsm"); diff --git a/browser/components/sessionstore/TabState.jsm b/browser/components/sessionstore/TabState.jsm index f3192a9a0c4..bda10854e97 100644 --- a/browser/components/sessionstore/TabState.jsm +++ b/browser/components/sessionstore/TabState.jsm @@ -13,7 +13,7 @@ Cu.import("resource://gre/modules/Promise.jsm", this); Cu.import("resource://gre/modules/Task.jsm", this); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter", "resource:///modules/sessionstore/PrivacyFilter.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache", diff --git a/browser/components/sessionstore/nsSessionStartup.js b/browser/components/sessionstore/nsSessionStartup.js index a01b4985760..fc803189b45 100644 --- a/browser/components/sessionstore/nsSessionStartup.js +++ b/browser/components/sessionstore/nsSessionStartup.js @@ -42,7 +42,7 @@ Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm"); Cu.import("resource://gre/modules/Promise.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "SessionFile", "resource:///modules/sessionstore/SessionFile.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "CrashMonitor", diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index 74456d17524..e3d759c60f2 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -73,7 +73,7 @@ const TARGET_SEARCHENGINE_PREFIX = "searchEngine-"; // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref. XPCOMUtils.defineLazyGetter(this, "log", () => { - let ConsoleAPI = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).ConsoleAPI; + let ConsoleAPI = Cu.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI; let consoleOptions = { maxLogLevelPref: PREF_LOG_LEVEL, prefix: "UITour", diff --git a/devtools/client/animationinspector/animation-controller.js b/devtools/client/animationinspector/animation-controller.js index 8b8058d8f3a..60364dfefd1 100644 --- a/devtools/client/animationinspector/animation-controller.js +++ b/devtools/client/animationinspector/animation-controller.js @@ -11,7 +11,7 @@ var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; Cu.import("resource://gre/modules/Task.jsm"); var { loader, require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm"); -Cu.import("resource://gre/modules/devtools/shared/Console.jsm"); +Cu.import("resource://gre/modules/Console.jsm"); Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm"); loader.lazyRequireGetter(this, "promise"); diff --git a/devtools/client/animationinspector/test/head.js b/devtools/client/animationinspector/test/head.js index 673c6264088..210493e4061 100644 --- a/devtools/client/animationinspector/test/head.js +++ b/devtools/client/animationinspector/test/head.js @@ -9,7 +9,7 @@ const {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDe const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const promise = require("promise"); const {TargetFactory} = require("devtools/client/framework/target"); -const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const {console} = Cu.import("resource://gre/modules/Console.jsm", {}); const {ViewHelpers} = Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm", {}); const DevToolsUtils = require("devtools/shared/DevToolsUtils"); diff --git a/devtools/client/canvasdebugger/canvasdebugger.js b/devtools/client/canvasdebugger/canvasdebugger.js index 52e5eff278e..1a64dfc3609 100644 --- a/devtools/client/canvasdebugger/canvasdebugger.js +++ b/devtools/client/canvasdebugger/canvasdebugger.js @@ -9,7 +9,7 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource:///modules/devtools/client/shared/widgets/SideMenuWidget.jsm"); Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm"); -Cu.import("resource://gre/modules/devtools/shared/Console.jsm"); +Cu.import("resource://gre/modules/Console.jsm"); const { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const promise = require("promise"); diff --git a/devtools/client/commandline/test/head.js b/devtools/client/commandline/test/head.js index 929c9d03edf..9176b438033 100644 --- a/devtools/client/commandline/test/head.js +++ b/devtools/client/commandline/test/head.js @@ -6,7 +6,7 @@ const TEST_BASE_HTTP = "http://example.com/browser/devtools/client/commandline/t const TEST_BASE_HTTPS = "https://example.com/browser/devtools/client/commandline/test/"; var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); -var { console } = require("resource://gre/modules/devtools/shared/Console.jsm"); +var { console } = require("resource://gre/modules/Console.jsm"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); // Import the GCLI test helper diff --git a/devtools/client/devtools-clhandler.js b/devtools/client/devtools-clhandler.js index c0d0a5af4ae..8c761812ea7 100644 --- a/devtools/client/devtools-clhandler.js +++ b/devtools/client/devtools-clhandler.js @@ -43,7 +43,7 @@ devtoolsCommandlineHandler.prototype = { // Load the browser devtools main module as the loader's main module. Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm"); let hudservice = require("devtools/client/webconsole/hudservice"); - let { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let { console } = Cu.import("resource://gre/modules/Console.jsm", {}); hudservice.toggleBrowserConsole().then(null, console.error); } else { window.focus(); // the Browser Console was already open diff --git a/devtools/client/fontinspector/font-inspector.js b/devtools/client/fontinspector/font-inspector.js index 30608550ac0..4b1889e8267 100644 --- a/devtools/client/fontinspector/font-inspector.js +++ b/devtools/client/fontinspector/font-inspector.js @@ -14,7 +14,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); function FontInspector(inspector, window) { diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework/gDevTools.jsm index a4fb69c8bd2..9eb475eea4e 100644 --- a/devtools/client/framework/gDevTools.jsm +++ b/devtools/client/framework/gDevTools.jsm @@ -17,7 +17,7 @@ loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/targe loader.lazyRequireGetter(this, "Toolbox", "devtools/client/framework/toolbox", true); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm"); loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true); diff --git a/devtools/client/framework/test/shared-head.js b/devtools/client/framework/test/shared-head.js index 728027eefb5..79697871710 100644 --- a/devtools/client/framework/test/shared-head.js +++ b/devtools/client/framework/test/shared-head.js @@ -14,7 +14,7 @@ function scopedCuImport(path) { const {Services} = scopedCuImport("resource://gre/modules/Services.jsm"); const {gDevTools} = scopedCuImport("resource:///modules/devtools/client/framework/gDevTools.jsm"); -const {console} = scopedCuImport("resource://gre/modules/devtools/shared/Console.jsm"); +const {console} = scopedCuImport("resource://gre/modules/Console.jsm"); const {ScratchpadManager} = scopedCuImport("resource:///modules/devtools/client/scratchpad/scratchpad-manager.jsm"); const {require} = scopedCuImport("resource://gre/modules/devtools/shared/Loader.jsm"); diff --git a/devtools/client/inspector/test/head.js b/devtools/client/inspector/test/head.js index 0bb62241aca..d9e88d8d07f 100644 --- a/devtools/client/inspector/test/head.js +++ b/devtools/client/inspector/test/head.js @@ -25,7 +25,7 @@ waitForExplicitFinish(); var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var {TargetFactory} = require("devtools/client/framework/target"); -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); var promise = require("promise"); diff --git a/devtools/client/layoutview/test/head.js b/devtools/client/layoutview/test/head.js index 2ea85ce2149..d9ae4cb4d21 100644 --- a/devtools/client/layoutview/test/head.js +++ b/devtools/client/layoutview/test/head.js @@ -7,7 +7,7 @@ var Cu = Components.utils; var {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {}); var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var {TargetFactory} = require("devtools/client/framework/target"); var promise = require("promise"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); diff --git a/devtools/client/layoutview/view.js b/devtools/client/layoutview/view.js index 916218a92fb..876e6c018af 100644 --- a/devtools/client/layoutview/view.js +++ b/devtools/client/layoutview/view.js @@ -10,7 +10,7 @@ var {utils: Cu, interfaces: Ci, classes: Cc} = Components; Cu.import("resource://gre/modules/Task.jsm"); const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); -Cu.import("resource://gre/modules/devtools/shared/Console.jsm"); +Cu.import("resource://gre/modules/Console.jsm"); Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm"); const {InplaceEditor, editableItem} = require("devtools/client/shared/inplace-editor"); diff --git a/devtools/client/markupview/test/head.js b/devtools/client/markupview/test/head.js index fdfa0bd8f4e..3eaa4209037 100644 --- a/devtools/client/markupview/test/head.js +++ b/devtools/client/markupview/test/head.js @@ -5,7 +5,7 @@ var Cu = Components.utils; var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var {TargetFactory} = require("devtools/client/framework/target"); -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var promise = require("promise"); var {getInplaceEditorForSpan: inplaceEditor} = require("devtools/client/shared/inplace-editor"); var clipboard = require("sdk/clipboard"); diff --git a/devtools/client/memory/test/unit/head.js b/devtools/client/memory/test/unit/head.js index 43ffceb1e9b..1693a043dd1 100644 --- a/devtools/client/memory/test/unit/head.js +++ b/devtools/client/memory/test/unit/head.js @@ -6,7 +6,7 @@ var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; var { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); var { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {}); -var { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var { console } = Cu.import("resource://gre/modules/Console.jsm", {}); var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var { TargetFactory } = require("devtools/client/framework/target"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); diff --git a/devtools/client/performance/test/head.js b/devtools/client/performance/test/head.js index e751abb290c..6cf82d9ee5e 100644 --- a/devtools/client/performance/test/head.js +++ b/devtools/client/performance/test/head.js @@ -9,7 +9,7 @@ var { Preferences } = Cu.import("resource://gre/modules/Preferences.jsm", {}); var { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {}); -var { console } = require("resource://gre/modules/devtools/shared/Console.jsm"); +var { console } = require("resource://gre/modules/Console.jsm"); var { TargetFactory } = require("devtools/client/framework/target"); var Promise = require("promise"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); @@ -291,7 +291,7 @@ function consoleExecute (console, method, val) { ui.on("new-messages", handler); jsterm.execute(message); - let { console: c } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let { console: c } = Cu.import("resource://gre/modules/Console.jsm", {}); function handler (event, messages) { for (let msg of messages) { if (msg.response._message === message) { diff --git a/devtools/client/performance/test/unit/head.js b/devtools/client/performance/test/unit/head.js index 61a7726db0f..2e017f54ff1 100644 --- a/devtools/client/performance/test/unit/head.js +++ b/devtools/client/performance/test/unit/head.js @@ -6,9 +6,8 @@ var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); -var { console } = require("resource://gre/modules/devtools/shared/Console.jsm"); +var { console } = require("resource://gre/modules/Console.jsm"); const RecordingUtils = require("devtools/shared/performance/recording-utils"); - const PLATFORM_DATA_PREF = "devtools.performance.ui.show-platform-data"; /** diff --git a/devtools/client/projecteditor/test/head.js b/devtools/client/projecteditor/test/head.js index 2dd94244250..8ab975ed92f 100644 --- a/devtools/client/projecteditor/test/head.js +++ b/devtools/client/projecteditor/test/head.js @@ -5,7 +5,7 @@ var Cu = Components.utils; const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const {TargetFactory} = require("devtools/client/framework/target"); -const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const {console} = Cu.import("resource://gre/modules/Console.jsm", {}); const promise = require("promise"); const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {}); const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {}); diff --git a/devtools/client/scratchpad/test/head.js b/devtools/client/scratchpad/test/head.js index 339f0a06922..e7acd4a5e4b 100644 --- a/devtools/client/scratchpad/test/head.js +++ b/devtools/client/scratchpad/test/head.js @@ -6,7 +6,7 @@ const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {}); const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {}); -const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const {console} = Cu.import("resource://gre/modules/Console.jsm", {}); const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const {Services} = Cu.import("resource://gre/modules/Services.jsm", {}); const DevToolsUtils = require("devtools/shared/DevToolsUtils"); diff --git a/devtools/client/shadereditor/shadereditor.js b/devtools/client/shadereditor/shadereditor.js index ae285e4ff8c..b91b1daea0b 100644 --- a/devtools/client/shadereditor/shadereditor.js +++ b/devtools/client/shadereditor/shadereditor.js @@ -10,7 +10,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource:///modules/devtools/client/shared/widgets/SideMenuWidget.jsm"); Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm"); -Cu.import("resource://gre/modules/devtools/shared/Console.jsm"); +Cu.import("resource://gre/modules/Console.jsm"); const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const promise = require("promise"); diff --git a/devtools/client/shared/DeveloperToolbar.jsm b/devtools/client/shared/DeveloperToolbar.jsm index eb748ca8c3c..a617ff7aabb 100644 --- a/devtools/client/shared/DeveloperToolbar.jsm +++ b/devtools/client/shared/DeveloperToolbar.jsm @@ -20,7 +20,7 @@ const promise = require("promise"); const Node = Ci.nsIDOMNode; XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); diff --git a/devtools/client/shared/test/head.js b/devtools/client/shared/test/head.js index f303053d2bd..91b807d3b2e 100644 --- a/devtools/client/shared/test/head.js +++ b/devtools/client/shared/test/head.js @@ -4,7 +4,7 @@ var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var {TargetFactory} = require("devtools/client/framework/target"); -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {}); const {DOMHelpers} = Cu.import("resource:///modules/devtools/client/shared/DOMHelpers.jsm", {}); const {Hosts} = require("devtools/client/framework/toolbox-hosts"); diff --git a/devtools/client/shared/widgets/AbstractTreeItem.jsm b/devtools/client/shared/widgets/AbstractTreeItem.jsm index 76a9df9ab72..c912d2af17c 100644 --- a/devtools/client/shared/widgets/AbstractTreeItem.jsm +++ b/devtools/client/shared/widgets/AbstractTreeItem.jsm @@ -14,7 +14,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter", "resource://gre/modules/devtools/shared/event-emitter.js"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); this.EXPORTED_SYMBOLS = ["AbstractTreeItem"]; diff --git a/devtools/client/shared/widgets/VariablesViewController.jsm b/devtools/client/shared/widgets/VariablesViewController.jsm index 2a6050d03a4..076784c2eee 100644 --- a/devtools/client/shared/widgets/VariablesViewController.jsm +++ b/devtools/client/shared/widgets/VariablesViewController.jsm @@ -27,7 +27,7 @@ XPCOMUtils.defineLazyGetter(this, "VARIABLES_SORTING_ENABLED", () => ); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); const MAX_LONG_STRING_LENGTH = 200000; const MAX_PROPERTY_ITEMS = 2000; diff --git a/devtools/client/storage/test/head.js b/devtools/client/storage/test/head.js index f2048daa41a..22e3644ac41 100644 --- a/devtools/client/storage/test/head.js +++ b/devtools/client/storage/test/head.js @@ -4,7 +4,7 @@ "use strict"; -var { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var { console } = Cu.import("resource://gre/modules/Console.jsm", {}); var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var { TargetFactory } = require("devtools/client/framework/target"); var promise = require("promise"); diff --git a/devtools/client/styleeditor/StyleEditorUI.jsm b/devtools/client/styleeditor/StyleEditorUI.jsm index d0e1bc63747..8d6a79f1810 100644 --- a/devtools/client/styleeditor/StyleEditorUI.jsm +++ b/devtools/client/styleeditor/StyleEditorUI.jsm @@ -28,7 +28,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", const { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const { PrefObserver, PREF_ORIG_SOURCES } = require("devtools/client/styleeditor/utils"); const csscoverage = require("devtools/server/actors/csscoverage"); -const console = require("resource://gre/modules/devtools/shared/Console.jsm").console; +const console = require("resource://gre/modules/Console.jsm").console; const promise = require("promise"); const LOAD_ERROR = "error-load"; diff --git a/devtools/client/styleeditor/StyleEditorUtil.jsm b/devtools/client/styleeditor/StyleEditorUtil.jsm index f42fe2c12cb..6a43b24a696 100644 --- a/devtools/client/styleeditor/StyleEditorUtil.jsm +++ b/devtools/client/styleeditor/StyleEditorUtil.jsm @@ -23,7 +23,7 @@ Cu.import("resource://gre/modules/Services.jsm"); const PROPERTIES_URL = "chrome://browser/locale/devtools/styleeditor.properties"; const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); -const console = require("resource://gre/modules/devtools/shared/Console.jsm").console; +const console = require("resource://gre/modules/Console.jsm").console; const gStringBundle = Services.strings.createBundle(PROPERTIES_URL); diff --git a/devtools/client/styleeditor/StyleSheetEditor.jsm b/devtools/client/styleeditor/StyleSheetEditor.jsm index 8b5f3bb4ec6..8bf69c978cc 100644 --- a/devtools/client/styleeditor/StyleSheetEditor.jsm +++ b/devtools/client/styleeditor/StyleSheetEditor.jsm @@ -15,7 +15,7 @@ const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", const Editor = require("devtools/client/sourceeditor/editor"); const promise = require("promise"); const {CssLogic} = require("devtools/shared/styleinspector/css-logic"); -const {console} = require("resource://gre/modules/devtools/shared/Console.jsm"); +const {console} = require("resource://gre/modules/Console.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/FileUtils.jsm"); diff --git a/devtools/client/styleeditor/test/head.js b/devtools/client/styleeditor/test/head.js index d3c425ce978..c66886f2942 100644 --- a/devtools/client/styleeditor/test/head.js +++ b/devtools/client/styleeditor/test/head.js @@ -9,7 +9,7 @@ const TEST_HOST = 'mochi.test:8888'; var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var {TargetFactory} = require("devtools/client/framework/target"); -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var promise = require("promise"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); diff --git a/devtools/client/styleinspector/test/head.js b/devtools/client/styleinspector/test/head.js index 29c3b382a27..72516d70f33 100644 --- a/devtools/client/styleinspector/test/head.js +++ b/devtools/client/styleinspector/test/head.js @@ -16,7 +16,7 @@ var promise = require("promise"); var {editableField, getInplaceEditorForSpan: inplaceEditor} = require("devtools/client/shared/inplace-editor"); var {console} = - Components.utils.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + Components.utils.import("resource://gre/modules/Console.jsm", {}); // All tests are asynchronous waitForExplicitFinish(); diff --git a/devtools/client/webaudioeditor/includes.js b/devtools/client/webaudioeditor/includes.js index 65f13a34e13..fcfc2b79242 100644 --- a/devtools/client/webaudioeditor/includes.js +++ b/devtools/client/webaudioeditor/includes.js @@ -12,7 +12,7 @@ Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm"); const { loader, require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); -var { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var { console } = Cu.import("resource://gre/modules/Console.jsm", {}); var { EventTarget } = require("sdk/event/target"); const { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); diff --git a/devtools/client/webconsole/test/browser_console_consolejsm_output.js b/devtools/client/webconsole/test/browser_console_consolejsm_output.js index 8b0424dfee6..d72e40a5d5c 100644 --- a/devtools/client/webconsole/test/browser_console_consolejsm_output.js +++ b/devtools/client/webconsole/test/browser_console_consolejsm_output.js @@ -21,7 +21,7 @@ add_task(function*() { let storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage); storage.clearEvents(); - let {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let {console} = Cu.import("resource://gre/modules/Console.jsm", {}); console.log("bug861338-log-cached"); let hud = yield HUDService.toggleBrowserConsole(); @@ -153,7 +153,7 @@ add_task(function* testPrefix() { let storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage); storage.clearEvents(); - let {ConsoleAPI} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {}); let consoleOptions = { maxLogLevel: "error", prefix: "Log Prefix", @@ -184,7 +184,7 @@ add_task(function* testMaxLogLevelPrefMissing() { let storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage); storage.clearEvents(); - let {ConsoleAPI} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {}); let consoleOptions = { maxLogLevel: "error", maxLogLevelPref: "testing.maxLogLevel", @@ -223,7 +223,7 @@ add_task(function* testMaxLogLevelPref() { let storage = consoleStorage.getService(Ci.nsIConsoleAPIStorage); storage.clearEvents(); - let {ConsoleAPI} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {}); let consoleOptions = { maxLogLevel: "error", maxLogLevelPref: "testing.maxLogLevel", diff --git a/devtools/client/webconsole/test/head.js b/devtools/client/webconsole/test/head.js index 007ae755435..9bfd6605100 100644 --- a/devtools/client/webconsole/test/head.js +++ b/devtools/client/webconsole/test/head.js @@ -6,7 +6,7 @@ "use strict"; var {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {}); -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var promise = require("promise"); diff --git a/devtools/server/tests/browser/head.js b/devtools/server/tests/browser/head.js index 096945e4e32..d9d7bf475fd 100644 --- a/devtools/server/tests/browser/head.js +++ b/devtools/server/tests/browser/head.js @@ -7,7 +7,7 @@ var Ci = Components.interfaces; var Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); -const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const {console} = Cu.import("resource://gre/modules/Console.jsm", {}); const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); const {DebuggerClient} = require("devtools/shared/client/main"); const {DebuggerServer} = require("devtools/server/main"); diff --git a/devtools/server/tests/unit/head_dbg.js b/devtools/server/tests/unit/head_dbg.js index 1e041642973..8329828095e 100644 --- a/devtools/server/tests/unit/head_dbg.js +++ b/devtools/server/tests/unit/head_dbg.js @@ -185,7 +185,7 @@ function tryImport(url) { } tryImport("resource://gre/modules/devtools/shared/Loader.jsm"); -tryImport("resource://gre/modules/devtools/shared/Console.jsm"); +tryImport("resource://gre/modules/Console.jsm"); function testExceptionHook(ex) { try { diff --git a/devtools/shared/Loader.jsm b/devtools/shared/Loader.jsm index 1e93ee7f1ca..ebc4ef546da 100644 --- a/devtools/shared/Loader.jsm +++ b/devtools/shared/Loader.jsm @@ -393,7 +393,7 @@ DevToolsLoader.prototype = { }; // Lazy define console in order to load Console.jsm only when it is used XPCOMUtils.defineLazyGetter(this._provider.globals, "console", () => { - return Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).console; + return Cu.import("resource://gre/modules/Console.jsm", {}).console; }); this._provider.load(); diff --git a/devtools/shared/gcli/Templater.jsm b/devtools/shared/gcli/Templater.jsm index b5d2d1759e1..583381c7dfa 100644 --- a/devtools/shared/gcli/Templater.jsm +++ b/devtools/shared/gcli/Templater.jsm @@ -17,7 +17,7 @@ this.EXPORTED_SYMBOLS = [ "template" ]; Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); 'use strict'; diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build index 60a90e4396d..0197a03dd8d 100644 --- a/devtools/shared/moz.build +++ b/devtools/shared/moz.build @@ -35,7 +35,6 @@ XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'async-storage.js', 'async-utils.js', - 'Console.jsm', 'content-observer.js', 'css-color.js', 'deprecated-sync-thenables.js', diff --git a/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js b/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js index 9d515e81621..12b5be118b9 100644 --- a/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js +++ b/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js @@ -9,7 +9,7 @@ const { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm this.sourceMap = require("source-map"); this.acorn = require("acorn/acorn"); this.prettyFast = require("devtools/shared/pretty-fast/pretty-fast"); -const { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +const { console } = Cu.import("resource://gre/modules/Console.jsm", {}); // Register a console listener, so console messages don't just disappear // into the ether. diff --git a/devtools/shared/shims/Console.jsm b/devtools/shared/shims/Console.jsm index 897c508d885..0bfdcb86774 100644 --- a/devtools/shared/shims/Console.jsm +++ b/devtools/shared/shims/Console.jsm @@ -17,8 +17,8 @@ const WARNING_PREF = "devtools.migration.warnings"; if (Services.prefs.getBoolPref(WARNING_PREF)) { const { Deprecated } = Cu.import("resource://gre/modules/Deprecated.jsm", {}); Deprecated.warning("This path to Console.jsm is deprecated. Please use " + - "Cu.import(\"resource://gre/modules/devtools/shared/" + - "Console.jsm\") to load this module.", + "Cu.import(\"resource://gre/modules/Console.jsm\") " + + "to load this module.", "https://bugzil.la/912121"); } @@ -28,7 +28,7 @@ this.EXPORTED_SYMBOLS = [ ]; const module = - Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + Cu.import("resource://gre/modules/Console.jsm", {}); for (let symbol of this.EXPORTED_SYMBOLS) { this[symbol] = module[symbol]; diff --git a/devtools/shared/shims/moz.build b/devtools/shared/shims/moz.build index 6028192509c..afc71f36541 100644 --- a/devtools/shared/shims/moz.build +++ b/devtools/shared/shims/moz.build @@ -15,3 +15,8 @@ EXTRA_JS_MODULES.devtools += [ 'Loader.jsm', 'Simulator.jsm', ] + +# Extra compatibility layer for transitional URL used in middle of fx44 cycle +EXTRA_JS_MODULES.devtools.shared += [ + 'Console.jsm', +] diff --git a/devtools/shared/tests/unit/test_consoleID.js b/devtools/shared/tests/unit/test_consoleID.js index 916b939654d..4388bc291c9 100644 --- a/devtools/shared/tests/unit/test_consoleID.js +++ b/devtools/shared/tests/unit/test_consoleID.js @@ -1,7 +1,7 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -const { console, ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm"); +const { console, ConsoleAPI } = Cu.import("resource://gre/modules/Console.jsm"); const { ConsoleAPIListener } = require("devtools/shared/webconsole/utils"); diff --git a/devtools/shared/webconsole/test/common.js b/devtools/shared/webconsole/test/common.js index 32e337e6ede..5fa73caab40 100644 --- a/devtools/shared/webconsole/test/common.js +++ b/devtools/shared/webconsole/test/common.js @@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/Services.jsm"); const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); // This gives logging to stdout for tests -var {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); var {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils; diff --git a/devtools/shared/webconsole/test/test_consoleapi_innerID.html b/devtools/shared/webconsole/test/test_consoleapi_innerID.html index a4f2e4f803e..02d5003d618 100644 --- a/devtools/shared/webconsole/test/test_consoleapi_innerID.html +++ b/devtools/shared/webconsole/test/test_consoleapi_innerID.html @@ -18,7 +18,7 @@ let expectedConsoleCalls = []; function doConsoleCalls(aState) { - let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let { ConsoleAPI } = Cu.import("resource://gre/modules/Console.jsm", {}); let console = new ConsoleAPI({ innerID: window.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDOMWindowUtils) diff --git a/devtools/shared/worker/worker.js b/devtools/shared/worker/worker.js index c12a59cc9d1..22495441583 100644 --- a/devtools/shared/worker/worker.js +++ b/devtools/shared/worker/worker.js @@ -13,7 +13,7 @@ const { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}); this.isWorker = false; this.Promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise; - this.console = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).console; + this.console = Cu.import("resource://gre/modules/Console.jsm", {}).console; factory.call( this, require, this, { exports: this }, { Cc, Ci, Cu }, ChromeWorker, null diff --git a/dom/manifest/ManifestProcessor.jsm b/dom/manifest/ManifestProcessor.jsm index 7aa2ef3f432..7b0c3b026bc 100644 --- a/dom/manifest/ManifestProcessor.jsm +++ b/dom/manifest/ManifestProcessor.jsm @@ -32,7 +32,7 @@ const orientationTypes = new Set(['any', 'natural', 'landscape', 'portrait', 'portrait-primary', 'portrait-secondary', 'landscape-primary', 'landscape-secondary' ]); -Cu.import('resource://gre/modules/devtools/shared/Console.jsm'); +Cu.import('resource://gre/modules/Console.jsm'); // ValueExtractor is used by the various processors to get values // from the manifest and to report errors. Cu.import('resource://gre/modules/ValueExtractor.jsm'); diff --git a/mobile/android/chrome/content/EmbedRT.js b/mobile/android/chrome/content/EmbedRT.js index 25e8a70ba7a..8e35a3b634d 100644 --- a/mobile/android/chrome/content/EmbedRT.js +++ b/mobile/android/chrome/content/EmbedRT.js @@ -4,7 +4,7 @@ "use strict"; XPCOMUtils.defineLazyModuleGetter(this, "ConsoleAPI", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); /* * Collection of methods and features specific to using a GeckoView instance. diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js index 1a823b006a8..3ea289bf10c 100644 --- a/testing/mochitest/browser-test.js +++ b/testing/mochitest/browser-test.js @@ -31,7 +31,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "SelfSupportBackend", var nativeConsole = console; XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); const SIMPLETEST_OVERRIDES = ["ok", "is", "isnot", "todo", "todo_is", "todo_isnot", "info", "expectAssertions", "requestCompleteLog"]; diff --git a/toolkit/components/addoncompat/CompatWarning.jsm b/toolkit/components/addoncompat/CompatWarning.jsm index d0d7db4da1f..b63c886ba88 100644 --- a/toolkit/components/addoncompat/CompatWarning.jsm +++ b/toolkit/components/addoncompat/CompatWarning.jsm @@ -13,7 +13,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Preferences.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); function section(number, url) { diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm index 578d5fce2a1..b9ff8b010d1 100644 --- a/toolkit/components/passwordmgr/LoginHelper.jsm +++ b/toolkit/components/passwordmgr/LoginHelper.jsm @@ -44,7 +44,7 @@ this.LoginHelper = { }; // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref. - let ConsoleAPI = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).ConsoleAPI; + let ConsoleAPI = Cu.import("resource://gre/modules/Console.jsm", {}).ConsoleAPI; let consoleOptions = { maxLogLevel: getMaxLogLevel(), prefix: aLogPrefix, diff --git a/toolkit/components/perfmonitoring/AddonWatcher.jsm b/toolkit/components/perfmonitoring/AddonWatcher.jsm index 3ca2f51c6f2..00326e85866 100644 --- a/toolkit/components/perfmonitoring/AddonWatcher.jsm +++ b/toolkit/components/perfmonitoring/AddonWatcher.jsm @@ -16,7 +16,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Preferences", XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PerformanceStats", "resource://gre/modules/PerformanceStats.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "Telemetry", diff --git a/toolkit/components/places/PlacesTransactions.jsm b/toolkit/components/places/PlacesTransactions.jsm index 181ad93afc6..2af19ed7648 100644 --- a/toolkit/components/places/PlacesTransactions.jsm +++ b/toolkit/components/places/PlacesTransactions.jsm @@ -185,7 +185,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil", XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); Components.utils.importGlobalProperties(["URL"]); diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js index 0938e5033c7..c1a689ebcf5 100644 --- a/toolkit/content/browser-content.js +++ b/toolkit/content/browser-content.js @@ -353,7 +353,7 @@ PopupBlocking.init(); XPCOMUtils.defineLazyGetter(this, "console", () => { // Set up console.* for frame scripts. - let Console = Components.utils.import("resource://gre/modules/devtools/shared/Console.jsm", {}); + let Console = Components.utils.import("resource://gre/modules/Console.jsm", {}); return new Console.ConsoleAPI(); }); diff --git a/devtools/shared/Console.jsm b/toolkit/modules/Console.jsm similarity index 100% rename from devtools/shared/Console.jsm rename to toolkit/modules/Console.jsm diff --git a/toolkit/modules/Sqlite.jsm b/toolkit/modules/Sqlite.jsm index 6cf33da3cd5..59dd026de88 100644 --- a/toolkit/modules/Sqlite.jsm +++ b/toolkit/modules/Sqlite.jsm @@ -36,7 +36,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "FinalizationWitnessService", XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "console", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); // Regular expression used by isInvalidBoundLikeQuery var likeSqlRegex = /\bLIKE\b\s(?![@:?])/i; diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 504c67366a7..94c6e2a7b6e 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -24,6 +24,7 @@ EXTRA_JS_MODULES += [ 'CertUtils.jsm', 'CharsetMenu.jsm', 'ClientID.jsm', + 'Console.jsm', 'debug.js', 'DeferredTask.jsm', 'Deprecated.jsm', diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 8c9ee77b13f..3e629046f10 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -41,7 +41,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "OS", XPCOMUtils.defineLazyModuleGetter(this, "BrowserToolboxProcess", "resource:///modules/devtools/client/framework/ToolboxProcess.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ConsoleAPI", - "resource://gre/modules/devtools/shared/Console.jsm"); + "resource://gre/modules/Console.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ProductAddonChecker", "resource://gre/modules/addons/ProductAddonChecker.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",