Rename pollForCriteria to pollForTestThreadCriteria.

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
index c17f7490d258f1d4ad61310262bc5b4aea1744b7..c96fdeb0ef5f752fd41f366c65c75187ce69cfd8 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
@@ -199,7 +199,7 @@ public class CookieManagerTest extends AwTestBase {
 
         mCookieManager.setCookie(url, cookie, null);
 
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return mCookieManager.hasCookies();
@@ -237,7 +237,7 @@ public class CookieManagerTest extends AwTestBase {
         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();
@@ -290,7 +290,7 @@ public class CookieManagerTest extends AwTestBase {
         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);
@@ -321,7 +321,7 @@ public class CookieManagerTest extends AwTestBase {
         assertTrue(mCookieManager.hasCookies());
 
         // But eventually expires:
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return !mCookieManager.hasCookies();
@@ -664,7 +664,7 @@ public class CookieManagerTest extends AwTestBase {
     }
 
     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;