android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java - Issue 12609013: [android_webview] Build test code against the shell APK.

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/LoadDataWithBaseUrlTest.java

Issue 12609013: [android_webview] Build test code against the shell APK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix up minsdkversoin Created 7 years, 9 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/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/NullContentsClient.java » ('j') | android_webview/test/shell/AndroidManifest.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fd79a5ddab7451d951363bd5b7afda0ddb7227fd..d9263e4f32ebb1afbea133b6cdb45ca0beabf47a 100644

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

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

@@ -302,7 +302,6 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {

final String DATA_BASE_URL = "data:";

final String NON_DATA_BASE_URL = "http://example.com";

- AndroidProtocolHandler.setResourceContextForTesting(getInstrumentation().getContext());

mAwContents.getSettings().setAllowFileAccess(false);

String token = "" + System.currentTimeMillis();

// All access to file://, including android_asset and android_res is blocked

@@ -342,7 +341,6 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase {

"file://" + imagePath + "?" + token));

} finally {

if (!tempImage.delete()) throw new AssertionError();

- AndroidProtocolHandler.setResourceContextForTesting(null);

}