components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java - Issue 1936093002: Reland 2 of 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: components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

Issue 1936093002: Reland 2 of Unify application context usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. 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 | « chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java ('k') | components/resource_provider/android/android_hooks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

diff --git a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

index 59d9b326b92d59228617b6a02847d66fb900524b..7c358d97f422e6789123baa1af4ff5e380a1bcf7 100644

--- a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

+++ b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java

@@ -35,7 +35,9 @@ class CronetLibraryLoader {

return;

}

sInitStarted = true;

+ ContextUtils.initApplicationContext(context.getApplicationContext());

builder.loadLibrary();

+ ContextUtils.initApplicationContextForNative();

if (!Version.CRONET_VERSION.equals(nativeGetCronetVersion())) {

throw new RuntimeException(String.format(

"Expected Cronet version number %s, "

@@ -45,9 +47,9 @@ class CronetLibraryLoader {

}

Log.i(TAG, "Cronet version: %s, arch: %s",

Version.CRONET_VERSION, System.getProperty("os.arch"));

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

// Init native Chromium CronetEngine on Main UI thread.

Runnable task = new Runnable() {

+ @Override

public void run() {

ensureInitializedOnMainThread(context);

}