Rename pollForCriteria to pollForTestThreadCriteria.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

 // Copyright 2015 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.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.view.ViewGroup;
 
@@ skipping 108 matching lines @@
             }
         });
     }
 
     /**
      * Waits until any loads in progress have completed.
      */
     protected void waitUntilIdle() {
         getInstrumentation().waitForIdleSync();
         try {
-            CriteriaHelper.pollForCriteria(new Criteria() {
+            CriteriaHelper.pollInstrumentationThread(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return getActivity().getActivityTab() != null
                                 && !getActivity().getActivityTab().isLoading();
                     }
                 });
         } catch (InterruptedException exception) {
             fail();
         }
 
@@ skipping 38 matching lines @@
 
     @Override
     public final void startMainActivity() throws InterruptedException {
         // Do nothing; the WebappActivity may not have been completely set up, yet.
     }
 
     /**
      * Waits for the splash screen to be hidden.
      */
     protected void waitUntilSplashscreenHides() throws InterruptedException {
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return !getActivity().isSplashScreenVisibleForTests();
             }
         });
     }
 
     protected ViewGroup waitUntilSplashScreenAppears() {
         try {
-            CriteriaHelper.pollForCriteria(new Criteria() {
+            CriteriaHelper.pollInstrumentationThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return getActivity().getSplashScreenForTests() != null;
                 }
             });
         } catch (InterruptedException e) {
             fail();
         }
 
         ViewGroup splashScreen = getActivity().getSplashScreenForTests();
         if (splashScreen == null) {
             fail("No splash screen available.");
         }
         return splashScreen;
     }
 }