From 19c4c8493a142e808475c284c41e8df4ce8fbee0 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Wed, 16 Aug 2017 15:11:21 +0200
Subject: [PATCH] Bug 1137935 - remove all usage of sdk/event/core/ in
 devtools;r=ochameau

MozReview-Commit-ID: 2ab0Ol4Mq64

--HG--
extra : rebase_source : 22d0003b40e0fc49e309187ea3c943a6f5048db5
---
 .../test/mochitest/browser_dbg_promises-allocation-stack.js     | 2 +-
 .../mochitest/browser_dbg_promises-chrome-allocation-stack.js   | 2 +-
 .../test/mochitest/browser_dbg_promises-fulfillment-stack.js    | 2 +-
 .../test/mochitest/browser_dbg_promises-rejection-stack.js      | 2 +-
 .../client/framework/test/browser_toolbox_transport_events.js   | 2 +-
 devtools/client/inspector/markup/test/actor_events_form.js      | 2 +-
 devtools/client/webaudioeditor/models.js                        | 2 +-
 devtools/docs/backend/protocol.js.md                            | 2 +-
 devtools/server/actors/animation.js                             | 2 +-
 devtools/server/actors/call-watcher.js                          | 2 +-
 devtools/server/actors/csscoverage.js                           | 2 +-
 devtools/server/actors/eventlooplag.js                          | 2 +-
 devtools/server/actors/gcli.js                                  | 2 +-
 devtools/server/actors/highlighters.js                          | 2 +-
 devtools/server/actors/highlighters/measuring-tool.js           | 2 +-
 devtools/server/actors/highlighters/rulers.js                   | 2 +-
 devtools/server/actors/highlighters/utils/markup.js             | 2 +-
 devtools/server/actors/inspector.js                             | 2 +-
 devtools/server/actors/memory.js                                | 2 +-
 devtools/server/actors/performance-entries.js                   | 2 +-
 devtools/server/actors/performance.js                           | 2 +-
 devtools/server/actors/profiler.js                              | 2 +-
 devtools/server/actors/promises.js                              | 2 +-
 devtools/server/actors/reflow.js                                | 2 +-
 devtools/server/actors/script.js                                | 2 +-
 devtools/server/actors/storage.js                               | 2 +-
 devtools/server/actors/styleeditor.js                           | 2 +-
 devtools/server/actors/styles.js                                | 2 +-
 devtools/server/actors/stylesheets.js                           | 2 +-
 devtools/server/actors/tab.js                                   | 2 +-
 devtools/server/actors/timeline.js                              | 2 +-
 devtools/server/actors/webaudio.js                              | 2 +-
 devtools/server/actors/webconsole.js                            | 2 +-
 devtools/server/actors/webgl.js                                 | 2 +-
 devtools/server/actors/worker.js                                | 2 +-
 devtools/server/main.js                                         | 2 +-
 devtools/server/performance/framerate.js                        | 2 +-
 devtools/server/tests/browser/browser_navigateEvents.js         | 2 +-
 devtools/server/tests/mochitest/test_memory_gc_events.html      | 2 +-
 devtools/server/tests/unit/test_promises_actor_onnewpromise.js  | 2 +-
 .../server/tests/unit/test_promises_actor_onpromisesettled.js   | 2 +-
 .../tests/unit/test_promises_client_getdependentpromises.js     | 2 +-
 .../server/tests/unit/test_promises_object_creationtimestamp.js | 2 +-
 .../server/tests/unit/test_promises_object_timetosettle-01.js   | 2 +-
 .../server/tests/unit/test_promises_object_timetosettle-02.js   | 2 +-
 devtools/server/tests/unit/test_protocol_children.js            | 2 +-
 devtools/server/tests/unit/test_protocol_longstring.js          | 2 +-
 devtools/server/tests/unit/test_protocol_simple.js              | 2 +-
 devtools/shared/client/main.js                                  | 2 +-
 devtools/shared/content-observer.js                             | 2 +-
 devtools/shared/fronts/inspector.js                             | 2 +-
 devtools/shared/fronts/profiler.js                              | 2 +-
 devtools/shared/fronts/styleeditor.js                           | 2 +-
 devtools/shared/fronts/stylesheets.js                           | 2 +-
 devtools/shared/gcli/commands/measure.js                        | 2 +-
 devtools/shared/gcli/commands/rulers.js                         | 2 +-
 devtools/shared/protocol.js                                     | 2 +-
 57 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js
