From c1a7a7d35d0362020d166f513d67da1ae2327ff8 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Thu, 13 Aug 2015 10:57:15 -0700
Subject: [PATCH] Bug 1193313 - Cleanup promises. r=jryans

---
 browser/devtools/framework/sidebar.js                           | 1 -
 browser/devtools/projecteditor/lib/helpers/promise.js           | 2 +-
 browser/devtools/shared/doorhanger.js                           | 2 +-
 browser/devtools/shared/test/browser_flame-graph-01.js          | 1 -
 browser/devtools/shared/test/browser_flame-graph-02.js          | 1 -
 browser/devtools/shared/test/browser_flame-graph-03a.js         | 1 -
 browser/devtools/shared/test/browser_flame-graph-03b.js         | 1 -
 browser/devtools/shared/test/browser_flame-graph-03c.js         | 1 -
 browser/devtools/shared/test/browser_flame-graph-04.js          | 1 -
 browser/devtools/shared/test/browser_graphs-01.js               | 1 -
 browser/devtools/shared/test/browser_graphs-02.js               | 1 -
 browser/devtools/shared/test/browser_graphs-03.js               | 1 -
 browser/devtools/shared/test/browser_graphs-04.js               | 1 -
 browser/devtools/shared/test/browser_graphs-05.js               | 1 -
 browser/devtools/shared/test/browser_graphs-06.js               | 1 -
 browser/devtools/shared/test/browser_graphs-07a.js              | 1 -
 browser/devtools/shared/test/browser_graphs-07b.js              | 1 -
 browser/devtools/shared/test/browser_graphs-07c.js              | 1 -
 browser/devtools/shared/test/browser_graphs-07d.js              | 1 -
 browser/devtools/shared/test/browser_graphs-07e.js              | 1 -
 browser/devtools/shared/test/browser_graphs-08.js               | 1 -
 browser/devtools/shared/test/browser_graphs-09a.js              | 1 -
 browser/devtools/shared/test/browser_graphs-09b.js              | 1 -
 browser/devtools/shared/test/browser_graphs-09c.js              | 1 -
 browser/devtools/shared/test/browser_graphs-09d.js              | 1 -
 browser/devtools/shared/test/browser_graphs-09e.js              | 1 -
 browser/devtools/shared/test/browser_graphs-09f.js              | 1 -
 browser/devtools/shared/test/browser_graphs-10a.js              | 1 -
 browser/devtools/shared/test/browser_graphs-10b.js              | 1 -
 browser/devtools/shared/test/browser_graphs-10c.js              | 1 -
 browser/devtools/shared/test/browser_graphs-11a.js              | 1 -
 browser/devtools/shared/test/browser_graphs-11b.js              | 1 -
 browser/devtools/shared/test/browser_graphs-12.js               | 1 -
 browser/devtools/shared/test/browser_graphs-13.js               | 1 -
 browser/devtools/shared/test/browser_graphs-14.js               | 1 -
 browser/devtools/shared/test/browser_graphs-15.js               | 1 -
 browser/devtools/shared/test/browser_graphs-16.js               | 1 -
 .../shared/test/browser_tableWidget_keyboard_interaction.js     | 1 -
 browser/devtools/sourceeditor/css-autocompleter.js              | 1 -
 browser/devtools/webide/modules/config-view.js                  | 1 -
 browser/devtools/webide/modules/runtime-list.js                 | 1 -
 toolkit/devtools/content-observer.js                            | 1 -
 toolkit/devtools/gcli/commands/addon.js                         | 1 -
 toolkit/devtools/gcli/commands/csscoverage.js                   | 2 --
 toolkit/devtools/gcli/source/lib/gcli/util/promise.js           | 2 +-
 toolkit/devtools/server/actors/actor-registry.js                | 1 -
 toolkit/devtools/server/actors/call-watcher.js                  | 1 -
 toolkit/devtools/server/actors/preference.js                    | 1 -
 toolkit/devtools/server/actors/webaudio.js                      | 1 -
 toolkit/devtools/server/tests/mochitest/inspector-helpers.js    | 1 +
 toolkit/devtools/server/tests/mochitest/test_css-logic.html     | 2 --
 .../server/tests/mochitest/test_inspector-anonymous.html        | 2 --
 .../server/tests/mochitest/test_inspector-changeattrs.html      | 2 --
 .../server/tests/mochitest/test_inspector-changevalue.html      | 1 -
 .../server/tests/mochitest/test_inspector-dead-nodes.html       | 2 --
 .../devtools/server/tests/mochitest/test_inspector-hide.html    | 2 --
 .../devtools/server/tests/mochitest/test_inspector-insert.html  | 2 --
 .../server/tests/mochitest/test_inspector-mutations-attr.html   | 2 --
 .../tests/mochitest/test_inspector-mutations-childlist.html     | 2 --
 .../tests/mochitest/test_inspector-mutations-frameload.html     | 2 --
 .../server/tests/mochitest/test_inspector-mutations-value.html  | 2 --
 .../server/tests/mochitest/test_inspector-pseudoclass-lock.html | 2 --
 .../devtools/server/tests/mochitest/test_inspector-release.html | 2 --
 .../devtools/server/tests/mochitest/test_inspector-reload.html  | 2 --
 .../devtools/server/tests/mochitest/test_inspector-remove.html  | 2 --
 .../server/tests/mochitest/test_inspector-resolve-url.html      | 1 -
 .../devtools/server/tests/mochitest/test_inspector-retain.html  | 2 --
 .../server/tests/mochitest/test_inspector-scroll-into-view.html | 1 -
 .../server/tests/mochitest/test_inspector-traversal.html        | 2 --
 .../server/tests/mochitest/test_inspector_getImageData.html     | 2 --
 .../devtools/server/tests/mochitest/test_styles-applied.html    | 2 --
 .../devtools/server/tests/mochitest/test_styles-computed.html   | 2 --
 .../devtools/server/tests/mochitest/test_styles-matched.html    | 2 --
 toolkit/devtools/server/tests/mochitest/test_styles-modify.html | 2 --
 toolkit/devtools/server/tests/mochitest/test_styles-svg.html    | 2 --
 toolkit/devtools/tests/unit/test_async-utils.js                 | 2 +-
 76 files changed, 5 insertions(+), 98 deletions(-)

