Revert revert 62918 - net: clean up SSLHostInfo construction."

Was reverted in r62922 due to a change landing between the try run and the
commit.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63046 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 4 deletions

diff --git a/jingle/notifier/base/chrome_async_socket.cc b/jingle/notifier/base/chrome_async_socket.cc
index b3ac52a..4858bab 100644
--- a/jingle/notifier/base/chrome_async_socket.cc
+++ b/jingle/notifier/base/chrome_async_socket.cc
@@ -435,7 +435,8 @@ 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_));
+          transport_socket_.release(), domain_name, ssl_config_,
+          NULL /* ssl_host_info */));
   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 c0ced61..78cb1bc 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.cc
+++ b/jingle/notifier/base/xmpp_client_socket_factory.cc
@@ -33,9 +33,10 @@ net::ClientSocket* XmppClientSocketFactory::CreateTCPClientSocket(
 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
     net::ClientSocketHandle* transport_socket,
     const std::string& hostname,
-    const net::SSLConfig& ssl_config) {
+    const net::SSLConfig& ssl_config,
+    net::SSLHostInfo* ssl_host_info) {
   return client_socket_factory_->CreateSSLClientSocket(
-      transport_socket, hostname, ssl_config);
+      transport_socket, hostname, ssl_config, ssl_host_info);
 }
 
 }  // namespace
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index 73b2d8d..eb94555 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/notifier/base/xmpp_client_socket_factory.h
@@ -9,6 +9,10 @@
 
 #include "net/socket/client_socket_factory.h"
 
+namespace net {
+class SSLHostInfo;
+}
+
 namespace notifier {
 
 class XmppClientSocketFactory : public net::ClientSocketFactory {
@@ -26,7 +30,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);
+      const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info);
 
  private:
   net::ClientSocketFactory* const client_socket_factory_;