Rename pollForCriteria to pollForTestThreadCriteria.

android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java

 // Copyright 2012 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.android_webview.test;
 
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Pair;
 import android.webkit.ValueCallback;
@@ skipping 181 matching lines @@
     @Feature({"AndroidWebView", "Privacy"})
     public void testSetCookieNullCallback() throws Throwable {
         mCookieManager.setAcceptCookie(true);
         assertTrue(mCookieManager.acceptCookie());
 
         final String url = "http://www.example.com";
         final String cookie = "name=test";
 
         mCookieManager.setCookie(url, cookie, null);
 
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return mCookieManager.hasCookies();
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
     public void testRemoveAllCookiesCallback() throws Throwable {
@@ skipping 17 matching lines @@
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
     public void testRemoveAllCookiesNullCallback() throws Throwable {
         mCookieManager.setCookie("http://www.example.com", "name=test");
 
         mCookieManager.removeAllCookies(null);
 
         // Eventually the cookies are removed.
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return !mCookieManager.hasCookies();
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
     public void testRemoveSessionCookiesCallback() throws Throwable {
@@ skipping 32 matching lines @@
 
         mCookieManager.setCookie(url, sessionCookie);
         mCookieManager.setCookie(url, makeExpiringCookie(normalCookie, 600));
         String allCookies = mCookieManager.getCookie(url);
         assertTrue(allCookies.contains(sessionCookie));
         assertTrue(allCookies.contains(normalCookie));
 
         mCookieManager.removeSessionCookies(null);
 
         // Eventually the session cookie is removed.
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 String c = mCookieManager.getCookie(url);
                 return !c.contains(sessionCookie) && c.contains(normalCookie);
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
@@ skipping 10 matching lines @@
     public void testCookiesExpire() throws Exception {
         final String url = "http://www.example.com";
         final String cookie = "cookie1=peter";
 
         mCookieManager.setCookie(url, makeExpiringCookieMs(cookie, 1200));
 
         // The cookie exists:
         assertTrue(mCookieManager.hasCookies());
 
         // But eventually expires:
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return !mCookieManager.hasCookies();
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView", "Privacy"})
     public void testCookieExpiration() throws Exception {
@@ skipping 322 matching lines @@
     }
 
     /**
      * Clears all cookies synchronously.
      */
     private void clearCookies() throws Throwable {
         CookieUtils.clearCookies(this, mCookieManager);
     }
 
     private void waitForCookie(final String url) throws Exception {
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return mCookieManager.getCookie(url) != null;
             }
         });
     }
 
     private void validateCookies(String responseCookie, String... expectedCookieNames) {
         String[] cookies = responseCookie.split(";");
         Set<String> foundCookieNames = new HashSet<String>();
         for (String cookie : cookies) {
             foundCookieNames.add(cookie.substring(0, cookie.indexOf("=")).trim());
         }
         MoreAsserts.assertEquals(
                 foundCookieNames, new HashSet<String>(Arrays.asList(expectedCookieNames)));
     }
 
     private String makeExpiringCookie(String cookie, int secondsTillExpiry) {
         return makeExpiringCookieMs(cookie, secondsTillExpiry * 1000);
     }
 
     @SuppressWarnings("deprecation")
     private String makeExpiringCookieMs(String cookie, int millisecondsTillExpiry) {
         Date date = new Date();
         date.setTime(date.getTime() + millisecondsTillExpiry);
         return cookie + "; expires=" + date.toGMTString();
     }
 }