Bug 1218103 - Update references to devtools paths after Bug 1203159 shuffled paths around r=Neil a=Callek CLOSED TREE
authorPhilip Chee <philip.chee@gmail.com>
Thu, 05 Nov 2015 04:42:32 +0800
changeset 18546 de5ecd310010d72ef83915640f95dee55c5920fd
parent 18545 83a9ccd2a3fda51b7e6fc58af54d0be28533a3cd
child 18547 79455af1ccffe6c45849314b3dd39fdb74049713
push id11358
push userphilip.chee@gmail.com
push dateWed, 04 Nov 2015 20:43:41 +0000
treeherdercomm-central@de5ecd310010 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNeil, Callek
bugs1218103, 1203159
Bug 1218103 - Update references to devtools paths after Bug 1203159 shuffled paths around r=Neil a=Callek CLOSED TREE
suite/common/src/nsSuiteGlue.js
--- a/suite/common/src/nsSuiteGlue.js
+++ b/suite/common/src/nsSuiteGlue.js
@@ -30,18 +30,21 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource://gre/modules/BookmarkHTMLUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
                                   "resource://gre/modules/BookmarkJSONUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "DebuggerServer",
-                                  "resource://gre/modules/devtools/dbg-server.jsm");
+XPCOMUtils.defineLazyGetter(this, "DebuggerServer", () => {
+  var tmp = {};
+  Components.utils.import("resource://devtools/shared/Loader.jsm", tmp);
+  return tmp.require("devtools/server/main").DebuggerServer;
+});
 
 // We try to backup bookmarks at idle times, to avoid doing that at shutdown.
 // Number of idle seconds before trying to backup bookmarks.  15 minutes.
 const BOOKMARKS_BACKUP_IDLE_TIME = 15 * 60;
 // Minimum interval in milliseconds between backups.
 const BOOKMARKS_BACKUP_INTERVAL = 86400 * 1000;
 // Maximum number of backups to create.  Old ones will be purged.
 const BOOKMARKS_BACKUP_MAX_BACKUPS = 10;