From c87d8ae9ed9927e23c6eb09faf2b6107d69a8588 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Tue, 3 Mar 2015 03:20:00 -0500
Subject: [PATCH] Bug 1138444 - Add Mulet detection for reftests. r=jgriffin

--HG--
extra : rebase_source : 5b50f02fe229b8d0dfaaba3924061dc6b985f3b8
---
 layout/tools/reftest/b2g_desktop.py | 2 +-
 layout/tools/reftest/reftest.js     | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/layout/tools/reftest/b2g_desktop.py b/layout/tools/reftest/b2g_desktop.py
index b4a0b414c122..335ac7cfd458 100644
--- a/layout/tools/reftest/b2g_desktop.py
+++ b/layout/tools/reftest/b2g_desktop.py
@@ -41,7 +41,7 @@ class B2GDesktopReftest(RefTest):
         assert(self.marionette.wait_for_port())
         self.marionette.start_session()
         if self.build_type == "mulet":
-            self._wait_for_homescreen(timeout=15)
+            self._wait_for_homescreen(timeout=300)
             self._unlockScreen()
         self.marionette.set_context(self.marionette.CONTEXT_CHROME)
 
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 63e0aa96c2f7..ef5cfb7d4648 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -60,6 +60,7 @@ const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2
 var gBrowser;
 // Are we testing web content loaded in a separate process?
 var gBrowserIsRemote;           // bool
+var gB2GisMulet;                // bool
 // Are we using <iframe mozbrowser>?
 var gBrowserIsIframe;           // bool
 var gBrowserMessageManager;
@@ -248,6 +249,12 @@ this.OnRefTestLoad = function OnRefTestLoad(win)
         gBrowserIsRemote = false;
     }
 
+    try {
+        gB2GisMulet = prefs.getBoolPref("b2g.is_mulet");
+    } catch (e) {
+        gB2GisMulet = false;
+    }
+
     try {
       gBrowserIsIframe = prefs.getBoolPref("reftest.browser.iframe.enabled");
     } catch (e) {
@@ -730,6 +737,7 @@ function BuildConditionSandbox(aURL) {
     // Tests shouldn't care about this except for when they need to
     // crash the content process
     sandbox.browserIsRemote = gBrowserIsRemote;
+    sandbox.Mulet = gB2GisMulet;
 
     try {
         sandbox.asyncPanZoom = prefs.getBoolPref("layers.async-pan-zoom.enabled");