Rename pollForCriteria to pollForTestThreadCriteria.

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

 // Copyright 2013 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 android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
@@ skipping 262 matching lines @@
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 ChromeActivity activity = getActivity();
                 activity.getCurrentTabModel().closeTab(activity.getActivityTab());
             }
         });
 
         // Closing the tab should have dismissed the dialog.
-        CriteriaHelper.pollForCriteria(new JavascriptAppModalDialogShownCriteria(
+        CriteriaHelper.pollInstrumentationThread(new JavascriptAppModalDialogShownCriteria(
                 "The dialog should have been dismissed when its tab was closed.", false));
     }
 
     /**
      * Asynchronously executes the given code for spawning a dialog and waits
      * for the dialog to be visible.
      */
     private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(String script)
             throws InterruptedException {
         return executeJavaScriptAndWaitForDialog(new OnEvaluateJavaScriptResultHelper(), script);
     }
 
     /**
      * Given a JavaScript evaluation helper, asynchronously executes the given
      * code for spawning a dialog and waits for the dialog to be visible.
      */
     private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(
             final OnEvaluateJavaScriptResultHelper helper, String script)
             throws InterruptedException {
         helper.evaluateJavaScriptForTests(
                 getActivity().getCurrentContentViewCore().getWebContents(),
                 script);
-        CriteriaHelper.pollForCriteria(new JavascriptAppModalDialogShownCriteria(
+        CriteriaHelper.pollInstrumentationThread(new JavascriptAppModalDialogShownCriteria(
                 "Could not spawn or locate a modal dialog.", true));
         return helper;
     }
 
     /**
      * Returns an array of the 3 buttons for this dialog, in the order
      * BUTTON_NEGATIVE, BUTTON_NEUTRAL and BUTTON_POSITIVE. Any of these values
      * can be null.
      */
     private Button[] getAlertDialogButtons(final AlertDialog dialog) throws ExecutionException {
@@ skipping 82 matching lines @@
                 button.getVisibility());
         assertEquals("'" + readableName + "' button has wrong text",
                 getActivity().getResources().getString(expectedTextResourceId),
                 button.getText().toString());
     }
 
     private TestCallbackHelperContainer getActiveTabTestCallbackHelperContainer() {
         return new TestCallbackHelperContainer(getActivity().getCurrentContentViewCore());
     }
 }