Rename pollForCriteria to pollForTestThreadCriteria.

chrome/android/javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java
index 697be73d6494f85136e2c7ea9f4a78a919b0c84d..3336f9e7a08434084a85f9aec7c2612d2e5f9046 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java
@@ -69,7 +69,7 @@ public class PermissionUpdateInfobarTest extends ChromeTabbedActivityTestBase {
         ChromeTabUtils.newTabFromMenu(getInstrumentation(), getActivity());
 
         // Register for animation notifications
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 if (getActivity().getActivityTab() == null) return false;
@@ -119,14 +119,14 @@ public class PermissionUpdateInfobarTest extends ChromeTabbedActivityTestBase {
             assertFalse(webContents.isDestroyed());
 
             ChromeTabUtils.closeCurrentTab(getInstrumentation(), getActivity());
-            CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return webContents.isDestroyed();
                 }
             });
 
-            CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(1, new Callable<Integer>() {
+            CriteriaHelper.pollUiThread(Criteria.equals(1, new Callable<Integer>() {
                 @Override
                 public Integer call() {
                     return getActivity().getTabModelSelector().getModel(false).getCount();
@@ -148,7 +148,7 @@ public class PermissionUpdateInfobarTest extends ChromeTabbedActivityTestBase {
         ChromeTabUtils.newTabFromMenu(getInstrumentation(), getActivity());
 
         // Register for animation notifications
-        CriteriaHelper.pollForCriteria(new Criteria() {
+        CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 if (getActivity().getActivityTab() == null) return false;
@@ -198,7 +198,7 @@ public class PermissionUpdateInfobarTest extends ChromeTabbedActivityTestBase {
             assertFalse(webContents.isDestroyed());
 
             runJavaScriptCodeInCurrentTab("document.querySelector('iframe').src = '';");
-            CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(0, new Callable<Integer>() {
+            CriteriaHelper.pollUiThread(Criteria.equals(0, new Callable<Integer>() {
                 @Override
                 public Integer call() {
                     return getInfoBars().size();
@@ -206,14 +206,14 @@ public class PermissionUpdateInfobarTest extends ChromeTabbedActivityTestBase {
             }));
 
             ChromeTabUtils.closeCurrentTab(getInstrumentation(), getActivity());
-            CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return webContents.isDestroyed();
                 }
             });
 
-            CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(1, new Callable<Integer>() {
+            CriteriaHelper.pollUiThread(Criteria.equals(1, new Callable<Integer>() {
                 @Override
                 public Integer call() {
                     return getActivity().getTabModelSelector().getModel(false).getCount();