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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java

Issue 615843004: Make hasCookieStoreLoaded visible for testing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switched to using another threadUtils API Created 6 years, 2 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
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
index 4ef0054439df1bd01214fefcb36544eda9aa1bae..401107e8faa49103cd57a6f09627ecc085592bc3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.java
@@ -14,6 +14,8 @@ import org.chromium.chrome.browser.ContentViewUtil;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.shell.ChromeShellTestBase;
import org.chromium.chrome.test.util.TestHttpServerClient;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
import java.util.concurrent.Callable;
@@ -48,8 +50,18 @@ public class ExternalPrerenderRequestTest extends ChromeShellTestBase {
}
};
mProfile = ThreadUtils.runOnUiThreadBlocking(profileCallable);
- while (!ExternalPrerenderHandler.hasCookieStoreLoaded(mProfile))
- Thread.sleep(CHECK_COOKIE_STORE_FREQUENCY_MS);
+ final Callable<Boolean> cookieStoreCallable = new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ return ExternalPrerenderHandler.checkCookieStoreLoadedForTesting(mProfile);
+ }
+ };
+ assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+ @Override
+ public boolean isSatisfied() {
+ return ThreadUtils.runOnUiThreadBlockingNoException(cookieStoreCallable);
+ }
+ }, CHECK_COOKIE_STORE_FREQUENCY_MS, 5000));
}
@MediumTest
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698