Bug 1440094 - Remove imports to Console.jsm that only access the 'console' object;r=mossop

Importing this object is unnecessary after the updates to the WebIDL console from Bug 1425574 and the follow-ups blocking Bug 1430810. There are still callers that access Console.jsm to create custom ConsoleAPI objects, but those will be handled separately. MozReview-Commit-ID: 9ojFxtkpPId --HG-- extra : rebase_source : 971bf99f709b8d2afe300f3693665724f747aa5e
2025-02-04 04:58:00 +00:00 · 2018-02-27 11:29:59 -08:00 · 2018-02-27 11:29:59 -08:00 · 97119973ca
commit 97119973ca
parent dcf493b621
34 changed files with 3 additions and 53 deletions
--- a/browser/components/sessionstore/SessionFile.jsm
+++ b/browser/components/sessionstore/SessionFile.jsm
@ -30,8 +30,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/osfile.jsm");
 ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm");

-ChromeUtils.defineModuleGetter(this, "console",
-  "resource://gre/modules/Console.jsm");
 ChromeUtils.defineModuleGetter(this, "RunState",
  "resource:///modules/sessionstore/RunState.jsm");
 ChromeUtils.defineModuleGetter(this, "TelemetryStopwatch",
--- a/browser/components/sessionstore/SessionSaver.jsm
+++ b/browser/components/sessionstore/SessionSaver.jsm
@ -13,7 +13,6 @@ ChromeUtils.import("resource://gre/modules/TelemetryStopwatch.jsm", this);

 XPCOMUtils.defineLazyModuleGetters(this, {
  AppConstants: "resource://gre/modules/AppConstants.jsm",
-  console: "resource://gre/modules/Console.jsm",
  PrivacyFilter: "resource:///modules/sessionstore/PrivacyFilter.jsm",
  RunState: "resource:///modules/sessionstore/RunState.jsm",
  SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
--- a/browser/components/sessionstore/SessionStorage.jsm
+++ b/browser/components/sessionstore/SessionStorage.jsm
@ -9,9 +9,6 @@ var EXPORTED_SYMBOLS = ["SessionStorage"];
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

-ChromeUtils.defineModuleGetter(this, "console",
-  "resource://gre/modules/Console.jsm");
-
 const ssu = Cc["@mozilla.org/browser/sessionstore/utils;1"]
              .createInstance(Ci.nsISessionStoreUtils);

--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@ -181,7 +181,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.jsm",
  Utils: "resource://gre/modules/sessionstore/Utils.jsm",
  ViewSourceBrowser: "resource://gre/modules/ViewSourceBrowser.jsm",
-  console: "resource://gre/modules/Console.jsm",
  setTimeout: "resource://gre/modules/Timer.jsm",
 });

--- a/browser/components/sessionstore/StartupPerformance.jsm
+++ b/browser/components/sessionstore/StartupPerformance.jsm
@ -10,8 +10,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);

 ChromeUtils.defineModuleGetter(this, "Services",
  "resource://gre/modules/Services.jsm");
-ChromeUtils.defineModuleGetter(this, "console",
-  "resource://gre/modules/Console.jsm");
 ChromeUtils.defineModuleGetter(this, "setTimeout",
  "resource://gre/modules/Timer.jsm");
 ChromeUtils.defineModuleGetter(this, "clearTimeout",
--- a/browser/components/sessionstore/nsSessionStartup.js
+++ b/browser/components/sessionstore/nsSessionStartup.js
@ -34,8 +34,6 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

-ChromeUtils.defineModuleGetter(this, "console",
-  "resource://gre/modules/Console.jsm");
 ChromeUtils.defineModuleGetter(this, "SessionFile",
  "resource:///modules/sessionstore/SessionFile.jsm");
 ChromeUtils.defineModuleGetter(this, "StartupPerformance",
--- a/browser/extensions/shield-recipe-client/test/browser/browser_EventEmitter.js
+++ b/browser/extensions/shield-recipe-client/test/browser/browser_EventEmitter.js
@ -1,7 +1,6 @@
 "use strict";

 ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://gre/modules/Console.jsm", this);
 ChromeUtils.import("resource://shield-recipe-client/lib/EventEmitter.jsm", this);

 const evidence = {
--- a/browser/extensions/webcompat/content/lib/ua_overrider.jsm
+++ b/browser/extensions/webcompat/content/lib/ua_overrider.jsm
@ -3,7 +3,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Console.jsm");

 ChromeUtils.defineModuleGetter(this, "Services", "resource://gre/modules/Services.jsm");
 ChromeUtils.defineModuleGetter(this, "UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm");
--- a/browser/modules/Sanitizer.jsm
+++ b/browser/modules/Sanitizer.jsm
@ -15,7 +15,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  Downloads: "resource://gre/modules/Downloads.jsm",
  DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
  TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
-  console: "resource://gre/modules/Console.jsm",
  setTimeout: "resource://gre/modules/Timer.jsm",
 });

--- a/devtools/client/commandline/test/head.js
+++ b/devtools/client/commandline/test/head.js
@ -11,7 +11,6 @@ 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 } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-var { console } = require("resource://gre/modules/Console.jsm");
 var flags = require("devtools/shared/flags");

 // Import the GCLI test helper
