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

Unified Diff: components/cronet/android/cronet_url_request_context_adapter.h

Issue 1389213003: [Cronet] Use Https for Quic Test Server (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ryancl
Patch Set: Use mock verifier and fix tests Created 5 years, 2 months 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 side-by-side diff with in-line comments
Download patch
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..01b89e19af82c5c2353c5053f57e514a64bca350 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.h
+++ b/components/cronet/android/cronet_url_request_context_adapter.h
@@ -33,6 +33,11 @@ class ProxyConfigService;
class SdchOwner;
class URLRequestContext;
class WriteToFileNetLogObserver;
+
+#if defined(CRONET_TEST)
+class MockCertVerifier;
+class URLRequestContextBuilder;
+#endif
} // namespace net
namespace cronet {
@@ -139,6 +144,13 @@ class CronetURLRequestContextAdapter
const base::TimeTicks& timestamp,
net::NetworkQualityEstimator::ObservationSource source) override;
+#if defined(CRONET_TEST)
+ // Additionally configures |builder| for testing.
+ void ConfigureURLRequestContextBuilderForTesting(
+ URLRequestContextConfig* config,
+ net::URLRequestContextBuilder* builder);
+#endif
+
// Network thread is owned by |this|, but is destroyed from java thread.
base::Thread* network_thread_;
@@ -181,6 +193,11 @@ class CronetURLRequestContextAdapter
scoped_ptr<CronetDataReductionProxy> data_reduction_proxy_;
#endif
+#if defined(CRONET_TEST)
+ // Used in testing to trust certs.
+ scoped_ptr<net::MockCertVerifier> mock_cert_verifier_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(CronetURLRequestContextAdapter);
};

Powered by Google App Engine
This is Rietveld 408576698