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 f14ba481ec0a694068d6e4695e61d8ccf353d578..cb4e8b096da8030cb36537f2486c02501c585455 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 |
@@ -659,8 +659,15 @@ public class AwTestBase |
}); |
OnPageFinishedHelper onPageFinishedHelper = popupContentsClient.getOnPageFinishedHelper(); |
- int callCount = onPageFinishedHelper.getCallCount(); |
- onPageFinishedHelper.waitForCallback(callCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS); |
+ int finishCallCount = onPageFinishedHelper.getCallCount(); |
+ TestAwContentsClient.OnReceivedTitleHelper onReceivedTitleHelper = |
+ popupContentsClient.getOnReceivedTitleHelper(); |
+ int titleCallCount = onReceivedTitleHelper.getCallCount(); |
+ |
+ onPageFinishedHelper.waitForCallback(finishCallCount, 1, WAIT_TIMEOUT_MS, |
+ TimeUnit.MILLISECONDS); |
+ onReceivedTitleHelper.waitForCallback(titleCallCount, 1, WAIT_TIMEOUT_MS, |
+ TimeUnit.MILLISECONDS); |
return new PopupInfo(popupContentsClient, popupContainerView, popupContents); |
} |