diff options
Diffstat (limited to 'net/url_request')
-rw-r--r-- | net/url_request/url_request_context.cc | 1 | ||||
-rw-r--r-- | net/url_request/url_request_context.h | 6 | ||||
-rw-r--r-- | net/url_request/url_request_unittest.h | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc index 281aa7e..04f0da0 100644 --- a/net/url_request/url_request_context.cc +++ b/net/url_request/url_request_context.cc @@ -11,6 +11,7 @@ URLRequestContext::URLRequestContext() : net_log_(NULL), host_resolver_(NULL), + cert_verifier_(NULL), dnsrr_resolver_(NULL), dns_cert_checker_(NULL), http_transaction_factory_(NULL), diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index f8a6c7d..d3ba85f 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -21,6 +21,7 @@ #include "net/socket/dns_cert_provenance_checker.h" namespace net { +class CertVerifier; class CookiePolicy; class CookieStore; class DnsCertProvenanceChecker; @@ -50,6 +51,10 @@ class URLRequestContext return host_resolver_; } + net::CertVerifier* cert_verifier() const { + return cert_verifier_; + } + net::DnsRRResolver* dnsrr_resolver() const { return dnsrr_resolver_; } @@ -130,6 +135,7 @@ class URLRequestContext // subclasses. net::NetLog* net_log_; net::HostResolver* host_resolver_; + net::CertVerifier* cert_verifier_; net::DnsRRResolver* dnsrr_resolver_; scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_; scoped_refptr<net::ProxyService> proxy_service_; diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index 16b4dc6..50236fd 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -20,6 +20,7 @@ #include "base/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" +#include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_policy.h" #include "net/base/host_resolver.h" @@ -150,17 +151,20 @@ class TestURLRequestContext : public URLRequestContext { delete ftp_transaction_factory_; delete http_transaction_factory_; delete http_auth_handler_factory_; + delete cert_verifier_; delete host_resolver_; } private: void Init() { + cert_verifier_ = new net::CertVerifier; ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_); ssl_config_service_ = new net::SSLConfigServiceDefaults; http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault( host_resolver_); http_transaction_factory_ = new net::HttpCache( net::HttpNetworkLayer::CreateFactory(host_resolver_, + cert_verifier_, NULL /* dnsrr_resolver */, NULL /* dns_cert_checker */, NULL /* ssl_host_info_factory */, |