diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 13:28:28 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 13:28:28 +0000 |
| commit | 8281f7022c819a13d5d1741d2c1ff73aa4e994a9 (patch) | |
| tree | 7fcb40be8d7a09b8a55800250a14d496fce5646c /net/socket_stream | |
| parent | 46aeaa8e2c32a014c9d4641ceb6e75954f0bb3a0 (diff) | |
| download | chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.zip chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.tar.gz chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.tar.bz2 | |
net: clean up SSLHostInfo construction.
Create an SSLHostInfoFactory interface and plumb it from the HttpCache
to the SSLConnectJob. Also, move the SSLHostInfo reference from the
ssl_config to being passed to the SSLClientSocket.
BUG=none
TEST=net_unittests
Review URL: http://codereview.chromium.org/3747003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index aa91962..7c3c5e9 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -793,8 +793,10 @@ int SocketStream::DoSOCKSConnectComplete(int result) { int SocketStream::DoSSLConnect() { DCHECK(factory_); + // TODO(agl): look into plumbing SSLHostInfo here. socket_.reset(factory_->CreateSSLClientSocket( - socket_.release(), url_.HostNoBrackets(), ssl_config_)); + socket_.release(), url_.HostNoBrackets(), ssl_config_, + NULL /* ssl_host_info */)); next_state_ = STATE_SSL_CONNECT_COMPLETE; metrics_->OnSSLConnection(); return socket_->Connect(&io_callback_); |