diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 13:45:12 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 13:45:12 +0000 |
| commit | 8c9d4ba6af47099c5ce030d0802b276cd8fd37b2 (patch) | |
| tree | 8fb914c374db9631a749475180036df83e2ed9a9 /remoting/jingle_glue | |
| parent | 971888bc3cefb8dc5538c7785a4b2c82f706a2a5 (diff) | |
| download | chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.zip chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.tar.gz chromium_src-8c9d4ba6af47099c5ce030d0802b276cd8fd37b2.tar.bz2 | |
Revert 62918 - 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
TBR=agl@chromium.org
Review URL: http://codereview.chromium.org/3846005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/ssl_socket_adapter.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/remoting/jingle_glue/ssl_socket_adapter.cc b/remoting/jingle_glue/ssl_socket_adapter.cc index 3f49325..6eca04b 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.cc +++ b/remoting/jingle_glue/ssl_socket_adapter.cc @@ -67,8 +67,7 @@ int SSLSocketAdapter::BeginSSL() { transport_socket_->set_addr(talk_base::SocketAddress(hostname_, 0)); ssl_socket_.reset( net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket( - transport_socket_, hostname_.c_str(), ssl_config, - NULL /* ssl_host_info */)); + transport_socket_, hostname_.c_str(), ssl_config)); int result = ssl_socket_->Connect(&connected_callback_); |