Bug 1010750 - Part 2: Repair dbg-browser-actors on Fennec. r=margaret, r=past

--HG--
rename : mobile/android/chrome/content/dbg-browser-actors.js => mobile/android/modules/dbg-browser-actors.js

mobile/android/chrome/content/browser.js

@@ -7434,7 +7434,7 @@ var RemoteDebugger = {
       if (!DebuggerServer.initialized) {
         DebuggerServer.init(this._showConnectionPrompt.bind(this));
         DebuggerServer.addBrowserActors();
-        DebuggerServer.addActors("chrome://browser/content/dbg-browser-actors.js");
+        DebuggerServer.registerModule("resource://gre/modules/dbg-browser-actors.js");
       }
 
       let port = this._getPort();

mobile/android/chrome/jar.mn

@@ -38,7 +38,6 @@ chrome.jar:
   content/netError.xhtml               (content/netError.xhtml)
   content/SelectHelper.js              (content/SelectHelper.js)
   content/SelectionHandler.js          (content/SelectionHandler.js)
-  content/dbg-browser-actors.js        (content/dbg-browser-actors.js)
 * content/WebappRT.js                  (content/WebappRT.js)
   content/InputWidgetHelper.js         (content/InputWidgetHelper.js)
   content/WebrtcUI.js                  (content/WebrtcUI.js)

mobile/android/modules/dbg-browser-actors.js

@@ -8,6 +8,11 @@
  * Fennec-specific actors.
  */
 
+const { RootActor } = require("devtools/server/actors/root");
+const { DebuggerServer } = require("devtools/server/main");
+const { BrowserTabList, BrowserAddonList, sendShutdownEvent } =
+  require("devtools/server/actors/webbrowser");
+
 /**
  * Construct a root actor appropriate for use in a server running in a
  * browser on Android. The returned root actor:
@@ -62,3 +67,11 @@ MobileTabList.prototype._getSelectedBrowser = function(aWindow) {
 MobileTabList.prototype._getChildren = function(aWindow) {
   return aWindow.BrowserApp.tabs.map(tab => tab.browser);
 };
+
+exports.register = function(handle) {
+  handle.setRootActor(createRootActor);
+};
+
+exports.unregister = function(handle) {
+  handle.setRootActor(null);
+};

mobile/android/modules/moz.build

@@ -8,6 +8,7 @@ EXTRA_JS_MODULES += [
     'Accounts.jsm',
     'AndroidLog.jsm',
     'ContactService.jsm',
+    'dbg-browser-actors.js',
     'HelperApps.jsm',
     'Home.jsm',
     'HomeProvider.jsm',

toolkit/devtools/server/actors/webbrowser.js

@@ -67,6 +67,8 @@ function sendShutdownEvent() {
   }
 }
 
+exports.sendShutdownEvent = sendShutdownEvent;
+
 /**
  * Construct a root actor appropriate for use in a server running in a
  * browser. The returned root actor:
@@ -1149,6 +1151,8 @@ BrowserTabActor.prototype.exit = function() {
   this._tabbrowser = null;
 };
 
+exports.BrowserTabActor = BrowserTabActor;
+
 /**
  * This actor is a shim that connects to a ContentActor in a remote
  * browser process. All RDP packets get forwarded using the message
@@ -1225,6 +1229,8 @@ BrowserAddonList.prototype.onUninstalled = function (aAddon) {
   this._onListChanged();
 };
 
+exports.BrowserAddonList = BrowserAddonList;
+
 function BrowserAddonActor(aConnection, aAddon) {
   this.conn = aConnection;
   this._addon = aAddon;