Bug 1252287 - Repair gDevTools shim to use Services.jsm. r=ochameau
authorJ. Ryan Stinnett <jryans@gmail.com>
Mon, 29 Feb 2016 17:42:31 -0600
changeset 322639 f3c825e2db438ae6be21e157f86f88ed18f62b0d
parent 322570 d6788a70c97b5ed250e65e4d83c435fc6791e3ff
child 322640 39c23264761c7a9828597e2ccabbc1ae3cac1f0b
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1252287
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1252287 - Repair gDevTools shim to use Services.jsm. r=ochameau MozReview-Commit-ID: BKmaGubgLAd
devtools/client/shims/gDevTools.jsm
--- a/devtools/client/shims/gDevTools.jsm
+++ b/devtools/client/shims/gDevTools.jsm
@@ -6,17 +6,17 @@
 
 /**
  * This file only exists to support add-ons which import this module at a
  * specific path.
  */
 
 const Cu = Components.utils;
 
-const Services = require("Services");
+const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 
 const WARNING_PREF = "devtools.migration.warnings";
 if (Services.prefs.getBoolPref(WARNING_PREF)) {
   const { Deprecated } = Cu.import("resource://gre/modules/Deprecated.jsm", {});
   Deprecated.warning("This path to gDevTools.jsm is deprecated.  Please use " +
                      "Cu.import(\"resource://devtools/client/" +
                      "framework/gDevTools.jsm\") to load this module.",
                      "https://bugzil.la/912121");