index 277503cad860..04c6650fbe1b 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js
@@ -11,7 +11,7 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_promise-get-allocation-stack.html";
 const { PromisesFront } = require("devtools/shared/fronts/promises");
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 function test() {
   Task.spawn(function* () {
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js
index 7ec6b945e069..62d5fc96fddc 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js
@@ -12,7 +12,7 @@
 
 const SOURCE_URL = "browser_dbg_promises-chrome-allocation-stack.js";
 const PromisesFront = require("devtools/shared/fronts/promises");
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 const STACK_DATA = [
   { functionDisplayName: "test/</<" },
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js
index a7425adcab94..f008e5635023 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js
@@ -11,7 +11,7 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_promise-get-fulfillment-stack.html";
 const { PromisesFront } = require("devtools/shared/fronts/promises");
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 const TEST_DATA = [
   {
diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
index 55cc82f93165..db7938e839e7 100644
--- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
+++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js
@@ -11,7 +11,7 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_promise-get-rejection-stack.html";
 const { PromisesFront } = require("devtools/shared/fronts/promises");
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 // The code in the document above leaves an uncaught rejection. This is only
 // reported to the testing framework if the code is loaded in the main process.
diff --git a/devtools/client/framework/test/browser_toolbox_transport_events.js b/devtools/client/framework/test/browser_toolbox_transport_events.js
index 106596cc2961..0a11d4026818 100644
--- a/devtools/client/framework/test/browser_toolbox_transport_events.js
+++ b/devtools/client/framework/test/browser_toolbox_transport_events.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { on, off } = require("sdk/event/core");
+const { on, off } = require("devtools/shared/event-emitter");
 const { DebuggerClient } = require("devtools/shared/client/main");
 
 function test() {
diff --git a/devtools/client/inspector/markup/test/actor_events_form.js b/devtools/client/inspector/markup/test/actor_events_form.js
index bd1b1e91aa9b..98a037120c1a 100644
--- a/devtools/client/inspector/markup/test/actor_events_form.js
+++ b/devtools/client/inspector/markup/test/actor_events_form.js
@@ -7,7 +7,7 @@
 // on NodeActor. Custom form property is set when 'form' event is sent
 // by NodeActor actor (see 'onNodeActorForm' method).
 
-const Events = require("sdk/event/core");
+const Events = require("devtools/shared/event-emitter");
 const {ActorClassWithSpec, Actor, FrontClassWithSpec, Front, generateActorSpec} =
   require("devtools/shared/protocol");
 
diff --git a/devtools/client/webaudioeditor/models.js b/devtools/client/webaudioeditor/models.js
index b4659d8ceaba..68c4442f0cfe 100644
--- a/devtools/client/webaudioeditor/models.js
+++ b/devtools/client/webaudioeditor/models.js
@@ -5,7 +5,7 @@
 
 // Import as different name `coreEmit`, so we don't conflict
 // with the global `window` listener itself.
-const { emit: coreEmit } = require("sdk/event/core");
+const { emit: coreEmit } = require("devtools/shared/event-emitter");
 
 /**
  * Representational wrapper around AudioNodeActors. Adding and destroying
diff --git a/devtools/docs/backend/protocol.js.md b/devtools/docs/backend/protocol.js.md
index e033bf1427f3..138053450c1e 100644
--- a/devtools/docs/backend/protocol.js.md
+++ b/devtools/docs/backend/protocol.js.md
@@ -487,7 +487,7 @@ Here's how you'd set it up in a spec:
 
 Here's how the implementation would look:
 
-    const event = require("sdk/event/core");
+    const event = require("devtools/shared/event-emitter");
 
     // In your protocol.ActorClassWithSpec definition:
     giveGoodNews: function (news) {
diff --git a/devtools/server/actors/animation.js b/devtools/server/actors/animation.js
index df79e8704056..32a607b11703 100644
--- a/devtools/server/actors/animation.js
+++ b/devtools/server/actors/animation.js
@@ -30,7 +30,7 @@ const promise = require("promise");
 const protocol = require("devtools/shared/protocol");
 const {Actor} = protocol;
 const {animationPlayerSpec, animationsSpec} = require("devtools/shared/specs/animation");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 // Types of animations.
 const ANIMATION_TYPES = {
diff --git a/devtools/server/actors/call-watcher.js b/devtools/server/actors/call-watcher.js
index 0417c9ca8d23..6fc80655deab 100644
--- a/devtools/server/actors/call-watcher.js
+++ b/devtools/server/actors/call-watcher.js
@@ -6,7 +6,7 @@
 /* global XPCNativeWrapper */
 
 const {Ci, Cu} = require("chrome");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const {serializeStack, parseStack} = require("toolkit/loader");
 
diff --git a/devtools/server/actors/csscoverage.js b/devtools/server/actors/csscoverage.js
index 0136d599c68c..71f7ed02146a 100644
--- a/devtools/server/actors/csscoverage.js
+++ b/devtools/server/actors/csscoverage.js
@@ -9,7 +9,7 @@ const { Cc, Ci } = require("chrome");
 const Services = require("Services");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const { cssUsageSpec } = require("devtools/shared/specs/csscoverage");
 
diff --git a/devtools/server/actors/eventlooplag.js b/devtools/server/actors/eventlooplag.js
index 2d756711451e..c1516f780e92 100644
--- a/devtools/server/actors/eventlooplag.js
+++ b/devtools/server/actors/eventlooplag.js
@@ -14,7 +14,7 @@ const {Ci} = require("chrome");
 const Services = require("Services");
 const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
 const {Actor, ActorClassWithSpec} = require("devtools/shared/protocol");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const {eventLoopLagSpec} = require("devtools/shared/specs/eventlooplag");
 
 exports.EventLoopLagActor = ActorClassWithSpec(eventLoopLagSpec, {
diff --git a/devtools/server/actors/gcli.js b/devtools/server/actors/gcli.js
index c19938d7f9d3..f9c455b558fc 100644
--- a/devtools/server/actors/gcli.js
+++ b/devtools/server/actors/gcli.js
@@ -6,7 +6,7 @@
 
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { gcliSpec } = require("devtools/shared/specs/gcli");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const { createSystem } = require("gcli/system");
 
 /**
diff --git a/devtools/server/actors/highlighters.js b/devtools/server/actors/highlighters.js
index 834615f02506..5d852ce97b08 100644
--- a/devtools/server/actors/highlighters.js
+++ b/devtools/server/actors/highlighters.js
@@ -8,7 +8,7 @@ const { Ci, Cu } = require("chrome");
 
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
 const EventEmitter = require("devtools/shared/old-event-emitter");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const Services = require("Services");
 const { isWindowIncluded } = require("devtools/shared/layout/utils");
diff --git a/devtools/server/actors/highlighters/measuring-tool.js b/devtools/server/actors/highlighters/measuring-tool.js
index 926004bfc9bc..eb17b51741a6 100644
--- a/devtools/server/actors/highlighters/measuring-tool.js
+++ b/devtools/server/actors/highlighters/measuring-tool.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const { getCurrentZoom, getWindowDimensions,
   setIgnoreLayoutChanges } = require("devtools/shared/layout/utils");
 const {
diff --git a/devtools/server/actors/highlighters/rulers.js b/devtools/server/actors/highlighters/rulers.js
index f246975ff000..968a09c70817 100644
--- a/devtools/server/actors/highlighters/rulers.js
+++ b/devtools/server/actors/highlighters/rulers.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const { getCurrentZoom,
   setIgnoreLayoutChanges } = require("devtools/shared/layout/utils");
 const {
diff --git a/devtools/server/actors/highlighters/utils/markup.js b/devtools/server/actors/highlighters/utils/markup.js
index 1666a6da340b..232b57d52558 100644
--- a/devtools/server/actors/highlighters/utils/markup.js
+++ b/devtools/server/actors/highlighters/utils/markup.js
@@ -7,7 +7,7 @@
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const { getCurrentZoom, getWindowDimensions, getViewportDimensions,
   getRootBindingParent, loadSheet } = require("devtools/shared/layout/utils");
-const { on, emit } = require("sdk/event/core");
+const { on, emit } = require("devtools/shared/event-emitter");
 
 const lazyContainer = {};
 
diff --git a/devtools/server/actors/inspector.js b/devtools/server/actors/inspector.js
index deb3dc5298da..2eeb2c4d7d62 100644
--- a/devtools/server/actors/inspector.js
+++ b/devtools/server/actors/inspector.js
@@ -58,7 +58,7 @@ const {LongStringActor} = require("devtools/server/actors/string");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const {Task} = require("devtools/shared/task");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const {WalkerSearch} = require("devtools/server/actors/utils/walker-search");
 const {PageStyleActor, getFontPreviewData} = require("devtools/server/actors/styles");
 const {
diff --git a/devtools/server/actors/memory.js b/devtools/server/actors/memory.js
index 5c41a7dc19e5..56ddd96f89f0 100644
--- a/devtools/server/actors/memory.js
+++ b/devtools/server/actors/memory.js
@@ -8,7 +8,7 @@ const protocol = require("devtools/shared/protocol");
 const { Memory } = require("devtools/server/performance/memory");
 const { actorBridgeWithSpec } = require("devtools/server/actors/common");
 const { memorySpec } = require("devtools/shared/specs/memory");
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 loader.lazyRequireGetter(this, "StackFrameCache",
                          "devtools/server/actors/utils/stack", true);
 
diff --git a/devtools/server/actors/performance-entries.js b/devtools/server/actors/performance-entries.js
index f461016b8205..c786946087ea 100644
--- a/devtools/server/actors/performance-entries.js
+++ b/devtools/server/actors/performance-entries.js
@@ -13,7 +13,7 @@
 
 const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const performanceSpec = require("devtools/shared/specs/performance-entries");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 var PerformanceEntriesActor = ActorClassWithSpec(performanceSpec, {
   listenerAdded: false,
diff --git a/devtools/server/actors/performance.js b/devtools/server/actors/performance.js
index d0147c01a5e0..17f0cc4af998 100644
--- a/devtools/server/actors/performance.js
+++ b/devtools/server/actors/performance.js
@@ -9,7 +9,7 @@ const { Actor, ActorClassWithSpec } = require("devtools/shared/protocol");
 const { actorBridgeWithSpec } = require("devtools/server/actors/common");
 const { performanceSpec } = require("devtools/shared/specs/performance");
 
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 loader.lazyRequireGetter(this, "PerformanceRecorder",
   "devtools/server/performance/recorder", true);
diff --git a/devtools/server/actors/profiler.js b/devtools/server/actors/profiler.js
index 06d1dfaa9d4c..d4123c05079a 100644
--- a/devtools/server/actors/profiler.js
+++ b/devtools/server/actors/profiler.js
@@ -8,7 +8,7 @@ const { Profiler } = require("devtools/server/performance/profiler");
 const { actorBridgeWithSpec } = require("devtools/server/actors/common");
 const { profilerSpec } = require("devtools/shared/specs/profiler");
 
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 /**
  * This actor wraps the Profiler module at devtools/server/performance/profiler.js
diff --git a/devtools/server/actors/promises.js b/devtools/server/actors/promises.js
index 3fd6e0ba2759..e13b48f426ee 100644
--- a/devtools/server/actors/promises.js
+++ b/devtools/server/actors/promises.js
@@ -9,7 +9,7 @@ const { promisesSpec } = require("devtools/shared/specs/promises");
 const { expectState, ActorPool } = require("devtools/server/actors/common");
 const { ObjectActor, createValueGrip } = require("devtools/server/actors/object");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 /**
  * The Promises Actor provides support for getting the list of live promises and
diff --git a/devtools/server/actors/reflow.js b/devtools/server/actors/reflow.js
index 76673461ef2d..9297633076d5 100644
--- a/devtools/server/actors/reflow.js
+++ b/devtools/server/actors/reflow.js
@@ -27,7 +27,7 @@
 const {Ci} = require("chrome");
 const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
 const protocol = require("devtools/shared/protocol");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const EventEmitter = require("devtools/shared/old-event-emitter");
 const {reflowSpec} = require("devtools/shared/specs/reflow");
 
diff --git a/devtools/server/actors/script.js b/devtools/server/actors/script.js
index 017eaf55a4bb..4ee007ce609f 100644
--- a/devtools/server/actors/script.js
+++ b/devtools/server/actors/script.js
@@ -28,7 +28,7 @@ loader.lazyGetter(this, "Debugger", () => {
 });
 loader.lazyRequireGetter(this, "CssLogic", "devtools/server/css-logic", true);
 loader.lazyRequireGetter(this, "findCssSelector", "devtools/shared/inspector/css-logic", true);
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 loader.lazyRequireGetter(this, "mapURIToAddonID", "devtools/server/actors/utils/map-uri-to-addon-id");
 loader.lazyRequireGetter(this, "BreakpointActor", "devtools/server/actors/breakpoint", true);
 loader.lazyRequireGetter(this, "setBreakpointAtEntryPoints", "devtools/server/actors/breakpoint", true);
diff --git a/devtools/server/actors/storage.js b/devtools/server/actors/storage.js
index 4d753b7a30ba..3d25cdfad2f6 100644
--- a/devtools/server/actors/storage.js
+++ b/devtools/server/actors/storage.js
@@ -5,7 +5,7 @@
 "use strict";
 
 const {Cc, Ci, Cu, CC} = require("chrome");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const {LongStringActor} = require("devtools/server/actors/string");
 const {DebuggerServer} = require("devtools/server/main");
diff --git a/devtools/server/actors/styleeditor.js b/devtools/server/actors/styleeditor.js
index ecda0128fc63..8497571780ae 100644
--- a/devtools/server/actors/styleeditor.js
+++ b/devtools/server/actors/styleeditor.js
@@ -7,7 +7,7 @@
 const {Cc, Ci} = require("chrome");
 const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
 const promise = require("promise");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const {fetch} = require("devtools/shared/DevToolsUtils");
 const {oldStyleSheetSpec, styleEditorSpec} = require("devtools/shared/specs/styleeditor");
diff --git a/devtools/server/actors/styles.js b/devtools/server/actors/styles.js
index d0b4a7cd5065..1e6bf822d84d 100644
--- a/devtools/server/actors/styles.js
+++ b/devtools/server/actors/styles.js
@@ -12,7 +12,7 @@ const {getDefinedGeometryProperties} = require("devtools/server/actors/highlight
 const {parseNamedDeclarations} = require("devtools/shared/css/parsing-utils");
 const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
 const {Task} = require("devtools/shared/task");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 // This will also add the "stylesheet" actor type for protocol.js to recognize
 const {UPDATE_PRESERVING_RULES, UPDATE_GENERAL} = require("devtools/server/actors/stylesheets");
diff --git a/devtools/server/actors/stylesheets.js b/devtools/server/actors/stylesheets.js
index 51888ee33259..ce4a8ffe6066 100644
--- a/devtools/server/actors/stylesheets.js
+++ b/devtools/server/actors/stylesheets.js
@@ -10,7 +10,7 @@ const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const {Task} = require("devtools/shared/task");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const {LongStringActor} = require("devtools/server/actors/string");
 const {fetch} = require("devtools/shared/DevToolsUtils");
diff --git a/devtools/server/actors/tab.js b/devtools/server/actors/tab.js
index 23e88d8ddf26..a35644027b39 100644
--- a/devtools/server/actors/tab.js
+++ b/devtools/server/actors/tab.js
@@ -33,7 +33,7 @@ loader.lazyImporter(this, "ExtensionContent", "resource://gre/modules/ExtensionC
 // Assumptions on events module:
 // events needs to be dispatched synchronously,
 // by calling the listeners in the order or registration.
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 loader.lazyRequireGetter(this, "StyleSheetActor", "devtools/server/actors/stylesheets", true);
 
diff --git a/devtools/server/actors/timeline.js b/devtools/server/actors/timeline.js
index 118196aa4165..d313eab38575 100644
--- a/devtools/server/actors/timeline.js
+++ b/devtools/server/actors/timeline.js
@@ -21,7 +21,7 @@ const { Option, RetVal } = protocol;
 const { actorBridgeWithSpec } = require("devtools/server/actors/common");
 const { Timeline } = require("devtools/server/performance/timeline");
 const { timelineSpec } = require("devtools/shared/specs/timeline");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 /**
  * The timeline actor pops and forwards timeline markers registered in docshells.
diff --git a/devtools/server/actors/webaudio.js b/devtools/server/actors/webaudio.js
index 91a2603419c6..2e1cef3460bf 100644
--- a/devtools/server/actors/webaudio.js
+++ b/devtools/server/actors/webaudio.js
@@ -7,7 +7,7 @@
 
 const { Cu, Cc, Ci } = require("chrome");
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const protocol = require("devtools/shared/protocol");
 const { CallWatcherActor } = require("devtools/server/actors/call-watcher");
 const { createValueGrip } = require("devtools/server/actors/object");
diff --git a/devtools/server/actors/webconsole.js b/devtools/server/actors/webconsole.js
index c91811108755..82db0e5ed1ac 100644
--- a/devtools/server/actors/webconsole.js
+++ b/devtools/server/actors/webconsole.js
@@ -20,7 +20,7 @@ loader.lazyRequireGetter(this, "NetworkMonitor", "devtools/shared/webconsole/net
 loader.lazyRequireGetter(this, "NetworkMonitorChild", "devtools/shared/webconsole/network-monitor", true);
 loader.lazyRequireGetter(this, "ConsoleProgressListener", "devtools/shared/webconsole/network-monitor", true);
 loader.lazyRequireGetter(this, "StackTraceCollector", "devtools/shared/webconsole/network-monitor", true);
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 loader.lazyRequireGetter(this, "ServerLoggingListener", "devtools/shared/webconsole/server-logger", true);
 loader.lazyRequireGetter(this, "JSPropertyProvider", "devtools/shared/webconsole/js-property-provider", true);
 loader.lazyRequireGetter(this, "Parser", "resource://devtools/shared/Parser.jsm", true);
diff --git a/devtools/server/actors/webgl.js b/devtools/server/actors/webgl.js
index 9e42b3944a3c..11b11ab63dae 100644
--- a/devtools/server/actors/webgl.js
+++ b/devtools/server/actors/webgl.js
@@ -6,7 +6,7 @@
 /* global XPCNativeWrapper */
 
 const {Cu} = require("chrome");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const defer = require("devtools/shared/defer");
 const protocol = require("devtools/shared/protocol");
 const { ContentObserver } = require("devtools/shared/content-observer");
diff --git a/devtools/server/actors/worker.js b/devtools/server/actors/worker.js
index 2efc7cd896dc..484f052a4f61 100644
--- a/devtools/server/actors/worker.js
+++ b/devtools/server/actors/worker.js
@@ -17,7 +17,7 @@ const {
 } = require("devtools/shared/specs/worker");
 
 loader.lazyRequireGetter(this, "ChromeUtils");
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 XPCOMUtils.defineLazyServiceGetter(
   this, "swm",
diff --git a/devtools/server/main.js b/devtools/server/main.js
index 3214f5b3c290..892f47515c31 100644
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -86,7 +86,7 @@ function loadSubScript(url) {
   }
 }
 
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 var gRegisteredModules = Object.create(null);
 
diff --git a/devtools/server/performance/framerate.js b/devtools/server/performance/framerate.js
index 4e554d04b81d..d775e10c8402 100644
--- a/devtools/server/performance/framerate.js
+++ b/devtools/server/performance/framerate.js
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { on, off } = require("sdk/event/core");
+const { on, off } = require("devtools/shared/event-emitter");
 const { Class } = require("sdk/core/heritage");
 
 /**
diff --git a/devtools/server/tests/browser/browser_navigateEvents.js b/devtools/server/tests/browser/browser_navigateEvents.js
index 838fde3d2fe7..94437db21db0 100644
--- a/devtools/server/tests/browser/browser_navigateEvents.js
+++ b/devtools/server/tests/browser/browser_navigateEvents.js
@@ -7,7 +7,7 @@
 const URL1 = MAIN_DOMAIN + "navigate-first.html";
 const URL2 = MAIN_DOMAIN + "navigate-second.html";
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 var client;
 
 SpecialPowers.pushPrefEnv(
diff --git a/devtools/server/tests/mochitest/test_memory_gc_events.html b/devtools/server/tests/mochitest/test_memory_gc_events.html
index 99c292d60431..f7bb83df1055 100644
--- a/devtools/server/tests/mochitest/test_memory_gc_events.html
+++ b/devtools/server/tests/mochitest/test_memory_gc_events.html
@@ -18,7 +18,7 @@ Bug 1137527 - Test receiving GC events from the memory actor.
 window.onload = function () {
   SimpleTest.waitForExplicitFinish();
 
-  let event = require("sdk/event/core");
+  let event = require("devtools/shared/event-emitter");
 
   Task.spawn(function* () {
     let { memory, client } = yield startServerAndGetSelectedTabMemory();
diff --git a/devtools/server/tests/unit/test_promises_actor_onnewpromise.js b/devtools/server/tests/unit/test_promises_actor_onnewpromise.js
index 04b3e6510569..5d594148dc10 100644
--- a/devtools/server/tests/unit/test_promises_actor_onnewpromise.js
+++ b/devtools/server/tests/unit/test_promises_actor_onnewpromise.js
@@ -10,7 +10,7 @@
 
 const { PromisesFront } = require("devtools/shared/fronts/promises");
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 add_task(function* () {
   let client = yield startTestDebuggerServer("promises-actor-test");
diff --git a/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js b/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js
index ab47747339e9..d5c668b62cf1 100644
--- a/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js
+++ b/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js
@@ -12,7 +12,7 @@ Cu.import("resource://testing-common/PromiseTestUtils.jsm", this);
 
 const { PromisesFront } = require("devtools/shared/fronts/promises");
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 add_task(function* () {
   let client = yield startTestDebuggerServer("promises-actor-test");
diff --git a/devtools/server/tests/unit/test_promises_client_getdependentpromises.js b/devtools/server/tests/unit/test_promises_client_getdependentpromises.js
index ad8aa8365694..e36e84562671 100644
--- a/devtools/server/tests/unit/test_promises_client_getdependentpromises.js
+++ b/devtools/server/tests/unit/test_promises_client_getdependentpromises.js
@@ -9,7 +9,7 @@
 
 const { PromisesFront } = require("devtools/shared/fronts/promises");
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 add_task(function* () {
   let client = yield startTestDebuggerServer("test-promises-dependentpromises");
diff --git a/devtools/server/tests/unit/test_promises_object_creationtimestamp.js b/devtools/server/tests/unit/test_promises_object_creationtimestamp.js
index 1360be56ae98..a6d687909a72 100644
--- a/devtools/server/tests/unit/test_promises_object_creationtimestamp.js
+++ b/devtools/server/tests/unit/test_promises_object_creationtimestamp.js
@@ -9,7 +9,7 @@
 
 const { PromisesFront } = require("devtools/shared/fronts/promises");
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 add_task(function* () {
   let client = yield startTestDebuggerServer("promises-object-test");
diff --git a/devtools/server/tests/unit/test_promises_object_timetosettle-01.js b/devtools/server/tests/unit/test_promises_object_timetosettle-01.js
index 1b3240e3d66b..9d92318b838f 100644
--- a/devtools/server/tests/unit/test_promises_object_timetosettle-01.js
+++ b/devtools/server/tests/unit/test_promises_object_timetosettle-01.js
@@ -10,7 +10,7 @@
 
 const { PromisesFront } = require("devtools/shared/fronts/promises");
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 add_task(function* () {
   let client = yield startTestDebuggerServer("test-promises-timetosettle");
diff --git a/devtools/server/tests/unit/test_promises_object_timetosettle-02.js b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js
index 6a079147b909..97f00a5c045c 100644
--- a/devtools/server/tests/unit/test_promises_object_timetosettle-02.js
+++ b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js
@@ -11,7 +11,7 @@
 const { PromisesFront } = require("devtools/shared/fronts/promises");
 const { setTimeout } = Cu.import("resource://gre/modules/Timer.jsm", {});
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 add_task(function* () {
   let client = yield startTestDebuggerServer("test-promises-timetosettle");
diff --git a/devtools/server/tests/unit/test_protocol_children.js b/devtools/server/tests/unit/test_protocol_children.js
index fbc9a2d331b1..48df0088af76 100644
--- a/devtools/server/tests/unit/test_protocol_children.js
+++ b/devtools/server/tests/unit/test_protocol_children.js
@@ -10,7 +10,7 @@
 var protocol = require("devtools/shared/protocol");
 var {preEvent, types, Arg, RetVal} = protocol;
 
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 function simpleHello() {
   return {
diff --git a/devtools/server/tests/unit/test_protocol_longstring.js b/devtools/server/tests/unit/test_protocol_longstring.js
index 2fcc9247b7b4..236742d89f68 100644
--- a/devtools/server/tests/unit/test_protocol_longstring.js
+++ b/devtools/server/tests/unit/test_protocol_longstring.js
@@ -9,7 +9,7 @@
  */
 var protocol = require("devtools/shared/protocol");
 var {RetVal, Arg} = protocol;
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 var {LongStringActor} = require("devtools/server/actors/string");
 
 // The test implicitly relies on this.
diff --git a/devtools/server/tests/unit/test_protocol_simple.js b/devtools/server/tests/unit/test_protocol_simple.js
index ca4f52e94883..07975f2c548f 100644
--- a/devtools/server/tests/unit/test_protocol_simple.js
+++ b/devtools/server/tests/unit/test_protocol_simple.js
@@ -9,7 +9,7 @@
 
 var protocol = require("devtools/shared/protocol");
 var {Arg, Option, RetVal} = protocol;
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 
 function simpleHello() {
   return {
diff --git a/devtools/shared/client/main.js b/devtools/shared/client/main.js
index 559685b97eea..5760f808a4d8 100644
--- a/devtools/shared/client/main.js
+++ b/devtools/shared/client/main.js
@@ -12,7 +12,7 @@ const { getStack, callFunctionWithAsyncStack } = require("devtools/shared/platfo
 
 const promise = Cu.import("resource://devtools/shared/deprecated-sync-thenables.js", {}).Promise;
 
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 loader.lazyRequireGetter(this, "WebConsoleClient", "devtools/shared/webconsole/client", true);
 loader.lazyRequireGetter(this, "DebuggerSocket", "devtools/shared/security/socket", true);
 loader.lazyRequireGetter(this, "Authentication", "devtools/shared/security/auth");
diff --git a/devtools/shared/content-observer.js b/devtools/shared/content-observer.js
index 05fb3eadfce4..5c9ee5770651 100644
--- a/devtools/shared/content-observer.js
+++ b/devtools/shared/content-observer.js
@@ -6,7 +6,7 @@
 const {Ci} = require("chrome");
 const Services = require("Services");
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 /**
  * Handles adding an observer for the creation of content document globals,
diff --git a/devtools/shared/fronts/inspector.js b/devtools/shared/fronts/inspector.js
index 31116941d5e5..fd8fe72881fa 100644
--- a/devtools/shared/fronts/inspector.js
+++ b/devtools/shared/fronts/inspector.js
@@ -23,7 +23,7 @@ const {
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
 const { Task } = require("devtools/shared/task");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 const nodeConstants = require("devtools/shared/dom-node-constants.js");
 loader.lazyRequireGetter(this, "CommandUtils",
   "devtools/client/shared/developer-toolbar", true);
diff --git a/devtools/shared/fronts/profiler.js b/devtools/shared/fronts/profiler.js
index 6e8082244fd2..6917f34decb6 100644
--- a/devtools/shared/fronts/profiler.js
+++ b/devtools/shared/fronts/profiler.js
@@ -11,7 +11,7 @@ const {
 } = require("devtools/shared/protocol");
 const { profilerSpec } = require("devtools/shared/specs/profiler");
 
-loader.lazyRequireGetter(this, "events", "sdk/event/core");
+loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");
 
 /**
  * This can be used on older Profiler implementations, but the methods cannot
diff --git a/devtools/shared/fronts/styleeditor.js b/devtools/shared/fronts/styleeditor.js
index 5feb6df1b636..66e75195956c 100644
--- a/devtools/shared/fronts/styleeditor.js
+++ b/devtools/shared/fronts/styleeditor.js
@@ -11,7 +11,7 @@ const {
 } = require("devtools/shared/specs/styleeditor");
 const promise = require("promise");
 const defer = require("devtools/shared/defer");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 /**
  * StyleSheetFront is the client-side counterpart to a StyleSheetActor.
diff --git a/devtools/shared/fronts/stylesheets.js b/devtools/shared/fronts/stylesheets.js
index 6df8a9bd46db..b53ea464660e 100644
--- a/devtools/shared/fronts/stylesheets.js
+++ b/devtools/shared/fronts/stylesheets.js
@@ -16,7 +16,7 @@ const {
 } = require("devtools/shared/specs/stylesheets");
 const promise = require("promise");
 const { Task } = require("devtools/shared/task");
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 /**
  * The client-side counterpart for an OriginalSourceActor.
diff --git a/devtools/shared/gcli/commands/measure.js b/devtools/shared/gcli/commands/measure.js
index 5f5d592b8ad8..a745c906821d 100644
--- a/devtools/shared/gcli/commands/measure.js
+++ b/devtools/shared/gcli/commands/measure.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 loader.lazyRequireGetter(this, "CommandState",
   "devtools/shared/gcli/command-state", true);
diff --git a/devtools/shared/gcli/commands/rulers.js b/devtools/shared/gcli/commands/rulers.js
index b24d23422ade..0f9ec1537cec 100644
--- a/devtools/shared/gcli/commands/rulers.js
+++ b/devtools/shared/gcli/commands/rulers.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const events = require("sdk/event/core");
+const events = require("devtools/shared/event-emitter");
 
 loader.lazyRequireGetter(this, "CommandState",
   "devtools/shared/gcli/command-state", true);
diff --git a/devtools/shared/protocol.js b/devtools/shared/protocol.js
index 0b7551bb4e81..b5bfdf531d3c 100644
--- a/devtools/shared/protocol.js
+++ b/devtools/shared/protocol.js
@@ -8,7 +8,7 @@ var promise = require("promise");
 var defer = require("devtools/shared/defer");
 var {Class} = require("sdk/core/heritage");
 var {EventTarget} = require("sdk/event/target");
-var events = require("sdk/event/core");
+var events = require("devtools/shared/event-emitter");
 var {getStack, callFunctionWithAsyncStack} = require("devtools/shared/platform/stack");
 var {settleAll} = require("devtools/shared/DevToolsUtils");