--- a/devtools/client/framework/ToolboxProcess.jsm
+++ b/devtools/client/framework/ToolboxProcess.jsm
@ -9,7 +9,6 @@
 const DBG_XUL = "chrome://devtools/content/framework/toolbox-process-window.xul";
 const CHROME_DEBUGGER_PROFILE_NAME = "chrome_debugger_profile";

-const { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
 const { require, DevToolsLoader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");

--- a/devtools/client/framework/test/shared-head.js
+++ b/devtools/client/framework/test/shared-head.js
@ -37,7 +37,6 @@ PromiseTestUtils.whitelistRejectionsGlobally(/this\.toolbox is null/);
 PromiseTestUtils.whitelistRejectionsGlobally(/this\.webConsoleClient is null/);
 PromiseTestUtils.whitelistRejectionsGlobally(/this\.worker is null/);

-const {console} = scopedCuImport("resource://gre/modules/Console.jsm");
 const {ScratchpadManager} = scopedCuImport("resource://devtools/client/scratchpad/scratchpad-manager.jsm");
 const {loader, require} = scopedCuImport("resource://devtools/shared/Loader.jsm");

--- a/devtools/client/memory/test/unit/head.js
+++ b/devtools/client/memory/test/unit/head.js
@ -3,7 +3,6 @@

 "use strict";

-var { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
 var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});

 var Services = require("Services");
--- a/devtools/client/performance/test/unit/head.js
+++ b/devtools/client/performance/test/unit/head.js
@ -5,7 +5,6 @@
   synthesizeProfileForTest */
 var { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 var Services = require("Services");
-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";

--- a/devtools/client/scratchpad/test/head.js
+++ b/devtools/client/scratchpad/test/head.js
@ -6,7 +6,6 @@

 const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm", {});
 const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {});
-const {console} = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
 const {ScratchpadManager} = ChromeUtils.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm", {});
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {gDevTools} = require("devtools/client/framework/devtools");
--- a/devtools/client/shared/vendor/stringvalidator/tests/unit/head_stringvalidator.js
+++ b/devtools/client/shared/vendor/stringvalidator/tests/unit/head_stringvalidator.js
@ -1,7 +1,6 @@
 "use strict";

 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});

 this.validator = require("devtools/client/shared/vendor/stringvalidator/validator");

--- a/devtools/client/shared/widgets/AbstractTreeItem.jsm
+++ b/devtools/client/shared/widgets/AbstractTreeItem.jsm
@ -12,9 +12,6 @@ const { KeyCodes } = require("devtools/client/shared/keycodes");

 loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/old-event-emitter");

