diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:48:46 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:48:46 +0000 |
| commit | efe22215cad3c4541a443339d948c226d54e44c5 (patch) | |
| tree | 2e8f8489f6b89a594bdb891120324c730178a087 /net/socket/ssl_client_socket_pool.cc | |
| parent | f18531246f728226c9b2a62f425dfb8db38af243 (diff) | |
| download | chromium_src-efe22215cad3c4541a443339d948c226d54e44c5.zip chromium_src-efe22215cad3c4541a443339d948c226d54e44c5.tar.gz chromium_src-efe22215cad3c4541a443339d948c226d54e44c5.tar.bz2 | |
Remove SSLHostInfo.
BUG=105208
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index 7cdf2f8..842da86 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -18,7 +18,6 @@ #include "net/socket/client_socket_handle.h" #include "net/socket/socks_client_socket_pool.h" #include "net/socket/ssl_client_socket.h" -#include "net/socket/ssl_host_info.h" #include "net/socket/transport_client_socket_pool.h" namespace net { @@ -189,19 +188,6 @@ int SSLConnectJob::DoLoop(int result) { int SSLConnectJob::DoTransportConnect() { DCHECK(transport_pool_); - if (context_.ssl_host_info_factory) { - ssl_host_info_.reset( - context_.ssl_host_info_factory->GetForHost( - params_->host_and_port().host(), - params_->ssl_config())); - } - - if (ssl_host_info_.get()) { - // This starts fetching the SSL host info from the disk cache for early - // certificate verification and the TLS cached information extension. - ssl_host_info_->Start(); - } - next_state_ = STATE_TRANSPORT_CONNECT_COMPLETE; transport_socket_handle_.reset(new ClientSocketHandle()); scoped_refptr<TransportSocketParams> transport_params = @@ -277,7 +263,7 @@ int SSLConnectJob::DoSSLConnect() { ssl_socket_.reset(client_socket_factory_->CreateSSLClientSocket( transport_socket_handle_.release(), params_->host_and_port(), - params_->ssl_config(), ssl_host_info_.release(), context_)); + params_->ssl_config(), context_)); return ssl_socket_->Connect(callback_); } @@ -449,7 +435,6 @@ SSLClientSocketPool::SSLClientSocketPool( CertVerifier* cert_verifier, ServerBoundCertService* server_bound_cert_service, TransportSecurityState* transport_security_state, - SSLHostInfoFactory* ssl_host_info_factory, const std::string& ssl_session_cache_shard, ClientSocketFactory* client_socket_factory, TransportClientSocketPool* transport_pool, @@ -472,7 +457,6 @@ SSLClientSocketPool::SSLClientSocketPool( cert_verifier, server_bound_cert_service, transport_security_state, - ssl_host_info_factory, ssl_session_cache_shard), net_log)), ssl_config_service_(ssl_config_service) { |