Merging SPDY IP connection pooling changes from the trunk (r93105)

net/spdy/spdy_session_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/spdy/spdy_session.h"
 
+#include "net/base/ip_endpoint.h"
 #include "net/spdy/spdy_io_buffer.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/spdy/spdy_stream.h"
 #include "net/spdy/spdy_test_util.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 // TODO(cbentzel): Expose compression setter/getter in public SpdySession
 //                 interface rather than going through all these contortions.
@@ skipping 392 matching lines @@
 // This test has two variants, one for each style of closing the connection.
 // If |clean_via_close_current_sessions| is false, the sessions are closed
 // manually, calling SpdySessionPool::Remove() directly.  If it is true,
 // sessions are closed with SpdySessionPool::CloseCurrentSessions().
 void IPPoolingTest(bool clean_via_close_current_sessions) {
   const int kTestPort = 80;
   struct TestHosts {
     std::string name;
     std::string iplist;
     HostPortProxyPair pair;
+    AddressList addresses;
   } test_hosts[] = {
-    { "www.foo.com",    "192.168.0.1,192.168.0.5" },
-    { "images.foo.com", "192.168.0.2,192.168.0.3,192.168.0.5" },
+    { "www.foo.com",    "192.0.2.33,192.168.0.1,192.168.0.5" },
+    { "images.foo.com", "192.168.0.2,192.168.0.3,192.168.0.5,192.0.2.33" },
     { "js.foo.com",     "192.168.0.4,192.168.0.3" },
   };
 
   SpdySessionDependencies session_deps;
   session_deps.host_resolver->set_synchronous_mode(true);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
     session_deps.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));
-    AddressList result;
     session_deps.host_resolver->Resolve(
-        info, &result, NULL, NULL, BoundNetLog());
+        info, &test_hosts[i].addresses, NULL, NULL, BoundNetLog());
 
     // Setup a HostPortProxyPair
     test_hosts[i].pair = HostPortProxyPair(
         HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct());
   }
 
   MockConnect connect_data(false, OK);
   MockRead reads[] = {
     MockRead(false, ERR_IO_PENDING)  // Stall forever.
   };
@@ skipping 23 matching lines @@
                           false,
                           false));
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   EXPECT_EQ(OK,
             connection->Init(test_host_port_pair.ToString(),
                              transport_params, MEDIUM,
                              NULL, http_session->transport_socket_pool(),
                              BoundNetLog()));
   EXPECT_EQ(OK, session->InitializeWithSocket(connection.release(), false, OK));
 
+  // TODO(rtenneti): MockClientSocket::GetPeerAddress return's 0 as the port
+  // number. Fix it to return port 80 and then use GetPeerAddress to AddAlias.
+  const addrinfo* address = test_hosts[0].addresses.head();
+  SpdySessionPoolPeer pool_peer(spdy_session_pool);
+  pool_peer.AddAlias(address, test_hosts[0].pair);
+
   // Flush the SpdySession::OnReadComplete() task.
   MessageLoop::current()->RunAllPending();
 
   // The third host has no overlap with the first, so it can't pool IPs.
   EXPECT_FALSE(spdy_session_pool->HasSession(test_hosts[2].pair));
 
   // The second host overlaps with the first, and should IP pool.
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[1].pair));
 
   // Verify that the second host, through a proxy, won't share the IP.
@@ skipping 76 matching lines @@
 
   test_settings_storage->Set(test_host_port_pair, test_settings);
   EXPECT_NE(0u, test_settings_storage->Get(test_host_port_pair).size());
   spdy_session_pool->OnIPAddressChanged();
   EXPECT_EQ(0u, test_settings_storage->Get(test_host_port_pair).size());
 }
 
 }  // namespace
 
 }  // namespace net