Chromium Code Reviews| Index: components/cronet/android/cronet_url_request_context_adapter.h |
| diff --git a/components/cronet/android/cronet_url_request_context_adapter.h b/components/cronet/android/cronet_url_request_context_adapter.h |
| index cbc3e2c9db9f16667e787406f910779ffce58613..2573d1444c923c4022ad07178907ef7c5a3ff3a5 100644 |
| --- a/components/cronet/android/cronet_url_request_context_adapter.h |
| +++ b/components/cronet/android/cronet_url_request_context_adapter.h |
| @@ -32,6 +32,7 @@ class NetLog; |
| class ProxyConfigService; |
| class SdchOwner; |
| class URLRequestContext; |
| +class URLRequestContextBuilder; |
| class WriteToFileNetLogObserver; |
| } // namespace net |
| @@ -95,6 +96,12 @@ class CronetURLRequestContextAdapter |
| void ProvideRTTObservations(JNIEnv* env, jobject jcaller, bool should); |
| void ProvideThroughputObservations(JNIEnv* env, jobject jcaller, bool should); |
| + // Sets a net::CertVerifier for Testing. |jmock_verifier| should be owned |
| + // and destroyed by the caller. |
| + void SetMockCertVerifierForTesting(JNIEnv* env, |
| + jobject jcaller, |
| + jlong jmock_verifier); |
| + |
| private: |
| // Initializes |context_| on the Network thread. |
| void InitializeOnNetworkThread(scoped_ptr<URLRequestContextConfig> config, |
| @@ -139,6 +146,7 @@ class CronetURLRequestContextAdapter |
| const base::TimeTicks& timestamp, |
| net::NetworkQualityEstimator::ObservationSource source) override; |
| + void SetMockCertVerifierForTestingOnNetworkThread(jlong jmock_verifier); |
| // Network thread is owned by |this|, but is destroyed from java thread. |
| base::Thread* network_thread_; |
| @@ -149,6 +157,7 @@ class CronetURLRequestContextAdapter |
| // network thread. |
| scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_; |
| + scoped_ptr<net::URLRequestContextBuilder> context_builder_; |
|
mef
2015/10/12 18:35:03
The need to add context_builder_ as a member of Ur
xunjieli
2015/10/13 01:58:02
Done.
|
| // |pref_service_| should outlive the HttpServerPropertiesManager owned by |
| // |context_|. |
| scoped_ptr<PrefService> pref_service_; |