-ChromeUtils.defineModuleGetter(this, "console",
-  "resource://gre/modules/Console.jsm");
-
 this.EXPORTED_SYMBOLS = ["AbstractTreeItem"];

 /**
--- a/devtools/client/shared/widgets/VariablesViewController.jsm
+++ b/devtools/client/shared/widgets/VariablesViewController.jsm
@ -25,9 +25,6 @@ XPCOMUtils.defineLazyGetter(this, "VARIABLES_SORTING_ENABLED", () =>
  Services.prefs.getBoolPref("devtools.debugger.ui.variables-sorting-enabled")
 );

-ChromeUtils.defineModuleGetter(this, "console",
-  "resource://gre/modules/Console.jsm");
-
 const MAX_LONG_STRING_LENGTH = 200000;
 const MAX_PROPERTY_ITEMS = 2000;
 const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties";
--- a/devtools/client/styleeditor/StyleEditorUI.jsm
+++ b/devtools/client/styleeditor/StyleEditorUI.jsm
@ -25,7 +25,6 @@ const {StyleSheetEditor} = require("resource://devtools/client/styleeditor/Style
 const {PluralForm} = require("devtools/shared/plural-form");
 const {PrefObserver} = require("devtools/client/shared/prefs");
 const csscoverage = require("devtools/shared/fronts/csscoverage");
-const {console} = require("resource://gre/modules/Console.jsm");
 const {KeyCodes} = require("devtools/client/shared/keycodes");
 const {OriginalSource} = require("devtools/client/styleeditor/original-source");

--- a/devtools/client/styleeditor/StyleEditorUtil.jsm
+++ b/devtools/client/styleeditor/StyleEditorUtil.jsm
@ -21,7 +21,6 @@ const PROPERTIES_URL = "chrome://devtools/locale/styleeditor.properties";

 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const Services = require("Services");
-const console = require("resource://gre/modules/Console.jsm").console;
 const gStringBundle = Services.strings.createBundle(PROPERTIES_URL);

 /**
--- a/devtools/client/styleeditor/StyleSheetEditor.jsm
+++ b/devtools/client/styleeditor/StyleSheetEditor.jsm
@ -11,7 +11,6 @@ const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {}
 const Editor = require("devtools/client/sourceeditor/editor");
 const promise = require("promise");
 const {shortSource, prettifyCSS} = require("devtools/shared/inspector/css-logic");
-const {console} = require("resource://gre/modules/Console.jsm");
 const Services = require("Services");
 const EventEmitter = require("devtools/shared/old-event-emitter");
 const {Task} = require("devtools/shared/task");
--- a/devtools/server/tests/unit/head_dbg.js
+++ b/devtools/server/tests/unit/head_dbg.js
@ -21,7 +21,6 @@ _appInfo.updateAppInfo({
 const { require, loader } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const { worker } = ChromeUtils.import("resource://devtools/shared/worker/loader.js", {});
 const defer = require("devtools/shared/defer");
-const { console } = require("resource://gre/modules/Console.jsm");
 const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");

 const Services = require("Services");
--- a/devtools/shared/Parser.jsm
+++ b/devtools/shared/Parser.jsm
@ -7,7 +7,6 @@

 const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
-const { console } = require("resource://gre/modules/Console.jsm");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");

 ChromeUtils.defineModuleGetter(this,
--- a/devtools/shared/builtin-modules.js
+++ b/devtools/shared/builtin-modules.js
@ -18,7 +18,7 @@ const promise = require("resource://gre/modules/Promise.jsm").Promise;
 const jsmScope = require("resource://gre/modules/Services.jsm");
 const { Services } = jsmScope;
 // Steal various globals only available in JSM scope (and not Sandbox one)
-const { ChromeUtils, HeapSnapshot, XMLHttpRequest,
+const { ChromeUtils, HeapSnapshot, XMLHttpRequest, console,
        atob, btoa, TextEncoder, TextDecoder } = Cu.getGlobalForObject(jsmScope);

 // Create a single Sandbox to access global properties needed in this module.
@ -217,6 +217,7 @@ exports.globals = {
  reportError: Cu.reportError,
  atob: atob,
  btoa: btoa,
+  console: console,
  TextEncoder: TextEncoder,
  TextDecoder: TextDecoder,
  URL,
@ -273,9 +274,6 @@ function lazyGlobal(name, getter) {

 // Lazily define a few things so that the corresponding jsms are only loaded
 // when used.
-lazyGlobal("console", () => {
-  return require("resource://gre/modules/Console.jsm").console;
-});
 lazyGlobal("clearTimeout", () => {
  return require("resource://gre/modules/Timer.jsm").clearTimeout;
 });
--- a/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js
+++ b/devtools/shared/pretty-fast/tests/unit/head_pretty-fast.js
@ -5,7 +5,6 @@ const { require } = ChromeUtils.import("resource://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 } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});

 // Register a console listener, so console messages don't just disappear
 // into the ether.
--- a/devtools/shared/webconsole/test/common.js
+++ b/devtools/shared/webconsole/test/common.js
@ -10,8 +10,6 @@
   closeDebugger, checkConsoleAPICalls, checkRawHeaders, runTests, nextTest, Ci, Cc,
   withActiveServiceWorker, Services */

