Rename pollForCriteria to pollForTestThreadCriteria.

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
index 9056c7fdf32338dd04cc4c7f0cfa8254f2b5f6fe..7c17360a2e4909ef12f50d7614c080acb0218dc5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
@@ -128,7 +128,7 @@ public class AwZoomTest extends AwTestBase {
     }
 
     private void waitForScaleChange(final float previousScale) throws Throwable {
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return previousScale != getPixelScaleOnUiThread(mAwContents);
@@ -137,7 +137,7 @@ public class AwZoomTest extends AwTestBase {
     }
 
     private void waitForScaleToBecome(final float expectedScale) throws Throwable {
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return expectedScale == getScaleOnUiThread(mAwContents);
@@ -146,7 +146,7 @@ public class AwZoomTest extends AwTestBase {
     }
 
     private void waitUntilCanNotZoom() throws Throwable {
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return !canZoomInOnUiThread(mAwContents)