Pass both hostname and port into SSLClientSocket

net/socket/client_socket_factory.h

Index: net/socket/client_socket_factory.h
diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h
index d0f1581db76f0a548424efc28ffa07a04bb3afa8..ed3113f20855d44333b9d8585aba7d9d43c36a51 100644
--- a/net/socket/client_socket_factory.h
+++ b/net/socket/client_socket_factory.h
@@ -6,13 +6,12 @@
 #define NET_SOCKET_CLIENT_SOCKET_FACTORY_H_
 #pragma once
 
-#include <string>
-
 namespace net {
 
 class AddressList;
 class ClientSocket;
 class ClientSocketHandle;
+class HostPortPair;
 class NetLog;
 class SSLClientSocket;
 struct SSLConfig;
@@ -20,7 +19,7 @@ struct SSLConfig;
 // Callback function to create new SSLClientSocket objects.
 typedef SSLClientSocket* (*SSLClientSocketFactory)(
     ClientSocketHandle* transport_socket,
-    const std::string& hostname,
+    const HostPortPair& host_port_pair,
     const SSLConfig& ssl_config);
 
 // An interface used to instantiate ClientSocket objects.  Used to facilitate
@@ -34,13 +33,13 @@ class ClientSocketFactory {
 
   virtual SSLClientSocket* CreateSSLClientSocket(
       ClientSocketHandle* transport_socket,
-      const std::string& hostname,
+      const HostPortPair& host_port_pair,
       const SSLConfig& ssl_config) = 0;
 
 
   // Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
   virtual SSLClientSocket* CreateSSLClientSocket(ClientSocket* transport_socket,
-                                                 const std::string& hostname,
+                                                 const HostPortPair& hostname,
                                                  const SSLConfig& ssl_config);
 
   // Returns the default ClientSocketFactory.