diff --git a/browser/devtools/framework/sidebar.js b/browser/devtools/framework/sidebar.js
index af5e23150e32..1e9833aaedd3 100644
--- a/browser/devtools/framework/sidebar.js
+++ b/browser/devtools/framework/sidebar.js
@@ -10,7 +10,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
-var {Promise: promise} = require("resource://gre/modules/Promise.jsm");
 var EventEmitter = require("devtools/toolkit/event-emitter");
 var Telemetry = require("devtools/shared/telemetry");
 
diff --git a/browser/devtools/projecteditor/lib/helpers/promise.js b/browser/devtools/projecteditor/lib/helpers/promise.js
index d962b3e58451..e9dbf5d29fbb 100644
--- a/browser/devtools/projecteditor/lib/helpers/promise.js
+++ b/browser/devtools/projecteditor/lib/helpers/promise.js
@@ -8,4 +8,4 @@
  * This helper is a quick way to require() the Promise object from Promise.jsm.
  */
 const { Cu } = require("chrome");
-module.exports = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
+module.exports = require("promise");
diff --git a/browser/devtools/shared/doorhanger.js b/browser/devtools/shared/doorhanger.js
index c2315c5f5920..6c6dfecbebca 100644
--- a/browser/devtools/shared/doorhanger.js
+++ b/browser/devtools/shared/doorhanger.js
@@ -8,7 +8,7 @@ const { Ci, Cc } = require("chrome");
 const { Services } = require("resource://gre/modules/Services.jsm");
 const { DOMHelpers } = require("resource:///modules/devtools/DOMHelpers.jsm");
 const { Task } = require("resource://gre/modules/Task.jsm");
-const { Promise } = require("resource://gre/modules/Promise.jsm");
+const { Promise } = require("promise");
 const { setTimeout } = require("sdk/timers");
 const { getMostRecentBrowserWindow } = require("sdk/window/utils");
 
diff --git a/browser/devtools/shared/test/browser_flame-graph-01.js b/browser/devtools/shared/test/browser_flame-graph-01.js
index 2f929dd2d5ee..6fca8b07e87f 100644
--- a/browser/devtools/shared/test/browser_flame-graph-01.js
+++ b/browser/devtools/shared/test/browser_flame-graph-01.js
@@ -4,7 +4,6 @@
 // Tests that flame graph widget works properly.
 
 let {FlameGraph} = require("devtools/shared/widgets/FlameGraph");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_flame-graph-02.js b/browser/devtools/shared/test/browser_flame-graph-02.js
