Rename pollForCriteria to pollForTestThreadCriteria.

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
index 0eeb82d0037b09d1c942c9765e460d2032e6db99..b2940d4e99a09f43c911e1175ac9d456f80a9d9b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
@@ -67,7 +67,7 @@ public class BrandColorTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private void checkForBrandColor(final int brandColor) {
         try {
-            CriteriaHelper.pollForUIThreadCriteria(new Criteria(
+            CriteriaHelper.pollUiThread(new Criteria(
                     "The toolbar background doesn't contain the right color") {
                 @Override
                 public boolean isSatisfied() {
@@ -76,7 +76,7 @@ public class BrandColorTest extends ChromeActivityTestCaseBase<ChromeActivity> {
                             == mToolbar.getBackgroundDrawable().getColor();
                 }
             });
-            CriteriaHelper.pollForUIThreadCriteria(
+            CriteriaHelper.pollUiThread(
                     Criteria.equals(brandColor, new Callable<Integer>() {
                         @Override
                         public Integer call() {
@@ -88,7 +88,7 @@ public class BrandColorTest extends ChromeActivityTestCaseBase<ChromeActivity> {
                 final int expectedStatusBarColor = brandColor == mDefaultColor
                         ? Color.BLACK
                         : ColorUtils.getDarkenedColorForStatusBar(brandColor);
-                CriteriaHelper.pollForUIThreadCriteria(
+                CriteriaHelper.pollUiThread(
                         Criteria.equals(expectedStatusBarColor, new Callable<Integer>() {
                             @Override
                             public Integer call() {
@@ -217,7 +217,7 @@ public class BrandColorTest extends ChromeActivityTestCaseBase<ChromeActivity> {
                         brandColorUrl, delegate.getNative());
             }
         });
-        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+        CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return getActivity().getActivityTab().isShowingInterstitialPage();