Rename pollForCriteria to pollForTestThreadCriteria.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogHelperTest.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.webapps;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Environment;
@@ skipping 185 matching lines @@
         EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartFileServer(
                 getInstrumentation().getContext(), Environment.getExternalStorageDirectory());
         try {
             // Sets the overriden factory to observer splash screen update.
             final TestDataStorageFactory dataStorageFactory = new TestDataStorageFactory();
             WebappDataStorage.setFactoryForTests(dataStorageFactory);
 
             addShortcutToURL(testServer.getURL(MANIFEST_PATH), MANIFEST_TITLE, "");
 
             // Make sure that the splash screen image was downloaded.
-            CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            CriteriaHelper.pollUiThread(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     return dataStorageFactory.mSplashImage != null;
                 }
             });
 
             // Test that bitmap sizes match expectations.
             int idealSize = mActivity.getResources().getDimensionPixelSize(
                     R.dimen.webapp_splash_image_size_ideal);
             assertEquals(idealSize, dataStorageFactory.mSplashImage.getWidth());
@@ skipping 25 matching lines @@
                         helper.addShortcut(title);
                     }
                 });
                 return helper;
             }
         };
         final AddToHomescreenDialogHelper helper =
                 ThreadUtils.runOnUiThreadBlockingNoException(callable);
 
         // Make sure that the shortcut was added.
-        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+        CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return mShortcutHelperDelegate.mBroadcastedIntent != null;
             }
         });
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 helper.destroy();
             }
         });
     }
 }