Rename pollForCriteria to pollForTestThreadCriteria.

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
index e3cd02f3c5fc2136d1f9ad346b9790e3b0051d77..4c1050417b11faad05e3f7241e479af4506f0712 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
@@ -395,7 +395,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
                     getInstrumentation(),
                     incognito ? IncognitoDocumentActivity.class : DocumentActivity.class,
                     activityTrigger);
-            CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return activity.getActivityTab() != null;
@@ -475,7 +475,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
 
         startActivityCompletely(intent);
 
-        CriteriaHelper.pollForUIThreadCriteria(new Criteria("Tab never selected/initialized.") {
+        CriteriaHelper.pollUiThread(new Criteria("Tab never selected/initialized.") {
             @Override
             public boolean isSatisfied() {
                 return getActivity().getActivityTab() != null;
@@ -489,7 +489,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
             NewTabPageTestUtils.waitForNtpLoaded(tab);
         }
 
-        CriteriaHelper.pollForUIThreadCriteria(new Criteria("Deferred startup never completed") {
+        CriteriaHelper.pollUiThread(new Criteria("Deferred startup never completed") {
             @Override
             public boolean isSatisfied() {
                 return DeferredStartupHandler.getInstance().isDeferredStartupComplete();
@@ -547,7 +547,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
                         }
                     });
 
-            CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return activity.getActivityTab() != null;
@@ -705,7 +705,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
                 }
 
                 // Wait for suggestions to show up.
-                CriteriaHelper.pollForCriteria(new Criteria() {
+                CriteriaHelper.pollInstrumentationThread(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return ((LocationBarLayout) getActivity().findViewById(
@@ -721,7 +721,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
                         && !suggestion.getDisplayText().equals(displayText)) {
                     // If there is only one suggestion and it's the same as inputText,
                     // wait for other suggestions before looking for the one we want.
-                    CriteriaHelper.pollForCriteria(new Criteria() {
+                    CriteriaHelper.pollInstrumentationThread(new Criteria() {
                         @Override
                         public boolean isSatisfied() {
                             return suggestionListView.getCount() > 1;