Changed SPDY's ip connection pooling logic to only add the used IP,

net/socket/ssl_client_socket_pool_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_proxy_client_socket_pool.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/auth.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_certificate_data.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool_histograms.h"
 #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 {
 
 namespace {
 
 const int kMaxSockets = 32;
 const int kMaxSocketsPerGroup = 6;
 
 class SSLClientSocketPoolTest : public testing::Test {
@@ skipping 610 matching lines @@
   EXPECT_FALSE(tunnel_handle->socket()->IsConnected());
 }
 
 TEST_F(SSLClientSocketPoolTest, IPPooling) {
   const int kTestPort = 80;
   struct TestHosts {
     std::string name;
     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);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
     host_resolver_.rules()->AddIPLiteralRule(test_hosts[i].name,
         test_hosts[i].iplist, "");
 
     // This test requires that the HostResolver cache be populated.  Normal
     // code would have done this already, but we do it manually.
     HostResolver::RequestInfo info(HostPortPair(test_hosts[i].name, kTestPort));
@@ skipping 33 matching lines @@
   EXPECT_TRUE(handle->is_initialized());
   EXPECT_TRUE(handle->socket());
 
   SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle->socket());
   EXPECT_TRUE(ssl_socket->was_npn_negotiated());
   std::string proto;
   ssl_socket->GetNextProto(&proto);
   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,
       &spdy_session, true);
   EXPECT_EQ(0, rv);
 
   EXPECT_TRUE(session_->spdy_session_pool()->HasSession(test_hosts[0].pair));
   EXPECT_FALSE(session_->spdy_session_pool()->HasSession(test_hosts[1].pair));
   EXPECT_TRUE(session_->spdy_session_pool()->HasSession(test_hosts[2].pair));
 
   session_->spdy_session_pool()->CloseAllSessions();
 }
 
 // It would be nice to also test the timeouts in SSLClientSocketPool.
 
 }  // namespace
 
 }  // namespace net