Bug 1190857 - Add loader alias to DevTools loader exports. r=jryans

browser/devtools/animationinspector/animation-controller.js

@@ -9,7 +9,7 @@
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/Task.jsm");
-let { devtools: loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm");
+let { loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm");
 Cu.import("resource://gre/modules/devtools/Console.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 

browser/devtools/framework/gDevTools.jsm

@@ -10,7 +10,7 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-const {require, devtools: loader} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { require, loader } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 // Load target and toolbox lazily as they need gDevTools to be fully initialized
 loader.lazyRequireGetter(this, "TargetFactory", "devtools/framework/target", true);
 loader.lazyRequireGetter(this, "Toolbox", "devtools/framework/toolbox", true);

browser/devtools/performance/performance-controller.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-const { devtools: loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
 const { Task } = require("resource://gre/modules/Task.jsm");
 const { Heritage, ViewHelpers, WidgetMethods } = require("resource:///modules/devtools/ViewHelpers.jsm");

browser/devtools/scratchpad/scratchpad.js

@@ -43,7 +43,7 @@ const FALLBACK_CHARSET_LIST = "intl.fallbackCharsetList.ISO-8859-1";
 
 const VARIABLES_VIEW_URL = "chrome://browser/content/devtools/widgets/VariablesView.xul";
 
-const {require, devtools: loader} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const {require, loader} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
 const Telemetry = require("devtools/shared/telemetry");
 const Editor    = require("devtools/sourceeditor/editor");

browser/devtools/shared/frame-script-utils.js

@@ -4,14 +4,14 @@
 
 "use strict";
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-devtools.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise");
-devtools.lazyImporter(this, "Task", "resource://gre/modules/Task.jsm", "Task");
-const loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
-            .getService(Ci.mozIJSSubScriptLoader);
+const { loader } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+loader.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise");
+loader.lazyImporter(this, "Task", "resource://gre/modules/Task.jsm", "Task");
+const subScriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
+                          .getService(Ci.mozIJSSubScriptLoader);
 let EventUtils = {};
-loader.loadSubScript("chrome://marionette/content/EventUtils.js", EventUtils);
-devtools.lazyGetter(this, "nsIProfilerModule", () => {
+subScriptLoader.loadSubScript("chrome://marionette/content/EventUtils.js", EventUtils);
+loader.lazyGetter(this, "nsIProfilerModule", () => {
   return Cc["@mozilla.org/tools/profiler;1"].getService(Ci.nsIProfiler);
 });
 

browser/devtools/webaudioeditor/includes.js

@@ -10,7 +10,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 Cu.import("resource:///modules/devtools/gDevTools.jsm");
 
-const { devtools: loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
 let { console } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let { EventTarget } = require("sdk/event/target");

toolkit/devtools/Loader.jsm

@@ -17,11 +17,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil", "resource://gre/modules/NetUt
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
-let loader = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {}).Loader;
+let { Loader } = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
 let promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 
 this.EXPORTED_SYMBOLS = ["DevToolsLoader", "devtools", "BuiltinProvider",
-                         "SrcdirProvider", "require"];
+                         "SrcdirProvider", "require", "loader"];
 
 /**
  * Providers are different strategies for loading the devtools.
@@ -29,7 +29,7 @@ this.EXPORTED_SYMBOLS = ["DevToolsLoader", "devtools", "BuiltinProvider",
 
 let loaderModules = {
   "Services": Object.create(Services),
-  "toolkit/loader": loader,
+  "toolkit/loader": Loader,
   "PromiseDebugging": PromiseDebugging
 };
 XPCOMUtils.defineLazyGetter(loaderModules, "Debugger", () => {
@@ -70,7 +70,7 @@ let sharedGlobalBlacklist = ["sdk/indexed-db"];
 function BuiltinProvider() {}
 BuiltinProvider.prototype = {
   load: function() {
-    this.loader = new loader.Loader({
+    this.loader = new Loader.Loader({
       id: "fx-devtools",
       modules: loaderModules,
       paths: {
@@ -113,7 +113,7 @@ BuiltinProvider.prototype = {
   },
 
   unload: function(reason) {
-    loader.unload(this.loader, reason);
+    Loader.unload(this.loader, reason);
     delete this.loader;
   },
 };
@@ -157,7 +157,7 @@ SrcdirProvider.prototype = {
     let acornWalkURI = OS.Path.join(acornURI, "walk.js");
     let ternURI = OS.Path.join(toolkitDir, "tern");
     let sourceMapURI = this.fileURI(OS.Path.join(toolkitDir, "sourcemap", "source-map.js"));
-    this.loader = new loader.Loader({
+    this.loader = new Loader.Loader({
       id: "fx-devtools",
       modules: loaderModules,
       paths: {
@@ -195,7 +195,7 @@ SrcdirProvider.prototype = {
   },
 
   unload: function(reason) {
-    loader.unload(this.loader, reason);
+    Loader.unload(this.loader, reason);
     delete this.loader;
   },
 
@@ -346,8 +346,8 @@ DevToolsLoader.prototype = {
    * @returns The module's exports.
    */
   loadURI: function(id, uri) {
-    let module = loader.Module(id, uri);
-    return loader.load(this.provider.loader, module).exports;
+    let module = Loader.Module(id, uri);
+    return Loader.load(this.provider.loader, module).exports;
   },
 
   /**
@@ -366,7 +366,7 @@ DevToolsLoader.prototype = {
       return;
     }
     this._mainid = id;
-    this._main = loader.main(this.provider.loader, id);
+    this._main = Loader.main(this.provider.loader, id);
 
     // Mirror the main module's exports on this object.
     Object.getOwnPropertyNames(this._main).forEach(key => {
@@ -411,7 +411,7 @@ DevToolsLoader.prototype = {
     });
 
     this._provider.load();
-    this.require = loader.Require(this._provider.loader, { id: "devtools" });
+    this.require = Loader.Require(this._provider.loader, { id: "devtools" });
 
     if (this._mainid) {
       this.main(this._mainid);
@@ -457,6 +457,6 @@ DevToolsLoader.prototype = {
 };
 
 // Export the standard instance of DevToolsLoader used by the tools.
-this.devtools = new DevToolsLoader();
+this.devtools = this.loader = new DevToolsLoader();
 
 this.require = this.devtools.require.bind(this.devtools);