Revert Revert of Start calling show/hide onStart/onStop in DocumentActivity)

chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java
index 9bd106d45233b276d488f1caedaaaf6710e61295..a3ea6d1b7277a8f669ce92a2c4b3cf290c940fae 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java
@@ -17,6 +17,8 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ApplicationTestUtils;
 import org.chromium.content.browser.test.util.CallbackHelper;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
 
 /**
  * Tests for Tab class.
@@ -95,14 +97,24 @@ public class TabTest extends ChromeActivityTestCaseBase<ChromeActivity> {
             }
         });
 
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mTab.isHidden();
+            }
+        }));
         assertTrue(mTab.needsReload());
-        assertTrue(mTab.isHidden());
         assertFalse(mTab.isShowingSadTab());
 
         ApplicationTestUtils.launchChrome(getInstrumentation().getTargetContext());
 
         // The tab should be restored and visible.
-        assertFalse(mTab.isHidden());
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return !mTab.isHidden();
+            }
+        }));
         assertFalse(mTab.needsReload());
         assertFalse(mTab.isShowingSadTab());
     }