Bug 952214 - Re-enable webapps actor mochitest on b2g desktop and cover shell.js debugger server initialization. r=paul

b2g/chrome/content/shell.js

@@ -1102,6 +1102,9 @@ let RemoteDebugger = {
                "/data/local/debugger-socket";
     try {
       DebuggerServer.openListener(path);
+      // Temporary event, until bug 942756 lands and offer a way to know
+      // when the server is up and running
+      Services.obs.notifyObservers(null, 'debugger-server-started', null);
       this._running = true;
     } catch (e) {
       dump('Unable to start debugger server: ' + e + '\n');

testing/mochitest/b2g-desktop.json

@@ -676,7 +676,6 @@
     "layout/generic/test/test_plugin_clipping.xhtml": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_plugin_clipping2.xhtml": "Bug 931116, b2g desktop specific, initial triage",
     "layout/generic/test/test_plugin_clipping_table.xhtml": "Bug 931116, b2g desktop specific, initial triage",
-    "layout/generic/test/test_plugin_clipping_transformed.xhtml": "Bug 931116, b2g desktop specific, initial triage",
-    "toolkit/devtools/apps/tests/test_webapps_actor.html": "Bug 931116, b2g desktop specific, initial triage"
+    "layout/generic/test/test_plugin_clipping_transformed.xhtml": "Bug 931116, b2g desktop specific, initial triage"
   }
 }

toolkit/devtools/apps/tests/debugger-protocol-helper.js

@@ -14,20 +14,36 @@ const { Services } = Cu.import("resource://gre/modules/Services.jsm");
 let gClient, gActor;
 
 function connect(onDone) {
-  // Initialize a loopback remote protocol connection
-  DebuggerServer.init(function () { return true; });
-  // We need to register browser actors to have `listTabs` working
-  // and also have a root actor
 
   if (Services.appinfo.name == "B2G") {
-    DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
-    DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
-    DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webapps.js");
-   } else {
+    // On b2g, we try to exercice the code that launches the production debugger server
+    let settingsService = Cc["@mozilla.org/settingsService;1"].getService(Ci.nsISettingsService);
+    settingsService.createLock().set("devtools.debugger.remote-enabled", true, null);
+    // We can't use `set` callback as it is fired before shell.js code listening for this setting
+    // is actually called. Same thing applies to mozsettings-changed obs notification.
+    // So listen to a custom event until bug 942756 lands
+    let observer = {
+      observe: function (subject, topic, data) {
+        Services.obs.removeObserver(observer, "debugger-server-started");
+        let transport = debuggerSocketConnect("127.0.0.1", 6000);
+        startClient(transport, onDone);
+      }
+    };
+    Services.obs.addObserver(observer, "debugger-server-started", false);
+  } else {
+    // Initialize a loopback remote protocol connection
+    DebuggerServer.init(function () { return true; });
+    // We need to register browser actors to have `listTabs` working
+    // and also have a root actor
     DebuggerServer.addBrowserActors();
-   }
+    let transport = DebuggerServer.connectPipe();
+    startClient(transport, onDone);
+  }
+}
+
+function startClient(transport, onDone) {
   // Setup client and actor used in all tests
-  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient = new DebuggerClient(transport);
   gClient.connect(function onConnect() {
     gClient.listTabs(function onListTabs(aResponse) {
       gActor = aResponse.webappsActor;

toolkit/devtools/apps/tests/test_webapps_actor.html

@@ -75,7 +75,9 @@ var steps = [
     SpecialPowers.pushPrefEnv({
       set: [["dom.mozBrowserFramesEnabled", true],
             ["security.apps.privileged.CSP.default",
-             "default-src *; script-src 'self'; object-src 'none'; style-src 'self' 'unsafe-inline'"]
+             "default-src *; script-src 'self'; object-src 'none'; style-src 'self' 'unsafe-inline'"],
+            ["devtools.debugger.unix-domain-socket", 6000],
+            ["devtools.debugger.prompt-connection", false]
            ]
     }, next);
   },

toolkit/devtools/client/dbg-client.jsm

@@ -5,10 +5,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-const Cu = Components.utils;
-const Cr = Components.results;
+var Ci = Components.interfaces;
+var Cc = Components.classes;
+var Cu = Components.utils;
+var Cr = Components.results;
+// On B2G scope object misbehaves and we have to bind globals to `this`
+// in order to ensure theses variable to be visible in transport.js
+this.Ci = Ci;
+this.Cc = Cc;
+this.Cu = Cu;
+this.Cr = Cr;
 
 this.EXPORTED_SYMBOLS = ["DebuggerTransport",
                          "DebuggerClient",

toolkit/devtools/server/main.js

@@ -35,7 +35,6 @@ Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 let wantLogging = Services.prefs.getBoolPref("devtools.debugger.log");
-const promptConnections = Services.prefs.getBoolPref("devtools.debugger.prompt-connection");
 
 Cu.import("resource://gre/modules/jsdebugger.jsm");
 addDebuggerToGlobal(this);
@@ -513,7 +512,7 @@ var DebuggerServer = {
 
   onSocketAccepted:
   makeInfallible(function DS_onSocketAccepted(aSocket, aTransport) {
-    if (promptConnections && !this._allowConnection()) {
+    if (Services.prefs.getBoolPref("devtools.debugger.prompt-connection") && !this._allowConnection()) {
       return;
     }
     dumpn("New debugging connection on " + aTransport.host + ":" + aTransport.port);