Rename pollForCriteria to pollForTestThreadCriteria.

chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.content.Context;
 import android.os.Build;
@@ skipping 24 matching lines @@
 public class BindingManagerInDocumentModeIntegrationTest extends DocumentModeTestBase {
     private static class MockBindingManager implements BindingManager {
         // Maps pid to the last received visibility state of the renderer.
         private final SparseBooleanArray mProcessInForegroundMap = new SparseBooleanArray();
         // Maps pid to a string recording calls to setInForeground() and visibilityDetermined().
         private final SparseArray<String> mVisibilityCallsMap = new SparseArray<String>();
         private boolean mIsReleaseAllModerateBindingsCalled;
 
         void assertIsInForeground(final int pid) {
             try {
-                CriteriaHelper.pollForCriteria(new Criteria() {
+                CriteriaHelper.pollInstrumentationThread(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return mProcessInForegroundMap.get(pid);
                     }
                 });
             } catch (InterruptedException ie) {
                 fail();
             }
         }
 
         void assertIsInBackground(final int pid) {
             try {
-                CriteriaHelper.pollForCriteria(new Criteria() {
+                CriteriaHelper.pollInstrumentationThread(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return !mProcessInForegroundMap.get(pid);
                     }
                 });
             } catch (InterruptedException ie) {
                 fail();
             }
         }
 
         void assertSetInForegroundWasCalled(String message, final int pid) {
             try {
-                CriteriaHelper.pollForCriteria(new Criteria(message) {
+                CriteriaHelper.pollInstrumentationThread(new Criteria(message) {
                     @Override
                     public boolean isSatisfied() {
                         return mProcessInForegroundMap.indexOfKey(pid) >= 0;
                     }
                 });
             } catch (InterruptedException ie) {
                 fail();
             }
         }
 
         void assertIsReleaseAllModerateBindingsCalled() {
             try {
-                CriteriaHelper.pollForCriteria(new Criteria() {
+                CriteriaHelper.pollInstrumentationThread(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return mIsReleaseAllModerateBindingsCalled;
                     }
                 });
             } catch (InterruptedException ie) {
                 fail();
             }
         }
 
@@ skipping 115 matching lines @@
     @Feature({"ProcessManagement"})
     public void testCrashInForeground() throws Exception {
         // Create a tab in foreground and wait until it is loaded.
         final Tab tab = ChromeApplication.getDocumentTabModelSelector().getTabById(
                 launchViaViewIntent(false, URL_1, "Page 1"));
 
         // Kill the renderer and wait for the crash to be noted by the browser process.
         assertTrue(ChildProcessLauncher.crashProcessForTesting(
                 tab.getContentViewCore().getCurrentRenderProcessId()));
 
-        CriteriaHelper.pollForCriteria(
+        CriteriaHelper.pollInstrumentationThread(
                 new Criteria("Renderer crash wasn't noticed by the browser.") {
                     @Override
                     public boolean isSatisfied() {
                         return tab.getContentViewCore().getCurrentRenderProcessId() == 0;
                     }
                 });
 
         // Reload the tab, respawning the renderer.
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 tab.reload();
             }
         });
 
         // Wait until the process is spawned and its visibility is determined.
-        CriteriaHelper.pollForCriteria(
+        CriteriaHelper.pollInstrumentationThread(
                 new Criteria("Process for the crashed tab was not respawned.") {
                     @Override
                     public boolean isSatisfied() {
                         return tab.getContentViewCore().getCurrentRenderProcessId() != 0;
                     }
                 });
 
         mBindingManager.assertSetInForegroundWasCalled(
                 "isInForeground() was not called for the process.",
                 tab.getContentViewCore().getCurrentRenderProcessId());
@@ skipping 77 matching lines @@
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
 
         // Hook in the test binding manager.
         mBindingManager = new MockBindingManager();
         ChildProcessLauncher.setBindingManagerForTesting(mBindingManager);
     }
 }