android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java - Issue 1879013002: 🍈 Unify application context usage.

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

Issue 1879013002: 🍈 Unify application context usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix caller/callee relationship in resource_provider. Created 4 years, 8 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/AwTestBase.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/HttpCacheTest.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/CookieManagerStartupTest.java

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

index 65051028cb3e980278ee13c1eca6ce1460189829..9cb017f9123ed18687e9af95caa947bf5c2c9fa5 100644

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

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

@@ -14,7 +14,6 @@ import org.chromium.android_webview.AwCookieManager;

import org.chromium.android_webview.AwWebResourceResponse;

import org.chromium.android_webview.test.util.CommonResources;

import org.chromium.android_webview.test.util.CookieUtils;

-import org.chromium.base.ContextUtils;

import org.chromium.base.test.util.Feature;

import org.chromium.net.test.util.TestWebServer;

@@ -30,7 +29,10 @@ public class CookieManagerStartupTest extends AwTestBase {

@Override

protected void setUp() throws Exception {

super.setUp();

- ContextUtils.initApplicationContext(getActivity().getApplicationContext());

+ // CookeManager assumes that native is loaded, but webview browser should not be loaded for

+ // these tests as webview is not necessarily loaded when CookieManager is called.

+ AwBrowserProcess.loadLibrary(

+ getInstrumentation().getTargetContext().getApplicationContext());

}

@Override