| Index: net/http/http_network_layer.cc
|
| ===================================================================
|
| --- net/http/http_network_layer.cc (revision 69359)
|
| +++ net/http/http_network_layer.cc (working copy)
|
| @@ -21,6 +21,7 @@
|
| // static
|
| HttpTransactionFactory* HttpNetworkLayer::CreateFactory(
|
| HostResolver* host_resolver,
|
| + CertVerifier* cert_verifier,
|
| DnsRRResolver* dnsrr_resolver,
|
| DnsCertProvenanceChecker* dns_cert_checker,
|
| SSLHostInfoFactory* ssl_host_info_factory,
|
| @@ -32,7 +33,7 @@
|
| DCHECK(proxy_service);
|
|
|
| return new HttpNetworkLayer(ClientSocketFactory::GetDefaultFactory(),
|
| - host_resolver, dnsrr_resolver,
|
| + host_resolver, cert_verifier, dnsrr_resolver,
|
| dns_cert_checker,
|
| ssl_host_info_factory, proxy_service,
|
| ssl_config_service, http_auth_handler_factory,
|
| @@ -52,6 +53,7 @@
|
| HttpNetworkLayer::HttpNetworkLayer(
|
| ClientSocketFactory* socket_factory,
|
| HostResolver* host_resolver,
|
| + CertVerifier* cert_verifier,
|
| DnsRRResolver* dnsrr_resolver,
|
| DnsCertProvenanceChecker* dns_cert_checker,
|
| SSLHostInfoFactory* ssl_host_info_factory,
|
| @@ -62,6 +64,7 @@
|
| NetLog* net_log)
|
| : socket_factory_(socket_factory),
|
| host_resolver_(host_resolver),
|
| + cert_verifier_(cert_verifier),
|
| dnsrr_resolver_(dnsrr_resolver),
|
| dns_cert_checker_(dns_cert_checker),
|
| ssl_host_info_factory_(ssl_host_info_factory),
|
| @@ -80,6 +83,7 @@
|
| HttpNetworkLayer::HttpNetworkLayer(
|
| ClientSocketFactory* socket_factory,
|
| HostResolver* host_resolver,
|
| + CertVerifier* cert_verifier,
|
| DnsRRResolver* dnsrr_resolver,
|
| DnsCertProvenanceChecker* dns_cert_checker,
|
| SSLHostInfoFactory* ssl_host_info_factory,
|
| @@ -91,6 +95,7 @@
|
| NetLog* net_log)
|
| : socket_factory_(socket_factory),
|
| host_resolver_(host_resolver),
|
| + cert_verifier_(cert_verifier),
|
| dnsrr_resolver_(dnsrr_resolver),
|
| dns_cert_checker_(dns_cert_checker),
|
| ssl_host_info_factory_(ssl_host_info_factory),
|
| @@ -108,6 +113,8 @@
|
|
|
| HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session)
|
| : socket_factory_(ClientSocketFactory::GetDefaultFactory()),
|
| + host_resolver_(NULL),
|
| + cert_verifier_(NULL),
|
| dnsrr_resolver_(NULL),
|
| dns_cert_checker_(NULL),
|
| ssl_host_info_factory_(NULL),
|
| @@ -150,6 +157,7 @@
|
| spdy_session_pool_.reset(new SpdySessionPool(ssl_config_service_));
|
| session_ = new HttpNetworkSession(
|
| host_resolver_,
|
| + cert_verifier_,
|
| dnsrr_resolver_,
|
| dns_cert_checker_,
|
| ssl_host_info_factory_,
|
| @@ -162,6 +170,7 @@
|
| net_log_);
|
| // These were just temps for lazy-initializing HttpNetworkSession.
|
| host_resolver_ = NULL;
|
| + cert_verifier_ = NULL;
|
| dnsrr_resolver_ = NULL;
|
| dns_cert_checker_ = NULL;
|
| ssl_host_info_factory_ = NULL;
|
|
|