Bug 1195825 - Replace Cu.import(Promise.jsm) by require(promise) in devtools. r=jryans

browser/devtools/animationinspector/test/head.js

@@ -7,7 +7,7 @@
 const Cu = Components.utils;
 const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {TargetFactory} = require("devtools/framework/target");
 const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 const {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {});

browser/devtools/canvasdebugger/canvasdebugger.js

@@ -12,7 +12,7 @@ Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 Cu.import("resource://gre/modules/devtools/Console.jsm");
 
 const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { CallWatcherFront } = require("devtools/server/actors/call-watcher");
 const { CanvasFront } = require("devtools/server/actors/canvas");

browser/devtools/canvasdebugger/panel.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { CanvasFront } = require("devtools/server/actors/canvas");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");

browser/devtools/canvasdebugger/test/head.js

@@ -13,10 +13,10 @@ 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 { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
+let promise = require("promise");
 let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { DebuggerServer } = require("devtools/server/main");
 let { CallWatcherFront } = require("devtools/server/actors/call-watcher");

browser/devtools/debugger/panel.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 

browser/devtools/eyedropper/eyedropper.js

@@ -6,7 +6,7 @@ const {Cc, Ci, Cu} = require("chrome");
 const {rgbToHsl} = require("devtools/css-color").colorUtils;
 const Telemetry = require("devtools/shared/telemetry");
 const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js");
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const promise = require("promise");
 const {setTimeout, clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
 
 Cu.import("resource://gre/modules/Services.jsm");

browser/devtools/framework/ToolboxProcess.jsm

@@ -20,7 +20,7 @@ XPCOMUtils.defineLazyGetter(this, "Telemetry", function () {
 XPCOMUtils.defineLazyGetter(this, "EventEmitter", function () {
   return require("devtools/toolkit/event-emitter");
 });
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 this.EXPORTED_SYMBOLS = ["BrowserToolboxProcess"];
 

browser/devtools/framework/connect/connect.js

@@ -14,7 +14,7 @@ let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
 let {Toolbox} = require("devtools/framework/toolbox")
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 let {DebuggerClient} = require("devtools/toolkit/client/main");
 
 let gClient;

browser/devtools/framework/gDevTools.jsm

@@ -11,12 +11,11 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 const { require, loader } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const promise = require("promise");
 // 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);
 
-XPCOMUtils.defineLazyModuleGetter(this, "promise",
-                                  "resource://gre/modules/Promise.jsm", "Promise");
 XPCOMUtils.defineLazyModuleGetter(this, "console",
                                   "resource://gre/modules/devtools/Console.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",

browser/devtools/framework/target.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
-const {Promise: promise} = require("resource://gre/modules/Promise.jsm");
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");

browser/devtools/framework/toolbox-highlighter-utils.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
-const {Promise: promise} = require("resource://gre/modules/Promise.jsm");
+const promise = require("promise");
 Cu.import("resource://gre/modules/Task.jsm");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 

browser/devtools/framework/toolbox-hosts.js

@@ -7,7 +7,7 @@
 
 const {Cu} = require("chrome");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const {Promise: promise} = require("resource://gre/modules/Promise.jsm");
+const promise = require("promise");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
 

browser/devtools/framework/toolbox.js

@@ -18,7 +18,7 @@ const OS_IS_64_BITS = "DEVTOOLS_OS_IS_64_BITS_PER_USER";
 const SCREENSIZE_HISTOGRAM = "DEVTOOLS_SCREEN_RESOLUTION_ENUMERATED_PER_USER";
 
 let {Cc, Ci, Cu} = require("chrome");
-let {Promise: promise} = require("resource://gre/modules/Promise.jsm");
+let promise = require("promise");
 let EventEmitter = require("devtools/toolkit/event-emitter");
 let Telemetry = require("devtools/shared/telemetry");
 let HUDService = require("devtools/webconsole/hudservice");

browser/devtools/inspector/breadcrumbs.js

@@ -9,7 +9,7 @@
 const {Cu, Ci} = require("chrome");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-const {Promise: promise} = require("resource://gre/modules/Promise.jsm");
+const promise = require("promise");
 
 const ENSURE_SELECTION_VISIBLE_DELAY = 50; // ms
 const ELLIPSIS = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data;

browser/devtools/inspector/inspector-panel.js

@@ -8,7 +8,7 @@ const {Cc, Ci, Cu, Cr} = require("chrome");
 
 Cu.import("resource://gre/modules/Services.jsm");
 
-let promise = require("resource://gre/modules/Promise.jsm").Promise;
+let promise = require("promise");
 let EventEmitter = require("devtools/toolkit/event-emitter");
 let clipboard = require("sdk/clipboard");
 let {HostType} = require("devtools/framework/toolbox").Toolbox;

browser/devtools/inspector/selector-search.js

@@ -6,7 +6,7 @@
 
 const { Cu } = require("chrome");
 
-const promise = require("resource://gre/modules/Promise.jsm").Promise;
+const promise = require("promise");
 loader.lazyGetter(this, "EventEmitter", () => require("devtools/toolkit/event-emitter"));
 loader.lazyGetter(this, "AutocompletePopup", () => require("devtools/shared/autocomplete-popup").AutocompletePopup);
 

browser/devtools/inspector/test/head.js

@@ -19,7 +19,6 @@ const Cc = Components.classes;
 const TEST_URL_ROOT = "http://example.com/browser/browser/devtools/inspector/test/";
 const ROOT_TEST_DIR = getRootDirectory(gTestPath);
 const FRAME_SCRIPT_URL = ROOT_TEST_DIR + "doc_frame_script.js";
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 
 // All test are asynchronous
 waitForExplicitFinish();
@@ -28,6 +27,7 @@ let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+let promise = require("promise");
 
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));

browser/devtools/layoutview/test/head.js

@@ -7,9 +7,9 @@
 const Cu = Components.utils;
 let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-let {console} = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {});
+let promise = require("promise");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 // All test are asynchronous

browser/devtools/markupview/markup-view.js

@@ -24,7 +24,7 @@ const {UndoStack} = require("devtools/shared/undo");
 const {editableField, InplaceEditor} = require("devtools/shared/inplace-editor");
 const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 const {HTMLEditor} = require("devtools/markupview/html-editor");
-const promise = require("resource://gre/modules/Promise.jsm").Promise;
+const promise = require("promise");
 const {Tooltip} = require("devtools/shared/widgets/Tooltip");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const Heritage = require("sdk/core/heritage");

browser/devtools/markupview/test/head.js

@@ -6,7 +6,7 @@ const Cu = Components.utils;
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-let promise = require("resource://gre/modules/Promise.jsm").Promise;
+let promise = require("promise");
 let {getInplaceEditorForSpan: inplaceEditor} = require("devtools/shared/inplace-editor");
 let clipboard = require("sdk/clipboard");
 let {setTimeout, clearTimeout} = require("sdk/timers");

browser/devtools/netmonitor/netmonitor-controller.js

@@ -118,7 +118,7 @@ Cu.import("resource:///modules/devtools/VariablesViewController.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const Editor = require("devtools/sourceeditor/editor");
 const {Tooltip} = require("devtools/shared/widgets/Tooltip");

browser/devtools/netmonitor/panel.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 

browser/devtools/netmonitor/test/head.js

@@ -6,10 +6,10 @@ 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 { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { CurlUtils } = Cu.import("resource:///modules/devtools/Curl.jsm", {});
+let promise = require("promise");
 let NetworkHelper = require("devtools/toolkit/webconsole/network-helper");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 let { TargetFactory } = require("devtools/framework/target");

browser/devtools/performance/test/head.js

@@ -7,13 +7,13 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 let { Preferences } = Cu.import("resource://gre/modules/Preferences.jsm", {});
 let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-let { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-let { TargetFactory } = require("devtools/framework/target");
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
-let { DebuggerServer } = require("devtools/server/main");
 let { console } = require("resource://gre/modules/devtools/Console.jsm");
+let { TargetFactory } = require("devtools/framework/target");
+let Promise = require("promise");
+let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+let { DebuggerServer } = require("devtools/server/main");
 let { merge } = require("sdk/util/object");
 let { createPerformanceFront } = require("devtools/server/actors/performance");
 let RecordingUtils = require("devtools/toolkit/performance/utils");

browser/devtools/responsivedesign/responsivedesign.jsm

@@ -12,7 +12,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/gDevTools.jsm");
 Cu.import("resource://gre/modules/devtools/event-emitter.js");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "SystemAppProxy",
                                   "resource://gre/modules/SystemAppProxy.jsm");
 
@@ -21,6 +20,7 @@ let Telemetry = require("devtools/shared/telemetry");
 let { showDoorhanger } = require("devtools/shared/doorhanger");
 let { TouchEventSimulator } = require("devtools/toolkit/touch/simulator");
 let { Task } = require("resource://gre/modules/Task.jsm");
+let promise = require("promise");
 
 this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"];
 

browser/devtools/responsivedesign/test/head.js

@@ -3,11 +3,10 @@
 
 "use strict";
 
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
-
 let {require} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+let promise = require("promise");
 
 // Import the GCLI test helper
 let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));

browser/devtools/scratchpad/scratchpad-panel.js

@@ -7,7 +7,7 @@
 
 const {Cu} = require("chrome");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 
 function ScratchpadPanel(iframeWindow, toolbox) {

browser/devtools/scratchpad/scratchpad.js

@@ -51,8 +51,8 @@ const TargetFactory = require("devtools/framework/target").TargetFactory;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {DevToolsWorker} = require("devtools/toolkit/shared/worker");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+const promise = require("promise");
 
-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");

browser/devtools/scratchpad/test/head.js

@@ -6,11 +6,11 @@
 
 const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+const promise = require("promise");
 
 
 let gScratchpadWindow; // Reference to the Scratchpad chrome window object

browser/devtools/shadereditor/panel.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const { Cc, Ci, Cu, Cr } = require("chrome");
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { WebGLFront } = require("devtools/server/actors/webgl");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");

browser/devtools/shadereditor/shadereditor.js

@@ -13,7 +13,7 @@ Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 Cu.import("resource://gre/modules/devtools/Console.jsm");
 
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {Tooltip} = require("devtools/shared/widgets/Tooltip");
 const Editor = require("devtools/sourceeditor/editor");

browser/devtools/shadereditor/test/head.js

@@ -11,10 +11,10 @@ let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
 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 { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
+let promise = require("promise");
 let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { DebuggerServer } = require("devtools/server/main");
 let { WebGLFront } = require("devtools/server/actors/webgl");

browser/devtools/shared/AppCacheUtils.jsm

@@ -30,7 +30,8 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 let { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
 let { Services }   = Cu.import("resource://gre/modules/Services.jsm", {});
 let { LoadContextInfo } = Cu.import("resource://gre/modules/LoadContextInfo.jsm", {});
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+let promise = require("promise");
 
 this.EXPORTED_SYMBOLS = ["AppCacheUtils"];
 

browser/devtools/shared/DeveloperToolbar.jsm

@@ -15,6 +15,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { TargetFactory } = require("devtools/framework/target");
+const promise = require("promise");
 
 const Node = Ci.nsIDOMNode;
 
@@ -61,8 +62,6 @@ Object.defineProperty(this, "ConsoleServiceListener", {
   enumerable: true
 });
 
-const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
-
 /**
  * A collection of utilities to help working with commands
  */

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

@@ -4,8 +4,8 @@
 
 "use strict";
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-const { loader } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-loader.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise");
+const {require, loader} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const promise = require("promise");
 loader.lazyImporter(this, "Task", "resource://gre/modules/Task.jsm", "Task");
 const subScriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
                           .getService(Ci.mozIJSSubScriptLoader);

browser/devtools/shared/test/browser_inplace-editor-01.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 let {editableField, getInplaceEditorForSpan: inplaceEditor} = require("devtools/shared/inplace-editor");
 
 // Test the inplace-editor behavior.

browser/devtools/shared/test/browser_inplace-editor-02.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 let {editableField, getInplaceEditorForSpan: inplaceEditor} = require("devtools/shared/inplace-editor");
+let promise = require("promise");
 
 // Test that the trimOutput option for the inplace editor works correctly.
 

browser/devtools/shared/test/browser_mdn-docs-01.js

@@ -22,7 +22,7 @@
 
 const {CssDocsTooltip} = require("devtools/shared/widgets/Tooltip");
 const {setBaseCssDocsUrl, MdnDocsWidget} = require("devtools/shared/widgets/MdnDocsWidget");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 // frame to load the tooltip into
 const MDN_DOCS_TOOLTIP_FRAME = "chrome://browser/content/devtools/mdn-docs-frame.xhtml";

browser/devtools/shared/test/browser_tableWidget_mouse_interaction.js

@@ -15,8 +15,7 @@ const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
 const TEST_OPT = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
 const {TableWidget} = require("devtools/shared/widgets/TableWidget");
-let {Task} = require("resource://gre/modules/Task.jsm");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
+const Promise = require("promise");
 
 let doc, table;
 

browser/devtools/shared/test/browser_treeWidget_keyboard_interaction.js

@@ -9,7 +9,7 @@ const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
   "rel='stylesheet' type='text/css' href='chrome://browser/skin/devtools/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/shared/widgets/TreeWidget");
-const {Promise} = require("resource://gre/modules/Promise.jsm");
+const Promise = require("promise");
 
 add_task(function*() {
   yield promiseTab("about:blank");

browser/devtools/shared/test/browser_treeWidget_mouse_interaction.js

@@ -9,7 +9,7 @@ const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
   "rel='stylesheet' type='text/css' href='chrome://browser/skin/devtools/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/shared/widgets/TreeWidget");
-const {Promise} = require("resource://gre/modules/Promise.jsm");
+const Promise = require("promise");
 
 add_task(function*() {
   yield promiseTab("about:blank");

browser/devtools/shared/widgets/MdnDocsWidget.js

@@ -26,7 +26,7 @@
 
 const {Cc, Cu, Ci} = require("chrome");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Promise.jsm");
+const Promise = require("promise");
 const DOMUtils = Cc["@mozilla.org/inspector/dom-utils;1"]
                  .getService(Ci.inIDOMUtils);
 

browser/devtools/shared/widgets/Tooltip.js

@@ -8,7 +8,7 @@
    VariablesViewController, Task */
 
 const {Cu, Ci} = require("chrome");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {Spectrum} = require("devtools/shared/widgets/Spectrum");
 const {CubicBezierWidget} =
       require("devtools/shared/widgets/CubicBezierWidget");

browser/devtools/shared/widgets/VariablesView.jsm

@@ -21,10 +21,10 @@ 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/event-emitter.js");
+Cu.import("resource://gre/modules/Task.jsm");
 const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
-Cu.import("resource://gre/modules/Task.jsm");
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
   "resource://gre/modules/PluralForm.jsm");

browser/devtools/shared/widgets/VariablesViewController.jsm

@@ -9,10 +9,10 @@ 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");
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+let promise = require("promise");
 
 Object.defineProperty(this, "WebConsoleUtils", {
   get: function() {

browser/devtools/sourceeditor/debugger.js

@@ -6,7 +6,7 @@
 
 const {Cu} = require("chrome");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const dbginfo = new WeakMap();
 
 // These functions implement search within the debugger. Since

browser/devtools/sourceeditor/editor.js

@@ -29,7 +29,7 @@ const MAX_VERTICAL_OFFSET = 3;
 const RE_SCRATCHPAD_ERROR = /(?:@Scratchpad\/\d+:|\()(\d+):?(\d+)?(?:\)|\n)/;
 const RE_JUMP_TO_LINE = /^(\d+):?(\d+)?/;
 
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const events  = require("devtools/toolkit/event-emitter");
 const { PrefObserver } = require("devtools/styleeditor/utils");
 

browser/devtools/sourceeditor/test/head.js

@@ -6,7 +6,7 @@
 
 const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const Editor  = require("devtools/sourceeditor/editor");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 DevToolsUtils.testing = true;

browser/devtools/storage/test/head.js

@@ -4,9 +4,11 @@
 
 "use strict";
 
+let { console } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { TargetFactory } = require("devtools/framework/target");
-let { console } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
+let promise = require("promise");
+let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 const SPLIT_CONSOLE_PREF = "devtools.toolbox.splitconsoleEnabled";
 const STORAGE_PREF = "devtools.storage.enabled";
@@ -17,9 +19,6 @@ const MAIN_DOMAIN = "http://test1.example.org/" + PATH;
 const ALT_DOMAIN = "http://sectest1.example.org/" + PATH;
 const ALT_DOMAIN_SECURED = "https://sectest1.example.org:443/" + PATH;
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
-
 waitForExplicitFinish();
 
 let gToolbox, gPanelWindow, gWindow, gUI;

browser/devtools/styleeditor/StyleEditorUI.jsm

@@ -21,7 +21,6 @@ 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");
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
                                   "resource://gre/modules/PluralForm.jsm");
@@ -30,6 +29,7 @@ const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { PrefObserver, PREF_ORIG_SOURCES } = require("devtools/styleeditor/utils");
 const csscoverage = require("devtools/server/actors/csscoverage");
 const console = require("resource://gre/modules/devtools/Console.jsm").console;
+const promise = require("promise");
 
 const LOAD_ERROR = "error-load";
 const STYLE_EDITOR_TEMPLATE = "stylesheet";

browser/devtools/styleeditor/StyleSheetEditor.jsm

@@ -13,7 +13,7 @@ const Cu = Components.utils;
 
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const Editor  = require("devtools/sourceeditor/editor");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 const {console} = require("resource://gre/modules/devtools/Console.jsm");
 

browser/devtools/styleeditor/styleeditor-panel.js

@@ -9,7 +9,7 @@ const {Cc, Ci, Cu, Cr} = require("chrome");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 let EventEmitter = require("devtools/toolkit/event-emitter");
 
 Cu.import("resource:///modules/devtools/StyleEditorUI.jsm");

browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js

@@ -5,7 +5,8 @@
 "use strict";
 
 Components.utils.import("resource://gre/modules/Task.jsm");
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let {require} = Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {});
+let promise = require("promise");
 
 const TESTCASE_URI_HTML = TEST_BASE_HTTP + "sourcemaps-watching.html";
 const TESTCASE_URI_CSS = TEST_BASE_HTTP + "sourcemap-css/sourcemaps.css";

browser/devtools/styleeditor/test/head.js

@@ -10,7 +10,7 @@ const TEST_HOST = 'mochi.test:8888';
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 // Import the GCLI test helper

browser/devtools/styleinspector/computed-view.js

@@ -14,7 +14,7 @@ const {Cc, Ci, Cu} = require("chrome");
 const ToolDefinitions = require("main").Tools;
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 const {ELEMENT_STYLE} = require("devtools/server/actors/styles");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {setTimeout, clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
 const {OutputParser} = require("devtools/output-parser");
 const {PrefObserver, PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils");

browser/devtools/styleinspector/rule-view.js

@@ -11,7 +11,7 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {setTimeout, clearTimeout} =
       Cu.import("resource://gre/modules/Timer.jsm", {});
 const {CssLogic} = require("devtools/styleinspector/css-logic");

browser/devtools/styleinspector/style-inspector-overlays.js

@@ -21,7 +21,7 @@ const {
   SwatchFilterTooltip
 } = require("devtools/shared/widgets/Tooltip");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 

browser/devtools/styleinspector/style-inspector.js

@@ -9,7 +9,7 @@
 "use strict";
 
 const {Cc, Cu, Ci} = require("chrome");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {Tools} = require("main");
 Cu.import("resource://gre/modules/Services.jsm");
 const {PREF_ORIG_SOURCES} = require("devtools/styleeditor/utils");

browser/devtools/styleinspector/test/doc_frame_script.js

@@ -19,7 +19,7 @@ let {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {CssLogic} = require("devtools/styleinspector/css-logic");
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 
 /**
  * Get a value for a given property name in a css rule in a stylesheet, given

browser/devtools/styleinspector/test/head.js

@@ -12,7 +12,7 @@ let {CssComputedView} = require("devtools/styleinspector/computed-view");
 let {CssRuleView, _ElementStyle} = require("devtools/styleinspector/rule-view");
 let {CssLogic, CssSelector} = require("devtools/styleinspector/css-logic");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 let {editableField, getInplaceEditorForSpan: inplaceEditor} =
   require("devtools/shared/inplace-editor");
 let {console} =

browser/devtools/styleinspector/utils.js

@@ -13,7 +13,7 @@ const {setTimeout, clearTimeout} =
       Cu.import("resource://gre/modules/Timer.jsm", {});
 const {parseDeclarations} =
       require("devtools/styleinspector/css-parsing-utils");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 loader.lazyServiceGetter(this, "domUtils",
   "@mozilla.org/inspector/dom-utils;1", "inIDOMUtils");

browser/devtools/webaudioeditor/includes.js

@@ -32,7 +32,7 @@ loader.lazyRequireGetter(this, "LineGraphWidget",
 let AUDIO_NODE_DEFINITION;
 
 // Override DOM promises with Promise.jsm helpers
-const { defer, all } = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+const { defer, all } = require("promise");
 
 /* Events fired on `window` to indicate state or actions*/
 const EVENTS = {

browser/devtools/webaudioeditor/panel.js

@@ -8,7 +8,7 @@
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { WebAudioFront } = require("devtools/server/actors/webaudio");
-let Promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+let Promise = require("promise");
 
 function WebAudioEditorPanel (iframeWindow, toolbox) {
   this.panelWin = iframeWindow;

browser/devtools/webaudioeditor/test/head.js

@@ -12,13 +12,13 @@ let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
 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 { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { TargetFactory } = require("devtools/framework/target");
 let { DebuggerServer } = require("devtools/server/main");
 let { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
 
+let Promise = require("promise");
 let { WebAudioFront } = require("devtools/server/actors/webaudio");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 let audioNodes = require("devtools/server/actors/utils/audionodes.json");

browser/devtools/webconsole/hudservice.js

@@ -12,10 +12,10 @@ let WebConsoleUtils = require("devtools/toolkit/webconsole/utils").Utils;
 let Heritage = require("sdk/core/heritage");
 let {TargetFactory} = require("devtools/framework/target");
 let {Tools} = require("definitions");
+let promise = require("promise");
 
 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, "Services", "resource://gre/modules/Services.jsm");
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);

browser/devtools/webconsole/panel.js

@@ -5,8 +5,8 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
+const promise = require("promise");
 
-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"));
 

browser/devtools/webconsole/test/head.js

@@ -7,9 +7,9 @@
 
 let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 let {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+let promise = require("promise");
 let {TargetFactory} = require("devtools/framework/target");
 let {Utils: WebConsoleUtils} = require("devtools/toolkit/webconsole/utils");
 let {Messages} = require("devtools/webconsole/console-output");

browser/devtools/webconsole/webconsole.js

@@ -9,12 +9,12 @@
 const {Cc, Ci, Cu} = require("chrome");
 
 const {Utils: WebConsoleUtils, CONSOLE_WORKER_IDS} = require("devtools/toolkit/webconsole/utils");
+const promise = require("promise");
 
 loader.lazyServiceGetter(this, "clipboardHelper",
                          "@mozilla.org/widget/clipboardhelper;1",
                          "nsIClipboardHelper");
 loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");
-loader.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Promise");
 loader.lazyGetter(this, "EventEmitter", () => require("devtools/toolkit/event-emitter"));
 loader.lazyGetter(this, "AutocompletePopup",
                   () => require("devtools/shared/autocomplete-popup").AutocompletePopup);

browser/devtools/webide/content/webide.js

@@ -16,7 +16,7 @@ const {AppProjects} = require("devtools/app-manager/app-projects");
 const {Connection} = require("devtools/client/connection-manager");
 const {AppManager} = require("devtools/webide/app-manager");
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const ProjectEditor = require("projecteditor/projecteditor");
 const {GetAvailableAddons} = require("devtools/webide/addons");
 const {getJSON} = require("devtools/shared/getjson");

browser/devtools/webide/modules/addons.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const {Cu} = require("chrome");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm");
+const promise = require("promise");
 const {AddonManager} = Cu.import("resource://gre/modules/AddonManager.jsm");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");
 const {getJSON} = require("devtools/shared/getjson");

browser/devtools/webide/modules/app-manager.js

@@ -4,8 +4,7 @@
 
 const {Cu} = require("chrome");
 
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
-
+const promise = require("promise");
 const {TargetFactory} = require("devtools/framework/target");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");
 const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm");

browser/devtools/webide/modules/project-list.js

@@ -7,7 +7,7 @@ const {Cu} = require("chrome");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");
 const {AppProjects} = require("devtools/app-manager/app-projects");
 const {AppManager} = require("devtools/webide/app-manager");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 const utils = require("devtools/webide/utils");

toolkit/devtools/apps/app-actor-front.js

@@ -3,7 +3,7 @@ Cu.import("resource://gre/modules/osfile.jsm");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");
 const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm");
 const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 

toolkit/devtools/apps/tests/unit/test_webappsActor.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 let gAppId = "actor-test";
 const APP_ORIGIN = "app://" + gAppId;

toolkit/devtools/async-utils.js

@@ -15,7 +15,7 @@
 
 let {Cu} = require("chrome");
 let {Task} = require("resource://gre/modules/Task.jsm");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
+let Promise = require("promise");
 
 /**
  * Create an async function from a generator function.

toolkit/devtools/discovery/tests/unit/test_discovery.js

@@ -14,8 +14,7 @@ do_register_cleanup(() => {
 
 const { require } =
   Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const { Promise: promise } =
-  Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const discovery = require("devtools/toolkit/discovery/discovery");
 const { setTimeout, clearTimeout } = require("sdk/timers");

toolkit/devtools/qrcode/index.js

@@ -5,8 +5,7 @@
 "use strict";
 
 const { Cu } = require("chrome");
-const { Promise: promise } =
-  Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 // Lazily require encoder and decoder in case only one is needed
 Object.defineProperty(this, "Encoder", {

toolkit/devtools/qrcode/tests/mochitest/test_decode.html

@@ -14,8 +14,7 @@ window.onload = function() {
   const { utils: Cu } = Components;
   const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
   const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-  const { Promise: promise } =
-    Cu.import("resource://gre/modules/Promise.jsm", {});
+  const promise = require("promise");
 
   const QR = require("devtools/toolkit/qrcode/index");
 

toolkit/devtools/security/tests/unit/head_dbg.js

@@ -10,8 +10,7 @@ const CC = Components.Constructor;
 
 const { require } =
   Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const { Promise: promise } =
-  Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 
 const Services = require("Services");

toolkit/devtools/server/actors/animation.js

@@ -26,7 +26,7 @@
  */
 
 const {Cu} = require("chrome");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 const {setInterval, clearInterval} = require("sdk/timers");
 const protocol = require("devtools/server/protocol");

toolkit/devtools/server/actors/canvas.js

@@ -5,7 +5,7 @@
 
 const {Cc, Ci, Cu, Cr} = require("chrome");
 const events = require("sdk/event/core");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const protocol = require("devtools/server/protocol");
 const {CallWatcherActor, CallWatcherFront} = require("devtools/server/actors/call-watcher");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");

toolkit/devtools/server/actors/device.js

@@ -6,7 +6,7 @@ const {Cc, Ci, Cu, CC} = require("chrome");
 const Services = require("Services");
 const protocol = require("devtools/server/protocol");
 const {method, RetVal} = protocol;
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {LongStringActor} = require("devtools/server/actors/string");
 const {DebuggerServer} = require("devtools/server/main");
 const {getSystemInfo, getSetting} = require("devtools/toolkit/shared/system");

toolkit/devtools/server/actors/inspector.js

@@ -56,7 +56,7 @@ const Services = require("Services");
 const protocol = require("devtools/server/protocol");
 const {Arg, Option, method, RetVal, types} = protocol;
 const {LongStringActor, ShortLongString} = require("devtools/server/actors/string");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 const object = require("sdk/util/object");
 const events = require("sdk/event/core");

toolkit/devtools/server/actors/settings.js

@@ -6,7 +6,7 @@ const {Cc, Ci, Cu, CC} = require("chrome");
 const protocol = require("devtools/server/protocol");
 const {Arg, method, RetVal} = protocol;
 const {DebuggerServer} = require("devtools/server/main");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");

toolkit/devtools/server/actors/string.js

@@ -7,7 +7,7 @@
 let {Cu} = require("chrome");
 let {DebuggerServer} = require("devtools/server/main");
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let promise = require("promise");
 let {Class} = require("sdk/core/heritage");
 
 let protocol = require("devtools/server/protocol");

toolkit/devtools/server/actors/styleeditor.js

@@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const events = require("sdk/event/core");
 const protocol = require("devtools/server/protocol");
 const {Arg, Option, method, RetVal, types} = protocol;

toolkit/devtools/server/actors/styles.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const protocol = require("devtools/server/protocol");
 const {Arg, Option, method, RetVal, types} = protocol;
 const events = require("sdk/event/core");

toolkit/devtools/server/actors/stylesheets.js

@@ -12,7 +12,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const events = require("sdk/event/core");
 const protocol = require("devtools/server/protocol");
 const {Arg, Option, method, RetVal, types} = protocol;

toolkit/devtools/server/actors/webapps.js

@@ -11,8 +11,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
-let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-
+let promise = require("promise");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 let { ActorPool } = require("devtools/server/actors/common");
 let { DebuggerServer } = require("devtools/server/main");

toolkit/devtools/server/tests/unit/head_dbg.js

@@ -10,7 +10,7 @@ const CC = Components.Constructor;
 
 const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { worker } = Cu.import("resource://gre/modules/devtools/worker-loader.js", {})
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 const { promiseInvoke } = require("devtools/async-utils");
 

toolkit/devtools/shared/async-storage.js

@@ -41,7 +41,7 @@
  */
 const {Cc, Ci, Cu, Cr} = require("chrome");
 const {indexedDB} = require("sdk/indexed-db");
-const {Promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const Promise = require("promise");
 
 module.exports = (function() {
   "use strict";

toolkit/devtools/transport/tests/unit/head_dbg.js

@@ -10,8 +10,7 @@ const CC = Components.Constructor;
 
 const { require } =
   Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const { Promise: promise } =
-  Cu.import("resource://gre/modules/Promise.jsm", {});
+const promise = require("promise");
 const { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 
 const Services = require("Services");