Bug 1252287 - Repair gDevTools shim to use Services.jsm. r=ochameau draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Mon, 29 Feb 2016 17:42:31 -0600
changeset 335600 ebb7ae92f86e68f740303ffb68993d266b965100
parent 335599 446932a345fe1631718eb0b6bcb3e098c2958265
child 515171 a58b8df5ec76c1eca2a932c721d4acba9e854857
push id11826
push userbmo:jryans@gmail.com
push dateMon, 29 Feb 2016 23:43:22 +0000
reviewersochameau
bugs1252287
milestone47.0a1
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");