Rename pollForCriteria to pollForTestThreadCriteria.

chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java

 // Copyright 2014 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.appmenu;
 
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.KeyEvent;
@@ skipping 76 matching lines @@
         super.setUp();
 
         showAppMenuAndAssertMenuShown();
         mAppMenu = getActivity().getAppMenuHandler().getAppMenu();
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mAppMenu.getPopup().getListView().setSelection(0);
             }
         });
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return getCurrentFocusedRow();
             }
         }));
         getInstrumentation().waitForIdleSync();
     }
 
     /**
      * Verify opening a new tab from the menu.
@@ skipping 89 matching lines @@
     /*
     @SmallTest
     @Feature({"Browser", "Main"})
     crbug.com/458193
     */
     @DisabledTest
     public void testChangingOrientationHidesMenu() throws InterruptedException {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         showAppMenuAndAssertMenuShown();
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        CriteriaHelper.pollForCriteria(new Criteria("AppMenu did not dismiss") {
+        CriteriaHelper.pollInstrumentationThread(new Criteria("AppMenu did not dismiss") {
             @Override
             public boolean isSatisfied() {
                 return !mAppMenuHandler.isAppMenuShowing();
             }
         });
     }
 
     private void showAppMenuAndAssertMenuShown() throws InterruptedException {
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mAppMenuHandler.showAppMenu(null, false);
             }
         });
-        CriteriaHelper.pollForCriteria(new Criteria("AppMenu did not show") {
+        CriteriaHelper.pollInstrumentationThread(new Criteria("AppMenu did not show") {
             @Override
             public boolean isSatisfied() {
                 return mAppMenuHandler.isAppMenuShowing();
             }
         });
     }
 
     private void hitEnterAndAssertAppMenuDismissed() throws InterruptedException {
         getInstrumentation().waitForIdleSync();
         pressKey(KeyEvent.KEYCODE_ENTER);
-        CriteriaHelper.pollForCriteria(new Criteria("AppMenu did not dismiss") {
+        CriteriaHelper.pollInstrumentationThread(new Criteria("AppMenu did not dismiss") {
             @Override
             public boolean isSatisfied() {
                 return !mAppMenuHandler.isAppMenuShowing();
             }
         });
     }
 
     private void moveToBoundary(boolean towardsTop, boolean movePast) throws InterruptedException {
         // Move to the boundary.
         final int end = towardsTop ? 0 : getCount() - 1;
         int increment = towardsTop ? -1 : 1;
         for (int index = getCurrentFocusedRow(); index != end; index += increment) {
             pressKey(towardsTop ? KeyEvent.KEYCODE_DPAD_UP : KeyEvent.KEYCODE_DPAD_DOWN);
             final int expectedPosition = index + increment;
-            CriteriaHelper.pollForCriteria(
+            CriteriaHelper.pollInstrumentationThread(
                     Criteria.equals(expectedPosition, new Callable<Integer>() {
                         @Override
                         public Integer call() {
                             return getCurrentFocusedRow();
                         }
                     }));
         }
 
         // Try moving past it by one.
         if (movePast) {
             pressKey(towardsTop ? KeyEvent.KEYCODE_DPAD_UP : KeyEvent.KEYCODE_DPAD_DOWN);
-            CriteriaHelper.pollForCriteria(Criteria.equals(end, new Callable<Integer>() {
+            CriteriaHelper.pollInstrumentationThread(Criteria.equals(end, new Callable<Integer>() {
                 @Override
                 public Integer call() {
                     return getCurrentFocusedRow();
                 }
             }));
         }
 
         // The menu should stay open.
         assertTrue(mAppMenu.isShowing());
     }
@@ skipping 16 matching lines @@
         ListView listView = popup.getListView();
         return listView.getSelectedItemPosition();
     }
 
     private int getCount() {
         ListPopupWindow popup = mAppMenu.getPopup();
         if (popup == null || popup.getListView() == null) return 0;
         return popup.getListView().getCount();
     }
 }