-// This gives logging to stdout for tests
-const {console} = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 const {DebuggerServer} = require("devtools/server/main");
 const {DebuggerClient} = require("devtools/shared/client/debugger-client");
--- a/devtools/shared/worker/worker.js
+++ b/devtools/shared/worker/worker.js
@ -17,7 +17,7 @@
    const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
    this.isWorker = false;
    this.Promise = require("resource://gre/modules/Promise.jsm").Promise;
-    this.console = require("resource://gre/modules/Console.jsm").console;
+    this.console = console;
    factory.call(
      this, require, this, { exports: this },
      { Cc, Ci, Cu }, ChromeWorker, null
--- a/devtools/shim/devtools-startup.js
+++ b/devtools/shim/devtools-startup.js
@ -697,7 +697,6 @@ DevToolsStartup.prototype = {
    if (!window) {
      let require = this.initDevTools("CommandLine");
      let { HUDService } = require("devtools/client/webconsole/hudservice");
-      let { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
      HUDService.toggleBrowserConsole().catch(console.error);
    } else {
      // the Browser Console was already open
@ -725,14 +724,12 @@ DevToolsStartup.prototype = {
        return Services.prefs.getBoolPref(pref);
      });
    } catch (ex) {
-      let { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
      console.error(ex);
      return false;
    }
    if (!remoteDebuggingEnabled) {
      let errorMsg = "Could not run chrome debugger! You need the following " +
                     "prefs to be set to true: " + kDebuggerPrefs.join(", ");
-      let { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
      console.error(new Error(errorMsg));
      // Dump as well, as we're doing this from a commandline, make sure people
      // don't miss it:
--- a/intl/l10n/Localization.jsm
+++ b/intl/l10n/Localization.jsm
@ -423,7 +423,6 @@ function keysFromContext(method, ctx, keys, translations) {
    }

    if (messageErrors.length) {
-      const { console } = ChromeUtils.import("resource://gre/modules/Console.jsm", {});
      messageErrors.forEach(error => console.warn(error));
    }
  });
--- a/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
+++ b/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
@ -18,7 +18,6 @@ var TalosParentProfiler;

 (function() {
  ChromeUtils.import("resource://gre/modules/Services.jsm");
-  ChromeUtils.import("resource://gre/modules/Console.jsm");

  // Whether or not this TalosContentProfiler object has had initFromObject
  // or initFromURLQueryParams called on it. Any functions that change the
--- a/toolkit/components/addoncompat/CompatWarning.jsm
+++ b/toolkit/components/addoncompat/CompatWarning.jsm
@ -8,9 +8,6 @@ ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");

-ChromeUtils.defineModuleGetter(this, "console",
-                               "resource://gre/modules/Console.jsm");
-
 function section(number, url) {
  const baseURL = "https://developer.mozilla.org/en-US/Firefox/Multiprocess_Firefox/Limitations_of_chrome_scripts";
  return { number, url: baseURL + url };
--- a/toolkit/components/places/PlacesTransactions.jsm
+++ b/toolkit/components/places/PlacesTransactions.jsm
@ -180,8 +180,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.defineModuleGetter(this, "PlacesUtils",
                               "resource://gre/modules/PlacesUtils.jsm");
-ChromeUtils.defineModuleGetter(this, "console",
-                               "resource://gre/modules/Console.jsm");

 Cu.importGlobalProperties(["URL"]);

--- a/toolkit/modules/E10SUtils.jsm
+++ b/toolkit/modules/E10SUtils.jsm
@ -15,8 +15,6 @@ XPCOMUtils.defineLazyPreferenceGetter(this, "allowLinkedWebInFileUriProcess",
                                      "browser.tabs.remote.allowLinkedWebInFileUriProcess", false);
 ChromeUtils.defineModuleGetter(this, "Utils",
                               "resource://gre/modules/sessionstore/Utils.jsm");
-ChromeUtils.defineModuleGetter(this, "console",
-                               "resource://gre/modules/Console.jsm");

 function getAboutModule(aURL) {
  // Needs to match NS_GetAboutModuleName
--- a/toolkit/modules/Sqlite.jsm
+++ b/toolkit/modules/Sqlite.jsm
@ -22,7 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  FileUtils: "resource://gre/modules/FileUtils.jsm",
  Task: "resource://gre/modules/Task.jsm",
  PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
-  console: "resource://gre/modules/Console.jsm",
 });

 XPCOMUtils.defineLazyServiceGetter(this, "FinalizationWitnessService",