| Index: android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
|
| diff --git a/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java b/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
|
| index f45902a11d0cfcb09209efa1bcb99f5a4da7bd45..eeec33016ba8aed2839b3764ccc5e6cf6a44b669 100644
|
| --- a/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
|
| +++ b/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
|
| @@ -117,6 +117,27 @@ public class WebViewSyncWrapper {
|
| });
|
| }
|
|
|
| + public void loadDataSync(final String data, final String mimeType, final String encoding,
|
| + boolean confirmByJavaScript) throws InterruptedException {
|
| + mErrorMessageList.clear();
|
| + int currentPageCount = mPageCallback.getCallCount();
|
| + int currentJsCount = mJsCallback.getCallCount();
|
| + runOnUiThread(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + mWebView.loadData(data, mimeType, encoding);
|
| + }
|
| + });
|
| + try {
|
| + if (confirmByJavaScript) {
|
| + mJsCallback.waitForCallback(currentJsCount);
|
| + }
|
| + mPageCallback.waitForCallback(currentPageCount);
|
| + } catch (TimeoutException e) {
|
| + Assert.fail(e.getMessage());
|
| + }
|
| + }
|
| +
|
| public void loadFileSync(final String html, boolean confirmByJavaScript)
|
| throws InterruptedException {
|
| mErrorMessageList.clear();
|
|
|