From 33323dbfca7db8c29d2f62cbbcebfc64e5bcb0b7 Mon Sep 17 00:00:00 2001
From: Adrian Tamas <adrian.tamas@softvision.ro>
Date: Thu, 17 Oct 2013 14:06:21 +0300
Subject: [PATCH] Bug 927296 - Fix testPrivateBrowsing NullPointerException by
 waiting for the title placeholder. r=gbrown

---
 mobile/android/base/tests/PixelTest.java.in    | 1 +
 mobile/android/base/tests/StringHelper.java.in | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/mobile/android/base/tests/PixelTest.java.in b/mobile/android/base/tests/PixelTest.java.in
index 10949d8327fe..3f364982e4ba 100644
--- a/mobile/android/base/tests/PixelTest.java.in
+++ b/mobile/android/base/tests/PixelTest.java.in
@@ -57,6 +57,7 @@ abstract class PixelTest extends BaseTest {
         }
         tabEventExpecter.blockForEvent();
         contentEventExpecter.blockForEvent();
+        waitForText(StringHelper.TITLE_PLACE_HOLDER);
         loadAndPaint(url);
         tabEventExpecter.unregisterListener();
         contentEventExpecter.unregisterListener();
diff --git a/mobile/android/base/tests/StringHelper.java.in b/mobile/android/base/tests/StringHelper.java.in
index 3a8aaaa1b38f..87a4f93abb0d 100644
--- a/mobile/android/base/tests/StringHelper.java.in
+++ b/mobile/android/base/tests/StringHelper.java.in
@@ -45,6 +45,8 @@ class StringHelper {
         "Add to Home Screen"
     };
 
+    public static final String TITLE_PLACE_HOLDER = "Enter Search or Address";
+
     // Robocop page urls
     // Note: please use getAbsoluteUrl(String url) on each robocop url to get the correct url
     public static final String ROBOCOP_BIG_LINK_URL = "/robocop/robocop_big_link.html";