| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| index e27672f62de416d3bbfe348ba7495144352314c0..8d9f20b0c13f790f9dc737cc04b6a7f99ffe7066 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
|
| @@ -542,7 +542,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
|
| clickOnLinkUsingJs();
|
|
|
| // Wait for the target URL to be fetched from the server.
|
| - poll(new Callable<Boolean>() {
|
| + pollOnInstrumentationThread(new Callable<Boolean>() {
|
| @Override
|
| public Boolean call() throws Exception {
|
| return mWebServer.getRequestCount(REDIRECT_TARGET_PATH) == 1;
|
| @@ -575,7 +575,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
|
| mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
|
|
|
| // Wait for the target URL to be fetched from the server.
|
| - poll(new Callable<Boolean>() {
|
| + pollOnInstrumentationThread(new Callable<Boolean>() {
|
| @Override
|
| public Boolean call() throws Exception {
|
| return mWebServer.getRequestCount(REDIRECT_TARGET_PATH) == 1;
|
| @@ -608,7 +608,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
|
| loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), pageWithIframeUrl);
|
|
|
| // Wait for the redirect target URL to be fetched from the server.
|
| - poll(new Callable<Boolean>() {
|
| + pollOnInstrumentationThread(new Callable<Boolean>() {
|
| @Override
|
| public Boolean call() throws Exception {
|
| return mWebServer.getRequestCount(REDIRECT_TARGET_PATH) == 1;
|
|
|