android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java - Issue 11090003: [Android] Upstream WebView.allow{Content|File}Access implementation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

Issue 11090003: [Android] Upstream WebView.allow{Content|File}Access implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Workaround to remove dependency on https://codereview.chromium.org/11030051 Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwSettings.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

index 211f6ddd48d22679897a0307cdd59fb850309a5b..44b5b12662a0cf89775e0f313e2a15288f8cddae 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

@@ -95,6 +95,19 @@ public class AndroidWebViewTestBase

TimeUnit.SECONDS);

}

+ protected void loadUrlSyncAndExpectError(final ContentViewCore contentViewCore,

+ CallbackHelper onPageFinishedHelper,

+ CallbackHelper onReceivedErrorHelper,

+ final String url) throws Throwable {

+ int onErrorCallCount = onReceivedErrorHelper.getCallCount();

+ int onFinishedCallCount = onPageFinishedHelper.getCallCount();

+ loadUrlAsync(contentViewCore, url);

+ onReceivedErrorHelper.waitForCallback(onErrorCallCount, 1, WAIT_TIMEOUT_SECONDS,

+ TimeUnit.SECONDS);

+ onPageFinishedHelper.waitForCallback(onFinishedCallCount, 1, WAIT_TIMEOUT_SECONDS,

+ TimeUnit.SECONDS);

+ }

/**

* Loads url on the UI thread but does not block.