Pass both hostname and port into SSLClientSocket

net/socket/ssl_client_socket_unittest.cc

Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index c242db16ff21fa1097b937457b7cf2dc67f85d6f..d8ded4f5c811be48ed4612a0510e3c9bc5f0d78d 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -5,6 +5,7 @@
 #include "net/socket/ssl_client_socket.h"
 
 #include "net/base/address_list.h"
+#include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_log.h"
@@ -84,7 +85,8 @@ TEST_F(SSLClientSocketTest, Connect) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-          server_.kHostName, kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   EXPECT_FALSE(sock->IsConnected());
 
@@ -128,7 +130,8 @@ TEST_F(SSLClientSocketTest, ConnectExpired) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-          server_.kHostName, kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kBadHTTPSPort),
+          kDefaultSSLConfig));
 
   EXPECT_FALSE(sock->IsConnected());
 
@@ -173,7 +176,8 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-          server_.kMismatchedHostName, kDefaultSSLConfig));
+          net::HostPortPair(server_.kMismatchedHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   EXPECT_FALSE(sock->IsConnected());
 
@@ -219,7 +223,8 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthNoCert) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-          server_.kHostName, kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   EXPECT_FALSE(sock->IsConnected());
 
@@ -270,8 +275,8 @@ TEST_F(SSLClientSocketTest, Read) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-                                             server_.kHostName,
-                                             kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   rv = sock->Connect(&callback);
   if (rv != net::OK) {
@@ -332,8 +337,8 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-                                             server_.kHostName,
-                                             kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   rv = sock->Connect(&callback);
   if (rv != net::OK) {
@@ -391,7 +396,8 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-          server_.kHostName, kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   rv = sock->Connect(&callback);
   if (rv != net::OK) {
@@ -445,7 +451,8 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
-          server_.kHostName, kDefaultSSLConfig));
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   rv = sock->Connect(&callback);
   if (rv != net::OK) {
@@ -514,8 +521,9 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) {
   EXPECT_EQ(net::OK, rv);
 
   scoped_ptr<net::SSLClientSocket> sock(
-      socket_factory_->CreateSSLClientSocket(
-          transport, server_.kHostName, kDefaultSSLConfig));
+      socket_factory_->CreateSSLClientSocket(transport,
+          net::HostPortPair(server_.kHostName, server_.kOKHTTPSPort),
+          kDefaultSSLConfig));
 
   rv = sock->Connect(&callback);
   EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, rv);