index 8ae6aed4d650..d791434eba66 100644
--- a/browser/devtools/shared/test/browser_flame-graph-02.js
+++ b/browser/devtools/shared/test/browser_flame-graph-02.js
@@ -4,7 +4,6 @@
 // Tests that flame graph widgets may have a fixed width or height.
 
 let {FlameGraph} = require("devtools/shared/widgets/FlameGraph");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_flame-graph-03a.js b/browser/devtools/shared/test/browser_flame-graph-03a.js
index a29e57d012bc..3b019056f6f4 100644
--- a/browser/devtools/shared/test/browser_flame-graph-03a.js
+++ b/browser/devtools/shared/test/browser_flame-graph-03a.js
@@ -9,7 +9,6 @@ let TEST_WIDTH = 200;
 let TEST_HEIGHT = 100;
 
 let {FlameGraph} = require("devtools/shared/widgets/FlameGraph");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_flame-graph-03b.js b/browser/devtools/shared/test/browser_flame-graph-03b.js
index 2f679315174e..03b873acf3bb 100644
--- a/browser/devtools/shared/test/browser_flame-graph-03b.js
+++ b/browser/devtools/shared/test/browser_flame-graph-03b.js
@@ -10,7 +10,6 @@ let TEST_HEIGHT = 100;
 let TEST_DPI_DENSITIY = 2;
 
 let {FlameGraph} = require("devtools/shared/widgets/FlameGraph");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_flame-graph-03c.js b/browser/devtools/shared/test/browser_flame-graph-03c.js
index 163d6e69ecac..7c3991f2c82a 100644
--- a/browser/devtools/shared/test/browser_flame-graph-03c.js
+++ b/browser/devtools/shared/test/browser_flame-graph-03c.js
@@ -10,7 +10,6 @@ let TEST_HEIGHT = 100;
 let TEST_DPI_DENSITIY = 2;
 
 let {FlameGraph} = require("devtools/shared/widgets/FlameGraph");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_flame-graph-04.js b/browser/devtools/shared/test/browser_flame-graph-04.js
index 7ef1dcadd8f6..a7cbcde2c5d7 100644
--- a/browser/devtools/shared/test/browser_flame-graph-04.js
+++ b/browser/devtools/shared/test/browser_flame-graph-04.js
@@ -8,7 +8,6 @@ let {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}
 let {FlameGraph} = require("devtools/shared/widgets/FlameGraph");
 let {FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE} = require("devtools/shared/widgets/FlameGraph");
 let {FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY} = require("devtools/shared/widgets/FlameGraph");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 let L10N = new ViewHelpers.L10N();
 
