Chromium Code Reviews| Index: components/cronet/android/cronet_url_request_context_adapter.cc |
| diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc |
| index 1141e8b2cc0a90b18a593ecb41f478b52168e1a0..c538a611660d0f9efbd85ae8cd8fe5ab5a0dde02 100644 |
| --- a/components/cronet/android/cronet_url_request_context_adapter.cc |
| +++ b/components/cronet/android/cronet_url_request_context_adapter.cc |
| @@ -635,6 +635,9 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread( |
| pkp->pin_hashes, GURL::EmptyGURL()); |
| } |
| + context_->transport_security_state()->EnableLocalTrustAnchorPinning( |
|
Ryan Sleevi
2016/06/13 17:03:11
Naming: This C++ method name is not correct/consis
kapishnikov
2016/06/15 00:56:20
Done.
|
| + config->pin_local_trust_anchors); |
| + |
| JNIEnv* env = base::android::AttachCurrentThread(); |
| jcronet_url_request_context_.Reset(env, jcronet_url_request_context.obj()); |
| Java_CronetUrlRequestContext_initNetworkThread( |
| @@ -799,6 +802,7 @@ static jlong CreateRequestContextConfig( |
| jboolean jdisable_cache, |
| jint jhttp_cache_mode, |
| jlong jhttp_cache_max_size, |
| + jboolean jpin_local_trust_anchors, |
| const JavaParamRef<jstring>& jexperimental_quic_connection_options, |
| jlong jmock_cert_verifier) { |
| return reinterpret_cast<jlong>(new URLRequestContextConfig( |
| @@ -817,6 +821,7 @@ static jlong CreateRequestContextConfig( |
| jdata_reduction_proxy_fallback_proxy), |
| ConvertNullableJavaStringToUTF8( |
| env, jdata_reduction_proxy_secure_proxy_check_url), |
| + jpin_local_trust_anchors, |
| base::WrapUnique( |
| reinterpret_cast<net::CertVerifier*>(jmock_cert_verifier)))); |
| } |