Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2900)

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

Issue 1710853002: android: Add a method to let Java know whether a prerender has finished loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bd8892ee9a85b50fdc1c59b0beffdf9cf02f7766..bd6963fbd8c4e6caecec0b00b4cb76d420377917 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;
@@ -770,7 +772,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
@@ -781,6 +784,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(
gone 2016/02/22 18:50:15 indentation seems really off
Benoit L 2016/02/25 16:03:21 It's weird indeed, but "git cl format" said so...
gone 2016/02/25 18:02:00 git cl format never really works well on java... a
Benoit L 2016/02/26 10:25:19 Done.
+ Profile.getLastUsedProfile(), mTestPage,
+ connection.mPrerender.mWebContents);
+ }
+ });
+
try {
startCustomTabActivityWithIntent(CustomTabsTestUtils.createMinimalCustomTabIntent(
context, mTestPage, cb.asBinder()));

Powered by Google App Engine
This is Rietveld 408576698