Rename pollForCriteria to pollForTestThreadCriteria.

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.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 android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ skipping 409 matching lines @@
     }
 
     /**
      * Asserts that the keep screen on property in the given {@code view} is active as
      * {@code expected}. It also verifies that it is only active when the video is playing.
      */
     private void assertWaitForKeepScreenOnActive(final View view, final boolean expected)
             throws InterruptedException {
         // We need to poll because it takes time to synchronize the state between the android
         // views and Javascript.
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
                     return getKeepScreenOnOnInstrumentationThread(view) == expected
                             && DOMUtils.isMediaPaused(getWebContentsOnUiThread(), VIDEO_ID)
                             != expected;
                 } catch (InterruptedException | TimeoutException e) {
                     fail(e.getMessage());
                     return false;
                 }
@@ skipping 30 matching lines @@
                 if (getKeepScreenOnOnUiThread(viewGroup.getChildAt(i))) {
                     return true;
                 }
             }
         }
         return view.getKeepScreenOn();
     }
 
     private void assertWaitForIsFullscreen() throws InterruptedException {
         // We need to poll because the Javascript state is updated asynchronously
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
                     return DOMUtils.isFullscreen(getWebContentsOnUiThread());
                 } catch (InterruptedException | TimeoutException e) {
                     fail(e.getMessage());
                     return false;
                 }
             }
         });
     }
 
     private void assertWaitForIsEmbedded() throws InterruptedException {
         // We need to poll because the Javascript state is updated asynchronously
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
                     return !DOMUtils.isFullscreen(getWebContentsOnUiThread());
                 } catch (InterruptedException | TimeoutException e) {
                     fail(e.getMessage());
                     return false;
                 }
             }
         });
@@ skipping 54 matching lines @@
                 public WebContents call() throws Exception {
                     return mContentViewCore.getWebContents();
                 }
             });
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
         }
     }
 }