Index: net/socket/ssl_client_socket_pool_unittest.cc |
=================================================================== |
--- net/socket/ssl_client_socket_pool_unittest.cc (revision 92397) |
+++ net/socket/ssl_client_socket_pool_unittest.cc (working copy) |
@@ -26,6 +26,7 @@ |
#include "net/socket/socket_test_util.h" |
#include "net/spdy/spdy_session.h" |
#include "net/spdy/spdy_session_pool.h" |
+#include "net/spdy/spdy_test_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace net { |
@@ -656,9 +657,9 @@ |
std::string iplist; |
HostPortProxyPair pair; |
} test_hosts[] = { |
- { "www.webkit.org", "192.168.0.1,192.168.0.5" }, |
+ { "www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5" }, |
{ "code.google.com", "192.168.0.2,192.168.0.3,192.168.0.5" }, |
- { "js.webkit.org", "192.168.0.4,192.168.0.5" }, |
+ { "js.webkit.org", "192.0.2.33,192.168.0.4,192.168.0.1" }, |
}; |
host_resolver_.set_synchronous_mode(true); |
@@ -712,6 +713,12 @@ |
EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto), |
SSLClientSocket::kProtoSPDY2); |
+ // MockClientSocket::GetPeerAddress return's 0 as the port number and when we |
+ // search for HasSession, we lookup with port 80. AddAliases adds addresses |
+ // with port 80. |
+ SpdySessionPoolPeer pool_peer(session_->spdy_session_pool()); |
+ pool_peer.AddAliases(test_hosts[0].pair); |
+ |
scoped_refptr<SpdySession> spdy_session; |
rv = session_->spdy_session_pool()->GetSpdySessionFromSocket( |
test_hosts[0].pair, handle.release(), BoundNetLog(), 0, |