From 8c9d4ba6af47099c5ce030d0802b276cd8fd37b2 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Mon, 18 Oct 2010 13:45:12 +0000 Subject: 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 --- remoting/jingle_glue/ssl_socket_adapter.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'remoting/jingle_glue') 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_); -- cgit v1.1