| OLD | NEW |
| 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; | |
| 8 import android.os.Build; | 7 import android.os.Build; |
| 9 | 8 |
| 10 import org.chromium.base.annotations.UsedByReflection; | 9 import org.chromium.base.annotations.UsedByReflection; |
| 11 | 10 |
| 12 import java.nio.channels.WritableByteChannel; | 11 import java.nio.channels.WritableByteChannel; |
| 13 import java.util.Map; | 12 import java.util.Map; |
| 14 | 13 |
| 15 /** | 14 /** |
| 16 * Network request factory using the native http stack implementation. | 15 * Network request factory using the native http stack implementation. |
| 17 * @deprecated Use {@link CronetUrlRequestContext} instead. | 16 * @deprecated Use {@link CronetUrlRequestContext} instead. |
| 18 */ | 17 */ |
| 19 @UsedByReflection("HttpUrlRequestFactory.java") | 18 @UsedByReflection("HttpUrlRequestFactory.java") |
| 20 @Deprecated | 19 @Deprecated |
| 21 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory { | 20 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory { |
| 22 private ChromiumUrlRequestContext mRequestContext; | 21 private ChromiumUrlRequestContext mRequestContext; |
| 23 | 22 |
| 24 @UsedByReflection("HttpUrlRequestFactory.java") | 23 @UsedByReflection("HttpUrlRequestFactory.java") |
| 25 public ChromiumUrlRequestFactory( | 24 public ChromiumUrlRequestFactory(CronetEngine.Builder builder) { |
| 26 Context context, UrlRequestContextConfig config) { | |
| 27 if (isEnabled()) { | 25 if (isEnabled()) { |
| 28 String userAgent = config.userAgent(); | 26 String userAgent = builder.userAgent(); |
| 29 if (userAgent.isEmpty()) { | 27 if (userAgent.isEmpty()) { |
| 30 userAgent = UserAgent.from(context); | 28 userAgent = UserAgent.from(builder.getContext()); |
| 31 } | 29 } |
| 32 mRequestContext = new ChromiumUrlRequestContext(context, | 30 mRequestContext = new ChromiumUrlRequestContext(userAgent, builder); |
| 33 userAgent, config); | |
| 34 } | 31 } |
| 35 } | 32 } |
| 36 | 33 |
| 37 @Override | 34 @Override |
| 38 public boolean isEnabled() { | 35 public boolean isEnabled() { |
| 39 return Build.VERSION.SDK_INT >= 14; | 36 return Build.VERSION.SDK_INT >= 14; |
| 40 } | 37 } |
| 41 | 38 |
| 42 @Override | 39 @Override |
| 43 public String getName() { | 40 public String getName() { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 66 | 63 |
| 67 @Override | 64 @Override |
| 68 public void stopNetLog() { | 65 public void stopNetLog() { |
| 69 mRequestContext.stopNetLog(); | 66 mRequestContext.stopNetLog(); |
| 70 } | 67 } |
| 71 | 68 |
| 72 public ChromiumUrlRequestContext getRequestContext() { | 69 public ChromiumUrlRequestContext getRequestContext() { |
| 73 return mRequestContext; | 70 return mRequestContext; |
| 74 } | 71 } |
| 75 } | 72 } |
| OLD | NEW |