Pass both hostname and port into SSLClientSocket

net/socket/client_socket_factory.cc

Index: net/socket/client_socket_factory.cc
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index fbccfcb2f9cd889a42b03416433d0c98057c9476..6db53e063fa7009c8ed9f2eb5346105f335d1755 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -23,20 +23,20 @@ namespace {
 
 SSLClientSocket* DefaultSSLClientSocketFactory(
     ClientSocketHandle* transport_socket,
-    const std::string& hostname,
+    const HostPortPair& host_port_pair,
     const SSLConfig& ssl_config) {
 #if defined(OS_WIN)
-  return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
+  return new SSLClientSocketWin(transport_socket, host_port_pair, ssl_config);
 #elif defined(USE_NSS)
-  return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
+  return new SSLClientSocketNSS(transport_socket, host_port_pair, ssl_config);
 #elif defined(OS_MACOSX)
   // TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using
   // Mac OS X CDSA/CSSM yet (http://crbug.com/45369), so fall back on
   // SSLClientSocketMac.
   if (ssl_config.client_cert)
-    return new SSLClientSocketMac(transport_socket, hostname, ssl_config);
+    return new SSLClientSocketMac(transport_socket, host_port_pair, ssl_config);
 
-  return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
+  return new SSLClientSocketNSS(transport_socket, host_port_pair, ssl_config);
 #else
   NOTIMPLEMENTED();
   return NULL;
@@ -54,9 +54,9 @@ class DefaultClientSocketFactory : public ClientSocketFactory {
 
   virtual SSLClientSocket* CreateSSLClientSocket(
       ClientSocketHandle* transport_socket,
-      const std::string& hostname,
+      const HostPortPair& host_port_pair,
       const SSLConfig& ssl_config) {
-    return g_ssl_factory(transport_socket, hostname, ssl_config);
+    return g_ssl_factory(transport_socket, host_port_pair, ssl_config);
   }
 };
 
@@ -76,11 +76,11 @@ void ClientSocketFactory::SetSSLClientSocketFactory(
 // Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
 SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
     ClientSocket* transport_socket,
-    const std::string& hostname,
+    const HostPortPair& host_port_pair,
     const SSLConfig& ssl_config) {
   ClientSocketHandle* socket_handle = new ClientSocketHandle();
   socket_handle->set_socket(transport_socket);
-  return CreateSSLClientSocket(socket_handle, hostname, ssl_config);
+  return CreateSSLClientSocket(socket_handle, host_port_pair, ssl_config);
 }
 
 }  // namespace net