Chromium Code Reviews| 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; | 7 import android.content.Context; | 
| 8 import android.os.Build; | 8 import android.os.Build; | 
| 9 | 9 | 
| 10 import org.chromium.base.UsedByReflection; | 10 import org.chromium.base.UsedByReflection; | 
| 11 | 11 | 
| 12 import java.nio.channels.WritableByteChannel; | 12 import java.nio.channels.WritableByteChannel; | 
| 13 import java.util.Map; | 13 import java.util.Map; | 
| 14 | 14 | 
| 15 /** | 15 /** | 
| 16 * Network request factory using the native http stack implementation. | 16 * Network request factory using the native http stack implementation. | 
| 17 */ | 17 */ | 
| 18 @UsedByReflection("HttpUrlRequestFactory.java") | 18 @UsedByReflection("HttpUrlRequestFactory.java") | 
| 19 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory { | 19 public class ChromiumUrlRequestFactory extends HttpUrlRequestFactory { | 
| 20 private ChromiumUrlRequestContext mRequestContext; | 20 private ChromiumUrlRequestContext mRequestContext; | 
| 21 | 21 | 
| 22 @UsedByReflection("HttpUrlRequestFactory.java") | 22 @UsedByReflection("HttpUrlRequestFactory.java") | 
| 23 public ChromiumUrlRequestFactory( | 23 public ChromiumUrlRequestFactory( | 
| 24 Context context, HttpUrlRequestFactoryConfig config) { | 24 Context context, HttpUrlRequestFactoryConfig config) { | 
| 25 if (isEnabled()) { | 25 if (isEnabled()) { | 
| 26 System.loadLibrary("cronet"); | |
| 27 mRequestContext = new ChromiumUrlRequestContext( | 26 mRequestContext = new ChromiumUrlRequestContext( | 
| 
 
mmenke
2014/09/11 21:10:16
Why does this need to be moved?  Doesn't this brea
 
mef
2014/09/11 22:03:24
Because now cronet_test app loads libcronet_tests.
 
mmenke
2014/09/11 22:55:13
And what about embedders?
 
mef
2014/09/12 13:32:47
They should call org.chromium.net.LibraryLoader.en
 
 | |
| 28 context.getApplicationContext(), UserAgent.from(context), | 27 context.getApplicationContext(), UserAgent.from(context), | 
| 29 config.toString()); | 28 config.toString()); | 
| 30 } | 29 } | 
| 31 } | 30 } | 
| 32 | 31 | 
| 33 @Override | 32 @Override | 
| 34 public boolean isEnabled() { | 33 public boolean isEnabled() { | 
| 35 return Build.VERSION.SDK_INT >= 14; | 34 return Build.VERSION.SDK_INT >= 14; | 
| 36 } | 35 } | 
| 37 | 36 | 
| (...skipping 14 matching lines...) Expand all Loading... | |
| 52 Map<String, String> headers, WritableByteChannel channel, | 51 Map<String, String> headers, WritableByteChannel channel, | 
| 53 HttpUrlRequestListener listener) { | 52 HttpUrlRequestListener listener) { | 
| 54 return new ChromiumUrlRequest(mRequestContext, url, requestPriority, | 53 return new ChromiumUrlRequest(mRequestContext, url, requestPriority, | 
| 55 headers, channel, listener); | 54 headers, channel, listener); | 
| 56 } | 55 } | 
| 57 | 56 | 
| 58 public ChromiumUrlRequestContext getRequestContext() { | 57 public ChromiumUrlRequestContext getRequestContext() { | 
| 59 return mRequestContext; | 58 return mRequestContext; | 
| 60 } | 59 } | 
| 61 } | 60 } | 
| OLD | NEW |