Rename pollForCriteria to pollForTestThreadCriteria.

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.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.content.Context;
 import android.graphics.Point;
 import android.net.http.SslError;
 import android.os.Build;
@@ skipping 923 matching lines @@
                 mOldFontSize = getActualFontSize();
                 mNeedToWaitForFontSizeChange = true;
             }
         }
 
         protected float getActualFontSize() throws Throwable {
             if (!mNeedToWaitForFontSizeChange) {
                 executeJavaScriptAndWaitForResult("setTitleToActualFontSize()");
             } else {
                 final float oldFontSize = mOldFontSize;
-                poll(new Callable<Boolean>() {
+                pollInstrumentationThread(new Callable<Boolean>() {
                     @Override
                     public Boolean call() throws Exception {
                         executeJavaScriptAndWaitForResult("setTitleToActualFontSize()");
                         float newFontSize = Float.parseFloat(getTitleOnUiThread());
                         return newFontSize != oldFontSize;
                     }
                 });
                 mNeedToWaitForFontSizeChange = false;
             }
             return Float.parseFloat(getTitleOnUiThread());
@@ skipping 202 matching lines @@
 
         @Override
         protected void setCurrentValue(Boolean value) {
             mAwSettings.setJavaScriptCanOpenWindowsAutomatically(value);
         }
 
         @Override
         protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
             loadDataSync(getData());
             final boolean expectPopupEnabled = value;
-            poll(new Callable<Boolean>() {
+            pollInstrumentationThread(new Callable<Boolean>() {
                 @Override
                 public Boolean call() throws Exception {
                     String title = getTitleOnUiThread();
                     return expectPopupEnabled ? POPUP_ENABLED.equals(title) :
                             POPUP_BLOCKED.equals(title);
                 }
             });
             assertEquals(value ? POPUP_ENABLED : POPUP_BLOCKED, getTitleOnUiThread());
         }
 
@@ skipping 397 matching lines @@
         settings.setJavaScriptEnabled(true);
         ImagePageGenerator generator = new ImagePageGenerator(0, false);
         settings.setLoadsImagesAutomatically(false);
         loadDataSync(awContents,
                      contentClient.getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html", false);
         assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
                 getTitleOnUiThread(awContents));
         settings.setLoadsImagesAutomatically(true);
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
                         getTitleOnUiThread(awContents));
             }
         });
         assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
     }
 
 
@@ skipping 366 matching lines @@
         TestWebServer webServer = TestWebServer.start();
         try {
             final String httpImageUrl = generator.getPageUrl(webServer);
 
             settings.setImagesEnabled(false);
             loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), httpImageUrl);
             assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
                     getTitleOnUiThread(awContents));
 
             settings.setImagesEnabled(true);
-            poll(new Callable<Boolean>() {
+            pollInstrumentationThread(new Callable<Boolean>() {
                 @Override
                 public Boolean call() throws Exception {
                     return ImagePageGenerator.IMAGE_LOADED_STRING.equals(
                         getTitleOnUiThread(awContents));
                 }
             });
         } finally {
             webServer.shutdown();
         }
     }
@@ skipping 396 matching lines @@
         int waitUntilHtmlIsRequested(final int initialRequestCount) throws Exception {
             return waitUntilResourceIsRequested(mHtmlPath, initialRequestCount);
         }
 
         int waitUntilManifestIsRequested(final int initialRequestCount) throws Exception {
             return waitUntilResourceIsRequested(mManifestPath, initialRequestCount);
         }
 
         private int waitUntilResourceIsRequested(
                 final String path, final int initialRequestCount) throws Exception {
-            poll(new Callable<Boolean>() {
+            pollInstrumentationThread(new Callable<Boolean>() {
                 @Override
                 public Boolean call() throws Exception {
                     return mWebServer.getRequestCount(path) > initialRequestCount;
                 }
             });
             return mWebServer.getRequestCount(path);
         }
     }
 
     @SmallTest
@@ skipping 614 matching lines @@
         final AwContents awContents = webView.getAwContents();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 awContents.getContentViewCore().sendDoubleTapForTest(
                         SystemClock.uptimeMillis(), x, y);
             }
         });
     }
 }