Bug 715205 - b2g application can't run Gaia's browser-chrome tests r=cjones

b2g/chrome/content/shell.js

@@ -60,8 +60,8 @@ XPCOMUtils.defineLazyGetter(Services, 'fm', function() {
 
 // In order to use http:// scheme instead of file:// scheme
 // (that is much more restricted) the following code kick-off
-// a local http server listening on http://127.0.0.1:8888 and
-// http://localhost:8888.
+// a local http server listening on http://127.0.0.1:7777 and
+// http://localhost:7777.
 function startupHttpd(baseDir, port) {
   const httpdURL = 'chrome://browser/content/httpd.js';
   let httpd = {};
@@ -139,7 +139,7 @@ var shell = {
         baseDir.pop();
         baseDir = baseDir.join('/');
 
-        const SERVER_PORT = 8888;
+        const SERVER_PORT = 7777;
         startupHttpd(baseDir, SERVER_PORT);
 
         let baseHost = 'http://localhost';

b2g/chrome/content/shell.xul

@@ -40,6 +40,7 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="shell"
         width="480" height="800"
+        windowtype="navigator:browser"
 #ifdef ANDROID
         sizemode="fullscreen"
 #endif

testing/mochitest/runtests.py

@@ -798,11 +798,12 @@ toolbar#nav-bar {
       self.automation.log.warning("TEST-UNEXPECTED-FAIL | invalid setup: missing mochikit extension")
       return None
 
-    # Support Firefox (browser) and SeaMonkey (navigator).
+    # Support Firefox (browser), B2G (shell) and SeaMonkey (navigator).
     chrome = ""
     if options.browserChrome or options.chrome or options.a11y:
       chrome += """
 overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-test-overlay.xul
+overlay chrome://browser/content/shell.xul chrome://mochikit/content/browser-test-overlay.xul
 overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
 """