components/cronet/android/cronet_library_loader.cc - Issue 981013002: [Cronet] Make sure to only pass the application Context to InitApplicationContext to avoid DCHECK fa

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: components/cronet/android/cronet_library_loader.cc

Issue 981013002: [Cronet] Make sure to only pass the application Context to InitApplicationContext to avoid DCHECK fa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add ChromiumUrlRequestContext test too Created 5 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 | « components/cronet/android/chromium_url_request_context.cc ('k') | components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/cronet_library_loader.cc

diff --git a/components/cronet/android/cronet_library_loader.cc b/components/cronet/android/cronet_library_loader.cc

index 5286f9bca9b0fced274eea5d39325800a43e1bb3..65b00fcf82262a203cf3d78e0785d81607bccb51 100644

--- a/components/cronet/android/cronet_library_loader.cc

+++ b/components/cronet/android/cronet_library_loader.cc

@@ -87,10 +87,11 @@ void CronetOnUnLoad(JavaVM* jvm, void* reserved) {

}

-void CronetInitOnMainThread(JNIEnv* env, jclass jcaller, jobject jcontext) {

+void CronetInitOnMainThread(JNIEnv* env, jclass jcaller, jobject japp_context) {

// Set application context.

- base::android::ScopedJavaLocalRef<jobject> scoped_context(env, jcontext);

- base::android::InitApplicationContext(env, scoped_context);

+ base::android::ScopedJavaLocalRef<jobject> scoped_app_context(env,

+ japp_context);

+ base::android::InitApplicationContext(env, scoped_app_context);

#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)

base::i18n::InitializeICU();