Rename pollForCriteria to pollForTestThreadCriteria.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
index 911957ef967c4f1cc2b7aac805995dd0091d46bd..cf30a62ac8c652bdc975ddfc454f933f1d4ba435 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
@@ -94,7 +94,7 @@ public class AppMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
                 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();
@@ -204,7 +204,7 @@ public class AppMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         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();
@@ -219,7 +219,7 @@ public class AppMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
                 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();
@@ -230,7 +230,7 @@ public class AppMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     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();
@@ -245,7 +245,7 @@ public class AppMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         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() {
@@ -257,7 +257,7 @@ public class AppMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
         // 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();