Rename pollForCriteria to pollForTestThreadCriteria.

content/public/android/javatests/src/org/chromium/content/browser/MediaSessionTest.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.content.browser;
 
 import android.content.Context;
 import android.media.AudioManager;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
@@ skipping 50 matching lines @@
                 mAudioFocusState = focusType;
             }
         }
 
         public void abandonAudioFocus() {
             getAudioManager().abandonAudioFocus(this);
             mAudioFocusState = AudioManager.AUDIOFOCUS_LOSS;
         }
 
         public void waitForFocusStateChange(int focusType) throws InterruptedException {
-            CriteriaHelper.pollForCriteria(Criteria.equals(focusType, new Callable<Integer>() {
-                @Override
-                public Integer call() {
-                    return getAudioFocusState();
-                }
-            }));
+            CriteriaHelper.pollInstrumentationThread(
+                    Criteria.equals(focusType, new Callable<Integer>() {
+                        @Override
+                        public Integer call() {
+                            return getAudioFocusState();
+                        }
+                    }));
         }
     }
 
     private MockAudioFocusChangeListener mAudioFocusChangeListener;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
 
         try {
@@ skipping 278 matching lines @@
 
         DOMUtils.waitForMediaPauseBeforeEnd(getWebContents(), LONG_AUDIO);
         DOMUtils.waitForMediaPauseBeforeEnd(getWebContents(), LONG_VIDEO);
 
         mAudioFocusChangeListener.abandonAudioFocus();
 
         DOMUtils.waitForMediaPlay(getWebContents(), LONG_AUDIO);
         DOMUtils.waitForMediaPlay(getWebContents(), LONG_VIDEO);
     }
 }