Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java

Issue 1429863008: [Cronet] Remove JSON serialization of CronetEngine.Builder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address Helen's comments 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.content.Context; 7 import android.content.Context;
8 import android.os.Build; 8 import android.os.Build;
9 import android.text.TextUtils;
9 10
10 import org.chromium.base.annotations.UsedByReflection; 11 import org.chromium.base.annotations.UsedByReflection;
11 12
12 import java.nio.channels.WritableByteChannel; 13 import java.nio.channels.WritableByteChannel;
13 import java.util.Map; 14 import java.util.Map;
14 15
15 /** 16 /**
16 * Network request factory using the native http stack implementation. 17 * Network request factory using the native http stack implementation.
17 * @deprecated Use {@link CronetEngine} instead. 18 * @deprecated Use {@link CronetEngine} instead.
18 */ 19 */
19 @UsedByReflection("HttpUrlRequestFactory.java") 20 @UsedByReflection("HttpUrlRequestFactory.java")
20 @Deprecated 21 @Deprecated
21 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory { 22 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory {
22 private ChromiumUrlRequestContext mRequestContext; 23 private ChromiumUrlRequestContext mRequestContext;
23 24
24 @UsedByReflection("HttpUrlRequestFactory.java") 25 @UsedByReflection("HttpUrlRequestFactory.java")
25 public ChromiumUrlRequestFactory(Context context, CronetEngine.Builder confi g) { 26 public ChromiumUrlRequestFactory(Context context, CronetEngine.Builder confi g) {
26 if (isEnabled()) { 27 if (isEnabled()) {
27 String userAgent = config.getUserAgent(); 28 String userAgent = config.getUserAgent();
28 if (userAgent.isEmpty()) { 29 if (TextUtils.isEmpty(userAgent)) {
29 // Cannot use config.getDefaultUserAgent() as config.mContext ma y be null. 30 // Cannot use config.getDefaultUserAgent() as config.mContext ma y be null.
30 userAgent = new CronetEngine.Builder(context).getDefaultUserAgen t(); 31 userAgent = new CronetEngine.Builder(context).getDefaultUserAgen t();
31 } 32 }
32 mRequestContext = new ChromiumUrlRequestContext(context, 33 mRequestContext = new ChromiumUrlRequestContext(context,
33 userAgent, config); 34 userAgent, config);
34 } 35 }
35 } 36 }
36 37
37 @Override 38 @Override
38 public boolean isEnabled() { 39 public boolean isEnabled() {
(...skipping 27 matching lines...) Expand all
66 67
67 @Override 68 @Override
68 public void stopNetLog() { 69 public void stopNetLog() {
69 mRequestContext.stopNetLog(); 70 mRequestContext.stopNetLog();
70 } 71 }
71 72
72 public ChromiumUrlRequestContext getRequestContext() { 73 public ChromiumUrlRequestContext getRequestContext() {
73 return mRequestContext; 74 return mRequestContext;
74 } 75 }
75 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698