Rename pollForCriteria to pollForTestThreadCriteria.

chrome/test/android/javatests/src/org/chromium/chrome/test/util/ActivityUtils.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/ActivityUtils.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ActivityUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ActivityUtils.java
index 19eab5d9875f6eb9dfba4f4fd01aa9f503b9e21d..dc9e1cd85d8242bc3a30616202c902e08a9b7a95 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ActivityUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ActivityUtils.java
@@ -97,7 +97,7 @@ public class ActivityUtils {
     @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
     public static <T> T waitForFragment(Activity activity, String fragmentTag)
             throws InterruptedException {
-        CriteriaHelper.pollForCriteria(new FragmentPresentCriteria(activity, fragmentTag),
+        CriteriaHelper.pollInstrumentationThread(new FragmentPresentCriteria(activity, fragmentTag),
                 ACTIVITY_START_TIMEOUT_MS, CONDITION_POLL_INTERVAL_MS);
         return (T) activity.getFragmentManager().findFragmentByTag(fragmentTag);
     }
@@ -117,12 +117,13 @@ public class ActivityUtils {
     public static <T extends Fragment> T waitForFragmentToAttach(
             final Preferences activity, final Class<T> fragmentClass)
             throws InterruptedException {
-        CriteriaHelper.pollForCriteria(new Criteria("Could not find fragment " + fragmentClass) {
-            @Override
-            public boolean isSatisfied() {
-                return fragmentClass.isInstance(activity.getFragmentForTest());
-            }
-        }, ACTIVITY_START_TIMEOUT_MS, CONDITION_POLL_INTERVAL_MS);
+        CriteriaHelper.pollInstrumentationThread(
+                new Criteria("Could not find fragment " + fragmentClass) {
+                    @Override
+                    public boolean isSatisfied() {
+                        return fragmentClass.isInstance(activity.getFragmentForTest());
+                    }
+                }, ACTIVITY_START_TIMEOUT_MS, CONDITION_POLL_INTERVAL_MS);
         return (T) activity.getFragmentForTest();
     }
 }