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 --- jingle/notifier/base/chrome_async_socket.cc | 3 +-- jingle/notifier/base/xmpp_client_socket_factory.cc | 5 ++--- jingle/notifier/base/xmpp_client_socket_factory.h | 6 +----- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'jingle/notifier/base') diff --git a/jingle/notifier/base/chrome_async_socket.cc b/jingle/notifier/base/chrome_async_socket.cc index 4858bab..b3ac52a 100644 --- a/jingle/notifier/base/chrome_async_socket.cc +++ b/jingle/notifier/base/chrome_async_socket.cc @@ -435,8 +435,7 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) { DCHECK(transport_socket_.get()); transport_socket_.reset( client_socket_factory_->CreateSSLClientSocket( - transport_socket_.release(), domain_name, ssl_config_, - NULL /* ssl_host_info */)); + transport_socket_.release(), domain_name, ssl_config_)); int status = transport_socket_->Connect(&ssl_connect_callback_); if (status != net::ERR_IO_PENDING) { MessageLoop* message_loop = MessageLoop::current(); diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc index 78cb1bc..c0ced61 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.cc +++ b/jingle/notifier/base/xmpp_client_socket_factory.cc @@ -33,10 +33,9 @@ net::ClientSocket* XmppClientSocketFactory::CreateTCPClientSocket( net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( net::ClientSocketHandle* transport_socket, const std::string& hostname, - const net::SSLConfig& ssl_config, - net::SSLHostInfo* ssl_host_info) { + const net::SSLConfig& ssl_config) { return client_socket_factory_->CreateSSLClientSocket( - transport_socket, hostname, ssl_config, ssl_host_info); + transport_socket, hostname, ssl_config); } } // namespace diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h index eb94555..73b2d8d 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.h +++ b/jingle/notifier/base/xmpp_client_socket_factory.h @@ -9,10 +9,6 @@ #include "net/socket/client_socket_factory.h" -namespace net { -class SSLHostInfo; -} - namespace notifier { class XmppClientSocketFactory : public net::ClientSocketFactory { @@ -30,7 +26,7 @@ class XmppClientSocketFactory : public net::ClientSocketFactory { const net::NetLog::Source& source); virtual net::SSLClientSocket* CreateSSLClientSocket( net::ClientSocketHandle* transport_socket, const std::string& hostname, - const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info); + const net::SSLConfig& ssl_config); private: net::ClientSocketFactory* const client_socket_factory_; -- cgit v1.1