Rename pollForCriteria to pollForTestThreadCriteria.

android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.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.android_webview.test;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient;
@@ skipping 186 matching lines @@
                 pageWidth, pageScale);
 
         settings.setJavaScriptEnabled(true);
         settings.setUseWideViewPort(true);
         settings.setBuiltInZoomControls(true);
         settings.setSupportZoom(true);
 
         loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);
         // ContentView must update itself according to the viewport setup.
         // As we specify 'user-scalable=0', the page must become non-zoomable.
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return !canZoomInOnUiThread(awContents) && !canZoomOutOnUiThread(awContents);
             }
         });
         int width = Integer.parseInt(getTitleOnUiThread(awContents));
         assertEquals(pageWidth, width);
         assertEquals(pageScale, getScaleOnUiThread(awContents));
     }
 
@@ skipping 121 matching lines @@
         assertEquals(expectedBackgroundSize, actualBackgroundSize);
     }
 
     private AwTestContainerView createAwTestContainerViewOnMainSyncInQuirksMode(
             final AwContentsClient client) throws Exception {
         return createAwTestContainerViewOnMainSync(client, true);
     }
 
     private void ensureScaleBecomes(final float targetScale, final AwContents awContents)
             throws Throwable {
-        poll(new Callable<Boolean>() {
+        pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return targetScale == getScaleOnUiThread(awContents);
             }
         });
     }
 }