diff options
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_session.cc | 1 | ||||
| -rw-r--r-- | net/http/http_network_session.h | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 6 | ||||
| -rw-r--r-- | net/http/http_proxy_client_socket_pool_unittest.cc | 1 | ||||
| -rw-r--r-- | net/http/http_stream_factory_impl_unittest.cc | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc index 9f738ec..b52aa107 100644 --- a/net/http/http_network_session.cc +++ b/net/http/http_network_session.cc @@ -35,6 +35,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) ClientSocketFactory::GetDefaultFactory(), params.host_resolver, params.cert_verifier, + params.origin_bound_cert_service, params.dnsrr_resolver, params.dns_cert_checker, params.ssl_host_info_factory, diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index f7da921..373979f 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -51,6 +51,7 @@ class NET_API HttpNetworkSession : client_socket_factory(NULL), host_resolver(NULL), cert_verifier(NULL), + origin_bound_cert_service(NULL), dnsrr_resolver(NULL), dns_cert_checker(NULL), proxy_service(NULL), @@ -63,6 +64,7 @@ class NET_API HttpNetworkSession ClientSocketFactory* client_socket_factory; HostResolver* host_resolver; CertVerifier* cert_verifier; + OriginBoundCertService* origin_bound_cert_service; DnsRRResolver* dnsrr_resolver; DnsCertProvenanceChecker* dns_cert_checker; ProxyService* proxy_service; diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 863693a..2e76b4b 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -321,7 +321,7 @@ CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool( HostResolver* host_resolver, CertVerifier* cert_verifier) : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL) {} + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) {} //----------------------------------------------------------------------------- @@ -7098,9 +7098,11 @@ TEST_F(HttpNetworkTransactionTest, SSLConfig ssl_config; session->ssl_config_service()->GetSSLConfig(&ssl_config); scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); + SSLClientSocketContext context; + context.cert_verifier = session_deps.cert_verifier.get(); ssl_connection->set_socket(session_deps.socket_factory.CreateSSLClientSocket( connection.release(), HostPortPair("" , 443), ssl_config, - NULL /* ssl_host_info */, session_deps.cert_verifier.get(), NULL)); + NULL /* ssl_host_info */, context)); EXPECT_EQ(ERR_IO_PENDING, ssl_connection->socket()->Connect(&callback)); EXPECT_EQ(OK, callback.WaitForResult()); diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index fc4b2ed..0a1a2d5 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -66,6 +66,7 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam { &ssl_histograms_, &host_resolver_, &cert_verifier_, + NULL /* origin_bound_cert_store */, NULL /* dnsrr_resolver */, NULL /* dns_cert_checker */, NULL /* ssl_host_info_factory */, diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc index 91bcfdb..1b40d5e 100644 --- a/net/http/http_stream_factory_impl_unittest.cc +++ b/net/http/http_stream_factory_impl_unittest.cc @@ -208,7 +208,7 @@ template<> CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( HostResolver* host_resolver, CertVerifier* cert_verifier) : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL), + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), last_num_streams_(-1) {} TEST(HttpStreamFactoryTest, PreconnectDirect) { |