diff --git a/browser/devtools/shared/test/browser_graphs-01.js b/browser/devtools/shared/test/browser_graphs-01.js
index 8ee30f893a14..f7eed898da58 100644
--- a/browser/devtools/shared/test/browser_graphs-01.js
+++ b/browser/devtools/shared/test/browser_graphs-01.js
@@ -4,7 +4,6 @@
 // Tests that graph widgets works properly.
 
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-02.js b/browser/devtools/shared/test/browser_graphs-02.js
index 1ad2159d7671..15adf7bfa660 100644
--- a/browser/devtools/shared/test/browser_graphs-02.js
+++ b/browser/devtools/shared/test/browser_graphs-02.js
@@ -6,7 +6,6 @@
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-03.js b/browser/devtools/shared/test/browser_graphs-03.js
index aa73db8a8165..76b055e103a0 100644
--- a/browser/devtools/shared/test/browser_graphs-03.js
+++ b/browser/devtools/shared/test/browser_graphs-03.js
@@ -5,7 +5,6 @@
 // selection or cursor.
 
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-04.js b/browser/devtools/shared/test/browser_graphs-04.js
index 7a4505b4eaea..cfc6cc79dbe5 100644
--- a/browser/devtools/shared/test/browser_graphs-04.js
+++ b/browser/devtools/shared/test/browser_graphs-04.js
@@ -4,7 +4,6 @@
 // Tests that graph widgets can correctly compare selections and cursors.
 
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-05.js b/browser/devtools/shared/test/browser_graphs-05.js
index 3ae1b155a28e..781c1a92b9b3 100644
--- a/browser/devtools/shared/test/browser_graphs-05.js
+++ b/browser/devtools/shared/test/browser_graphs-05.js
@@ -6,7 +6,6 @@
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-06.js b/browser/devtools/shared/test/browser_graphs-06.js
index 908241bcf291..81bf62a45966 100644
--- a/browser/devtools/shared/test/browser_graphs-06.js
+++ b/browser/devtools/shared/test/browser_graphs-06.js
@@ -6,7 +6,6 @@
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-07a.js b/browser/devtools/shared/test/browser_graphs-07a.js
index 7595fba84dfa..04caac4c4005 100644
--- a/browser/devtools/shared/test/browser_graphs-07a.js
+++ b/browser/devtools/shared/test/browser_graphs-07a.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-07b.js b/browser/devtools/shared/test/browser_graphs-07b.js
index 3fd35fc21a5b..0c819d8c346e 100644
--- a/browser/devtools/shared/test/browser_graphs-07b.js
+++ b/browser/devtools/shared/test/browser_graphs-07b.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-07c.js b/browser/devtools/shared/test/browser_graphs-07c.js
index 0aa828fc71fb..1be675889a46 100644
--- a/browser/devtools/shared/test/browser_graphs-07c.js
+++ b/browser/devtools/shared/test/browser_graphs-07c.js
@@ -7,7 +7,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-07d.js b/browser/devtools/shared/test/browser_graphs-07d.js
index 457a28f849ed..10278957cdc2 100644
--- a/browser/devtools/shared/test/browser_graphs-07d.js
+++ b/browser/devtools/shared/test/browser_graphs-07d.js
@@ -6,7 +6,6 @@
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-07e.js b/browser/devtools/shared/test/browser_graphs-07e.js
index e26dbf756c6b..29211d683db2 100644
--- a/browser/devtools/shared/test/browser_graphs-07e.js
+++ b/browser/devtools/shared/test/browser_graphs-07e.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 let CURRENT_ZOOM = 1;
 
 add_task(function*() {
diff --git a/browser/devtools/shared/test/browser_graphs-08.js b/browser/devtools/shared/test/browser_graphs-08.js
index 3a26f99384d8..01e5d79695a0 100644
--- a/browser/devtools/shared/test/browser_graphs-08.js
+++ b/browser/devtools/shared/test/browser_graphs-08.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-09a.js b/browser/devtools/shared/test/browser_graphs-09a.js
index d92a3695a281..27652673d7cc 100644
--- a/browser/devtools/shared/test/browser_graphs-09a.js
+++ b/browser/devtools/shared/test/browser_graphs-09a.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-09b.js b/browser/devtools/shared/test/browser_graphs-09b.js
index d67fd000ba15..592311c5306d 100644
--- a/browser/devtools/shared/test/browser_graphs-09b.js
+++ b/browser/devtools/shared/test/browser_graphs-09b.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-09c.js b/browser/devtools/shared/test/browser_graphs-09c.js
index 49f7ebccce4a..aca6c0b22def 100644
--- a/browser/devtools/shared/test/browser_graphs-09c.js
+++ b/browser/devtools/shared/test/browser_graphs-09c.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-09d.js b/browser/devtools/shared/test/browser_graphs-09d.js
index 3b3a59a3ec44..bd1c35fbe15c 100644
--- a/browser/devtools/shared/test/browser_graphs-09d.js
+++ b/browser/devtools/shared/test/browser_graphs-09d.js
@@ -6,7 +6,6 @@
 
 const TEST_DATA = [{ delta: 100, value: 60 }, { delta: 200, value: 59.9 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-09e.js b/browser/devtools/shared/test/browser_graphs-09e.js
index 388f238016c9..c095a551b6cf 100644
--- a/browser/devtools/shared/test/browser_graphs-09e.js
+++ b/browser/devtools/shared/test/browser_graphs-09e.js
@@ -8,7 +8,6 @@ const NO_DATA = [];
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-09f.js b/browser/devtools/shared/test/browser_graphs-09f.js
index 7fb39799efc4..81a51cf590e1 100644
--- a/browser/devtools/shared/test/browser_graphs-09f.js
+++ b/browser/devtools/shared/test/browser_graphs-09f.js
@@ -6,7 +6,6 @@
 
 const TEST_DATA = [{ delta: 100, value: 60 }, { delta: 200, value: 1 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-10a.js b/browser/devtools/shared/test/browser_graphs-10a.js
index e643a374ad2b..1351765f4995 100644
--- a/browser/devtools/shared/test/browser_graphs-10a.js
+++ b/browser/devtools/shared/test/browser_graphs-10a.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-10b.js b/browser/devtools/shared/test/browser_graphs-10b.js
index 311bec3821ab..f274907038e0 100644
--- a/browser/devtools/shared/test/browser_graphs-10b.js
+++ b/browser/devtools/shared/test/browser_graphs-10b.js
@@ -6,7 +6,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-10c.js b/browser/devtools/shared/test/browser_graphs-10c.js
index 5c40ec21cbd0..4c8dd4c99dc1 100644
--- a/browser/devtools/shared/test/browser_graphs-10c.js
+++ b/browser/devtools/shared/test/browser_graphs-10c.js
@@ -3,7 +3,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-11a.js b/browser/devtools/shared/test/browser_graphs-11a.js
index 98c0fa20685e..762632619312 100644
--- a/browser/devtools/shared/test/browser_graphs-11a.js
+++ b/browser/devtools/shared/test/browser_graphs-11a.js
@@ -4,7 +4,6 @@
 // Tests that bar graph create a legend as expected.
 
 let BarGraphWidget = require("devtools/shared/widgets/BarGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 const CATEGORIES = [
   { color: "#46afe3", label: "Foo" },
diff --git a/browser/devtools/shared/test/browser_graphs-11b.js b/browser/devtools/shared/test/browser_graphs-11b.js
index 10032b60e335..75e2d801f38a 100644
--- a/browser/devtools/shared/test/browser_graphs-11b.js
+++ b/browser/devtools/shared/test/browser_graphs-11b.js
@@ -4,7 +4,6 @@
 // Tests that bar graph's legend items handle mouseover/mouseout.
 
 let BarGraphWidget = require("devtools/shared/widgets/BarGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 const CATEGORIES = [
   { color: "#46afe3", label: "Foo" },
diff --git a/browser/devtools/shared/test/browser_graphs-12.js b/browser/devtools/shared/test/browser_graphs-12.js
index 3d57f528fd31..cdcb2908803e 100644
--- a/browser/devtools/shared/test/browser_graphs-12.js
+++ b/browser/devtools/shared/test/browser_graphs-12.js
@@ -6,7 +6,6 @@
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
 let BarGraphWidget = require("devtools/shared/widgets/BarGraphWidget");
 let {CanvasGraphUtils} = require("devtools/shared/widgets/Graphs");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-13.js b/browser/devtools/shared/test/browser_graphs-13.js
index 5494884db9c7..0675cd94a6a2 100644
--- a/browser/devtools/shared/test/browser_graphs-13.js
+++ b/browser/devtools/shared/test/browser_graphs-13.js
@@ -4,7 +4,6 @@
 // Tests that graph widgets may have a fixed width or height.
 
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-14.js b/browser/devtools/shared/test/browser_graphs-14.js
index 1190571dbf6d..43eebd07faa3 100644
--- a/browser/devtools/shared/test/browser_graphs-14.js
+++ b/browser/devtools/shared/test/browser_graphs-14.js
@@ -5,7 +5,6 @@
 
 const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }];
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-15.js b/browser/devtools/shared/test/browser_graphs-15.js
index a2c7687cc045..f2440d41b767 100644
--- a/browser/devtools/shared/test/browser_graphs-15.js
+++ b/browser/devtools/shared/test/browser_graphs-15.js
@@ -21,7 +21,6 @@ for (let frameRate of FRAMES) {
 }
 
 let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 add_task(function*() {
   yield promiseTab("about:blank");
diff --git a/browser/devtools/shared/test/browser_graphs-16.js b/browser/devtools/shared/test/browser_graphs-16.js
index b710da019bc6..e7c53492fa0d 100644
--- a/browser/devtools/shared/test/browser_graphs-16.js
+++ b/browser/devtools/shared/test/browser_graphs-16.js
@@ -4,7 +4,6 @@
 // Tests that mounta graphs work as expected.
 
 let MountainGraphWidget = require("devtools/shared/widgets/MountainGraphWidget");
-let {Promise} = require("resource://gre/modules/Promise.jsm");
 
 const TEST_DATA = [
   { delta: 0, values: [0.1, 0.5, 0.3] },
diff --git a/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js b/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js
index 8a68e866c6ca..93937fdc0de8 100644
--- a/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js
+++ b/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js
@@ -14,7 +14,6 @@ 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");
 
 let doc, table;
 
diff --git a/browser/devtools/sourceeditor/css-autocompleter.js b/browser/devtools/sourceeditor/css-autocompleter.js
index 28fae2c664c3..6f88664285e3 100644
--- a/browser/devtools/sourceeditor/css-autocompleter.js
+++ b/browser/devtools/sourceeditor/css-autocompleter.js
@@ -5,7 +5,6 @@
 const { Cc, Ci, Cu } = require('chrome');
 const {cssTokenizer, cssTokenizerWithLineColumn}  =
       require("devtools/sourceeditor/css-tokenizer");
-const promise = Cu.import("resource://gre/modules/Promise.jsm");
 
 /**
  * Here is what this file (+ ./css-tokenizer.js) do.
diff --git a/browser/devtools/webide/modules/config-view.js b/browser/devtools/webide/modules/config-view.js
index 151bc76d5b53..ab518362689d 100644
--- a/browser/devtools/webide/modules/config-view.js
+++ b/browser/devtools/webide/modules/config-view.js
@@ -4,7 +4,6 @@
 
 const {Cu} = require("chrome");
 
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm");
 const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties");
diff --git a/browser/devtools/webide/modules/runtime-list.js b/browser/devtools/webide/modules/runtime-list.js
index fea5128bb203..b80484403dbf 100644
--- a/browser/devtools/webide/modules/runtime-list.js
+++ b/browser/devtools/webide/modules/runtime-list.js
@@ -7,7 +7,6 @@ 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 EventEmitter = require("devtools/toolkit/event-emitter");
 const {RuntimeScanners, WiFiScanner} = require("devtools/webide/runtimes");
 const {Devices} = Cu.import("resource://gre/modules/devtools/Devices.jsm");
diff --git a/toolkit/devtools/content-observer.js b/toolkit/devtools/content-observer.js
index 8dea606d5ce7..aed807769e6f 100644
--- a/toolkit/devtools/content-observer.js
+++ b/toolkit/devtools/content-observer.js
@@ -7,7 +7,6 @@ const {Cc, Ci, Cu, Cr} = require("chrome");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
 const events = require("sdk/event/core");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 
 /**
  * Handles adding an observer for the creation of content document globals,
diff --git a/toolkit/devtools/gcli/commands/addon.js b/toolkit/devtools/gcli/commands/addon.js
index b489f034c97b..f714b159c337 100644
--- a/toolkit/devtools/gcli/commands/addon.js
+++ b/toolkit/devtools/gcli/commands/addon.js
@@ -31,7 +31,6 @@ function getAddonManager() {
 const { Cc, Ci, Cu } = require("chrome");
 const { AddonManager, addonManagerActive } = getAddonManager();
 const l10n = require("gcli/l10n");
-const { Promise: promise } = require("resource://gre/modules/Promise.jsm");
 
 const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"]
                            .getService(Ci.nsIStringBundleService)
diff --git a/toolkit/devtools/gcli/commands/csscoverage.js b/toolkit/devtools/gcli/commands/csscoverage.js
index 00ffa61b4843..8a3e8c72f358 100644
--- a/toolkit/devtools/gcli/commands/csscoverage.js
+++ b/toolkit/devtools/gcli/commands/csscoverage.js
@@ -8,8 +8,6 @@ const { Cc, Ci } = require("chrome");
 
 loader.lazyGetter(this, "gDevTools", () => require("resource:///modules/devtools/gDevTools.jsm").gDevTools);
 
-const promise = require("resource://gre/modules/Promise.jsm").Promise;
-
 const domtemplate = require("gcli/util/domtemplate");
 const csscoverage = require("devtools/server/actors/csscoverage");
 const l10n = csscoverage.l10n;
diff --git a/toolkit/devtools/gcli/source/lib/gcli/util/promise.js b/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
index a6b80de5b907..5355f087d3aa 100644
--- a/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/util/promise.js
@@ -16,4 +16,4 @@
 
 'use strict';
 
-exports.Promise = require("resource://gre/modules/Promise.jsm").Promise;
+exports.Promise = require("promise");
diff --git a/toolkit/devtools/server/actors/actor-registry.js b/toolkit/devtools/server/actors/actor-registry.js
index 94b3ecf5278a..904e18d6427a 100644
--- a/toolkit/devtools/server/actors/actor-registry.js
+++ b/toolkit/devtools/server/actors/actor-registry.js
@@ -8,7 +8,6 @@ const protocol = require("devtools/server/protocol");
 const { method, custom, Arg, Option, RetVal } = protocol;
 
 const { Cu, CC, components } = require("chrome");
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 const Services = require("Services");
 const { DebuggerServer } = require("devtools/server/main");
 const { registerActor, unregisterActor } = require("devtools/server/actors/utils/actor-registry-utils");
diff --git a/toolkit/devtools/server/actors/call-watcher.js b/toolkit/devtools/server/actors/call-watcher.js
index 881c5864e71e..eeb12a080441 100644
--- a/toolkit/devtools/server/actors/call-watcher.js
+++ b/toolkit/devtools/server/actors/call-watcher.js
@@ -5,7 +5,6 @@
 
 const {Cc, Ci, Cu, Cr} = require("chrome");
 const events = require("sdk/event/core");
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 const protocol = require("devtools/server/protocol");
 const {serializeStack, parseStack} = require("toolkit/loader");
 
diff --git a/toolkit/devtools/server/actors/preference.js b/toolkit/devtools/server/actors/preference.js
index 58a75bcf49e3..9bda6c73ef88 100644
--- a/toolkit/devtools/server/actors/preference.js
+++ b/toolkit/devtools/server/actors/preference.js
@@ -5,7 +5,6 @@
 const {Cc, Ci, Cu, CC} = require("chrome");
 const protocol = require("devtools/server/protocol");
 const {Arg, method, RetVal} = protocol;
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 
 Cu.import("resource://gre/modules/Services.jsm");
 
diff --git a/toolkit/devtools/server/actors/webaudio.js b/toolkit/devtools/server/actors/webaudio.js
index edf550d848c7..dd32ade829fb 100644
--- a/toolkit/devtools/server/actors/webaudio.js
+++ b/toolkit/devtools/server/actors/webaudio.js
@@ -7,7 +7,6 @@ const {Cc, Ci, Cu, Cr} = require("chrome");
 
 const Services = require("Services");
 
-const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 const events = require("sdk/event/core");
 const { on: systemOn, off: systemOff } = require("sdk/system/events");
 const protocol = require("devtools/server/protocol");
diff --git a/toolkit/devtools/server/tests/mochitest/inspector-helpers.js b/toolkit/devtools/server/tests/mochitest/inspector-helpers.js
index 9d5eb95ddcc4..c55448beac56 100644
--- a/toolkit/devtools/server/tests/mochitest/inspector-helpers.js
+++ b/toolkit/devtools/server/tests/mochitest/inspector-helpers.js
@@ -6,6 +6,7 @@ const {DebuggerServer} = require("devtools/server/main");
 Cu.import("resource://gre/modules/Task.jsm");
 
 const Services = require("Services");
+const promise = require("promise");
 const {_documentWalker} = require("devtools/server/actors/inspector");
 
 // Always log packets when running tests.
diff --git a/toolkit/devtools/server/tests/mochitest/test_css-logic.html b/toolkit/devtools/server/tests/mochitest/test_css-logic.html
index c2f5fdc68b78..6452e8f1879d 100644
--- a/toolkit/devtools/server/tests/mochitest/test_css-logic.html
+++ b/toolkit/devtools/server/tests/mochitest/test_css-logic.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
-
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html b/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html
index 5a27df0d9387..490919588808 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html
@@ -13,8 +13,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=777674
   <script type="application/javascript;version=1.8">
 window.onload = function() {
   const Ci = Components.interfaces;
-  const {Promise: promise} =
-    Components.utils.import("resource://gre/modules/Promise.jsm", {});
   const {InspectorFront} =
     require("devtools/server/actors/inspector");
   const {_documentWalker} =
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html b/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html
index bea8e2d33985..0ea2a65d7947 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html b/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html
index 831f7a5942cc..7bc403397b2a 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html
@@ -11,7 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
 const Ci = Components.interfaces;
 const inspector = require("devtools/server/actors/inspector");
 
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html b/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
index f7571f9122fd..20e9606f2041 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1121528
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html b/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html
index 76dad51f2e44..245ce7fb014d 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html b/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html
index ec64f86b036c..cf0c6754448b 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
index e991cfde8644..a1d2106a011c 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
index 67e3a1d5abc3..9d2bc8ed077d 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
index a25ffe74ce4e..77c0d05ee08d 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html
index e8291db9fd5a..6925242ecb20 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html b/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
index f59865d00cbf..2a3b3e334620 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 const DOMUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"].
                    getService(Components.interfaces.inIDOMUtils);
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-release.html b/toolkit/devtools/server/tests/mochitest/test_inspector-release.html
index 9a8bcc4ce40b..cb2bd62ebf60 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-release.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-release.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html b/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html
index ea066438410f..db1f29edaca6 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html b/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html
index 4dc22b445f94..c7abd36e36ae 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html b/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html
index 1f74607e060e..edf4ed1d94f4 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html
@@ -11,7 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=921102
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html b/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html
index 7684712d9e15..b32b4c9c726a 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html b/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
index 21f1831596f6..4c82c11d8a1d 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html
@@ -11,7 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=901250
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html b/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html
index 8842ce8318e4..b169f8de8263 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html b/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html
index 6da36821801d..9dd928d05203 100644
--- a/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html
+++ b/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=932937
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-applied.html b/toolkit/devtools/server/tests/mochitest/test_styles-applied.html
index fa509e1c2ccf..fc9f04f6ee60 100644
--- a/toolkit/devtools/server/tests/mochitest/test_styles-applied.html
+++ b/toolkit/devtools/server/tests/mochitest/test_styles-applied.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-computed.html b/toolkit/devtools/server/tests/mochitest/test_styles-computed.html
index b70c7008cc02..3e67505d7d67 100644
--- a/toolkit/devtools/server/tests/mochitest/test_styles-computed.html
+++ b/toolkit/devtools/server/tests/mochitest/test_styles-computed.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-matched.html b/toolkit/devtools/server/tests/mochitest/test_styles-matched.html
index 0c132427f49d..895acef210b5 100644
--- a/toolkit/devtools/server/tests/mochitest/test_styles-matched.html
+++ b/toolkit/devtools/server/tests/mochitest/test_styles-matched.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 const {CssLogic} = require("devtools/styleinspector/css-logic");
 
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-modify.html b/toolkit/devtools/server/tests/mochitest/test_styles-modify.html
index 0f9a54958c46..ea0db3b4aa56 100644
--- a/toolkit/devtools/server/tests/mochitest/test_styles-modify.html
+++ b/toolkit/devtools/server/tests/mochitest/test_styles-modify.html
@@ -11,8 +11,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/server/tests/mochitest/test_styles-svg.html b/toolkit/devtools/server/tests/mochitest/test_styles-svg.html
index 0ab6a5efb49c..9c459305a227 100644
--- a/toolkit/devtools/server/tests/mochitest/test_styles-svg.html
+++ b/toolkit/devtools/server/tests/mochitest/test_styles-svg.html
@@ -12,8 +12,6 @@ Bug 921191 - allow inspection/editing of SVG elements' CSS properties
   <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
   <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
   <script type="application/javascript;version=1.8">
-const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {});
-
 const inspector = require("devtools/server/actors/inspector");
 
 window.onload = function() {
diff --git a/toolkit/devtools/tests/unit/test_async-utils.js b/toolkit/devtools/tests/unit/test_async-utils.js
index 18d51422f54c..f5b6c3b3c8eb 100644
--- a/toolkit/devtools/tests/unit/test_async-utils.js
+++ b/toolkit/devtools/tests/unit/test_async-utils.js
@@ -9,7 +9,7 @@ const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 // it will make the Promise object immutable before assigning.
 // Using Object.defineProperty() instead.
 Object.defineProperty(this, "Promise", {
-  value: Cu.import("resource://gre/modules/Promise.jsm", {}).Promise,
+  value: require("promise"),
   writable: false, configurable: false
 });
 const {async, asyncOnce, promiseInvoke, promiseCall} = require("devtools/async-utils");