weblayer: Wait for first contentful paint in tests

Wait for first contentful paint will ensure the page is ready to accept
touch events. This deflates fullscreen tests which relies on this.

Double the timeout allowed for loading, which is approaching the limit
on slow devices like nexus 5.

Change fullscreen polling to be on the UI thread.

Bug: 1019948
Change-Id: Ie04408d15904054f4a462a0a11c6a126fcb11a9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895757
Commit-Queue: Bo <boliu@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711969}

weblayer/shell/android/javatests/src/org/chromium/weblayer/test/FragmentRestoreTest.java

@@ -11,6 +11,9 @@
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
+import org.chromium.content_public.browser.test.util.TestThreadUtils;
+import org.chromium.weblayer.BrowserController;
+import org.chromium.weblayer.shell.InstrumentationActivity;
 
 @RunWith(BaseJUnit4ClassRunner.class)
 public class FragmentRestoreTest {
@@ -21,14 +24,19 @@ public class FragmentRestoreTest {
     @Test
     @SmallTest
     public void successfullyLoadsUrlAfterRotation() {
-        mActivityTestRule.launchShellWithUrl("about:blank");
+        InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl("about:blank");
+        BrowserController controller = TestThreadUtils.runOnUiThreadBlockingNoException(
+                () -> activity.getBrowserController());
 
         String url = "data:text,foo";
-        mActivityTestRule.navigateAndWait(url);
+        mActivityTestRule.navigateAndWait(controller, url, false);
 
         mActivityTestRule.recreateActivity();
 
+        InstrumentationActivity newActivity = mActivityTestRule.getActivity();
+        controller = TestThreadUtils.runOnUiThreadBlockingNoException(
+                () -> newActivity.getBrowserController());
         url = "data:text,bar";
-        mActivityTestRule.navigateAndWait(url);
+        mActivityTestRule.navigateAndWait(controller, url, false);
     }
 }

weblayer/shell/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java

@@ -52,21 +52,21 @@ public void exitFullscreen() {
         }
 
         public void waitForFullscreen() {
-            CriteriaHelper.pollInstrumentationThread(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return mEnterFullscreenCount == 1;
                 }
-            }, CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
+            });
         }
 
         public void waitForExitFullscreen() {
-            CriteriaHelper.pollInstrumentationThread(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return mExitFullscreenCount == 1;
                 }
-            }, CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
+            });
         }
     }
 

weblayer/shell/android/javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java

@@ -27,6 +27,7 @@
 import org.chromium.weblayer.shell.InstrumentationActivity;
 
 import java.lang.reflect.Field;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -40,6 +41,7 @@ private static final class NavigationWaiter {
         private BrowserController mController;
         private boolean mNavigationComplete;
         private boolean mDoneLoading;
+        private boolean mContentfulPaint;
         private CallbackHelper mCallbackHelper = new CallbackHelper();
 
         private NavigationCallback mNavigationCallback = new NavigationCallback() {
@@ -56,11 +58,20 @@ public void loadStateChanged(boolean isLoading, boolean toDifferentDocument) {
                 mDoneLoading = !isLoading;
                 checkComplete();
             }
+
+            @Override
+            public void onFirstContentfulPaint() {
+                mContentfulPaint = true;
+                checkComplete();
+            }
         };
 
-        public NavigationWaiter(String url, BrowserController controller) {
+        // |waitForPaint| should generally be set to true, unless there is a specific reason for
+        // onFirstContentfulPaint to not fire.
+        public NavigationWaiter(String url, BrowserController controller, boolean waitForPaint) {
             mUrl = url;
             mController = controller;
+            if (!waitForPaint) mContentfulPaint = true;
         }
 
         public void navigateAndWait() {
@@ -70,7 +81,8 @@ public void navigateAndWait() {
                 mController.getNavigationController().navigate(Uri.parse(mUrl));
             });
             try {
-                mCallbackHelper.waitForCallback(0);
+                mCallbackHelper.waitForCallback(
+                        0, 1, CallbackHelper.WAIT_TIMEOUT_SECONDS * 2, TimeUnit.SECONDS);
             } catch (TimeoutException e) {
                 throw new RuntimeException(e);
             }
@@ -81,7 +93,7 @@ public void navigateAndWait() {
         }
 
         private void checkComplete() {
-            if (mNavigationComplete && mDoneLoading) {
+            if (mNavigationComplete && mDoneLoading && mContentfulPaint) {
                 mCallbackHelper.notifyCalled();
             }
         }
@@ -142,11 +154,11 @@ public InstrumentationActivity launchShellWithUrl(String url) {
      * Loads the given URL in the shell.
      */
     public void navigateAndWait(String url) {
-        navigateAndWait(getActivity().getBrowserController(), url);
+        navigateAndWait(getActivity().getBrowserController(), url, true /* waitForPaint */);
     }
 
-    public void navigateAndWait(BrowserController controller, String url) {
-        NavigationWaiter waiter = new NavigationWaiter(url, controller);
+    public void navigateAndWait(BrowserController controller, String url, boolean waitForPaint) {
+        NavigationWaiter waiter = new NavigationWaiter(url, controller, waitForPaint);
         waiter.navigateAndWait();
     }
 

weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java

@@ -64,7 +64,7 @@ public void testZeroHeight() throws Exception {
         });
 
         mActivityTestRule.navigateAndWait(
-                mBrowserController, UrlUtils.encodeHtmlDataUri("<html></html>"));
+                mBrowserController, UrlUtils.encodeHtmlDataUri("<html></html>"), true);
 
         // Calling setSupportsEmbedding() makes sure onTopControlsChanged() will get called, which
         // should not crash.