| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
|
| index 2f9ad915b68b57541d796b2aa0984ce8cce6acc9..5239fba172c2a4a7d3ca763ebd78f57356012c5f 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
|
| @@ -494,7 +494,8 @@ public class AwTestBase
|
| * Wrapper around CriteriaHelper.pollForCriteria. This uses AwTestBase-specifc timeouts and
|
| * treats timeouts and exceptions as test failures automatically.
|
| */
|
| - public static void poll(final Callable<Boolean> callable) throws Exception {
|
| + public static void pollOnInstrumentationThread(final Callable<Boolean> callable)
|
| + throws Exception {
|
| CriteriaHelper.pollForCriteria(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| @@ -512,7 +513,7 @@ public class AwTestBase
|
| * Wrapper around {@link AwTestBase#poll()} but runs the callable on the UI thread.
|
| */
|
| public void pollOnUiThread(final Callable<Boolean> callable) throws Exception {
|
| - poll(new Callable<Boolean>() {
|
| + pollOnInstrumentationThread(new Callable<Boolean>() {
|
| @Override
|
| public Boolean call() throws Exception {
|
| return runTestOnUiThreadAndGetResult(callable);
|
|
|