| 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 77613f4f6398b0d5ecdadc257c3410f0298eaedc..c19b053a85495fc81c94862bd0ff4d69c4ac7dd2 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
|
| @@ -213,6 +213,28 @@ public class AwTestBase
|
| });
|
| }
|
|
|
| + protected void loadDataWithBaseUrlSync(final AwContents awContents,
|
| + CallbackHelper onPageFinishedHelper, final String data, final String mimeType,
|
| + final boolean isBase64Encoded, final String baseUrl,
|
| + final String historyUrl) throws Throwable {
|
| + int currentCallCount = onPageFinishedHelper.getCallCount();
|
| + loadDataWithBaseUrlAsync(awContents, data, mimeType, isBase64Encoded, baseUrl, historyUrl);
|
| + onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
|
| + TimeUnit.MILLISECONDS);
|
| + }
|
| +
|
| + protected void loadDataWithBaseUrlAsync(final AwContents awContents,
|
| + final String data, final String mimeType, final boolean isBase64Encoded,
|
| + final String baseUrl, final String historyUrl) throws Throwable {
|
| + runTestOnUiThread(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + awContents.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl(
|
| + data, mimeType, isBase64Encoded, baseUrl, historyUrl));
|
| + }
|
| + });
|
| + }
|
| +
|
| /**
|
| * Reloads the current page synchronously.
|
| */
|
|
|