android: Add a method to let Java know whether a prerender has finished loading.

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
index ef2799e7783d1f6763013f81b8172f87348cc100..86b2bb2e1d93d0e1a75394602c726c3c5a28ffdd 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
@@ -45,6 +45,8 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+import org.chromium.chrome.browser.prerender.ExternalPrerenderHandler;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
@@ -767,7 +769,8 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
     }
 
     /**
-     * Test whether the url shown on prerender gets updated from about:blank.
+     * Test whether the url shown on prerender gets updated from about:blank when the prerender
+     * completes in the background.
      * Non-regression test for crbug.com/554236.
      */
     @SmallTest
@@ -778,6 +781,17 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
         ICustomTabsCallback cb = new CustomTabsTestUtils.DummyCallback();
         connection.newSession(cb);
         assertTrue(connection.mayLaunchUrl(cb, Uri.parse(mTestPage), null, null));
+
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria("No prerender") {
+            @Override
+            public boolean isSatisfied() {
+                return connection.mPrerender.mWebContents != null
+                        && ExternalPrerenderHandler.hasPrerenderedAndFinishedLoadingUrl(
+                                Profile.getLastUsedProfile(), mTestPage,
+                                connection.mPrerender.mWebContents);
+            }
+        });
+
         try {
             startCustomTabActivityWithIntent(CustomTabsTestUtils.createMinimalCustomTabIntent(
                     context, mTestPage, cb.asBinder()));