Make hasCookieStoreLoaded visible for testing

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.prerender;
 
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 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;
 
 /**
  * Tests for adding and removing prerenders using the {@link ExternalPrerenderHandler}
  */
 public class ExternalPrerenderRequestTest extends ChromeShellTestBase {
     private static final String HOMEPAGE_URL =
             TestHttpServerClient.getUrl("chrome/test/data/android/prerender/homepage.html");
     private static final String GOOGLE_URL =
@@ skipping 14 matching lines @@
         launchChromeShellWithUrl(HOMEPAGE_URL);
         assertTrue(waitForActiveShellToBeDoneLoading());
         mHandler = new ExternalPrerenderHandler();
         final Callable<Profile> profileCallable = new Callable<Profile>() {
             @Override
             public Profile call() throws Exception {
                 return Profile.getLastUsedProfile();
             }
         };
         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
     @UiThreadTest
     @Feature({"Prerender"})
     /**
      * Test adding a prerender and canceling that to add a new one.
      */
     public void testAddPrerenderAndCancel() throws InterruptedException {
         long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
@@ skipping 33 matching lines @@
     public void testAddingPrerendersInaRow() throws InterruptedException {
         long webContentsPtr = mHandler.addPrerender(mProfile, GOOGLE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
                 mProfile, GOOGLE_URL, webContentsPtr));
         Thread.sleep(PRERENDER_DELAY_MS);
         long newWebContentsPtr = mHandler.addPrerender(mProfile, YOUTUBE_URL, "", 0, 0);
         assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl(
                 mProfile, YOUTUBE_URL, newWebContentsPtr));
     }
 }