components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java - Issue 1507783002: Revert of [Cronet] Remove JSON serialization of CronetEngine.Builder

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

Issue 1507783002: Revert of [Cronet] Remove JSON serialization of CronetEngine.Builder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index 9b252fca564f907e84a01dfe760672e7067c501c..40d6642198e940e08e0283bd1545499139ba299b 100644

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

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

@@ -36,9 +36,8 @@

protected ChromiumUrlRequestContext(

final Context context, String userAgent, CronetEngine.Builder config) {

CronetLibraryLoader.ensureInitialized(context, config);

- mChromiumUrlRequestContextAdapter =

- nativeCreateRequestContextAdapter(userAgent, getLoggingLevel(),

- CronetUrlRequestContext.createNativeUrlRequestContextConfig(config));

+ mChromiumUrlRequestContextAdapter = nativeCreateRequestContextAdapter(

+ userAgent, getLoggingLevel(), config.toJSONString());

if (mChromiumUrlRequestContextAdapter == 0) {

throw new NullPointerException("Context Adapter creation failed");

}

@@ -141,7 +140,7 @@

// Returns an instance ChromiumUrlRequestContextAdapter to be stored in

// mChromiumUrlRequestContextAdapter.

private native long nativeCreateRequestContextAdapter(

- String userAgent, int loggingLevel, long config);

+ String userAgent, int loggingLevel, String config);

private native void nativeReleaseRequestContextAdapter(

long chromiumUrlRequestContextAdapter);