android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java - Issue 2076623002: 🍳 Fix and clean up application context in webview.

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/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

Issue 2076623002: 🍳 Fix and clean up application context in webview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 4 years, 6 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

« android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java ('K') | « android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.java ('k') | android_webview/test/shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

index 9d04cf035e5affa3100d6df336c4d33608cd9166..94df928e272c37eca8eea1297203090390e5e191 100644

--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java

@@ -40,6 +40,7 @@ import org.chromium.android_webview.test.AwTestContainerView;

import org.chromium.android_webview.test.NullContentsClient;

import org.chromium.base.BaseSwitches;

import org.chromium.base.CommandLine;

+import org.chromium.base.ContextUtils;

import org.chromium.base.Log;

import org.chromium.base.TraceEvent;

import org.chromium.content.app.ContentApplication;

@@ -79,7 +80,8 @@ public class AwShellActivity extends Activity {

ContentApplication.initCommandLine(this);

waitForDebuggerIfNeeded();

- AwBrowserProcess.loadLibrary(this);

+ ContextUtils.initApplicationContext(getApplicationContext());

+ AwBrowserProcess.loadLibrary();

if (CommandLine.getInstance().hasSwitch(AwShellSwitches.ENABLE_ATRACE)) {

Log.e(TAG, "Enabling Android trace.");

@@ -129,7 +131,7 @@ public class AwShellActivity extends Activity {

}

private AwTestContainerView createAwTestContainerView() {

- AwBrowserProcess.start(this);

+ AwBrowserProcess.start();

AwTestContainerView testContainerView = new AwTestContainerView(this, true);

AwContentsClient awContentsClient = new NullContentsClient() {

private View mCustomView;