Minor cleanup of unit tests for spdy_session_ool.

net/http/http_network_transaction_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_network_transaction.h"
 
 #include <math.h>  // ceil
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 8684 matching lines @@
 
     // Now that the new handshake has failed, ensure that the client
     // certificate was removed from the client auth cache.
     ASSERT_FALSE(session->ssl_client_auth_cache()->Lookup("proxy:70",
                                                           &client_cert));
     ASSERT_FALSE(session->ssl_client_auth_cache()->Lookup("www.example.com:443",
                                                           &client_cert));
   }
 }
 
-void IPPoolingPreloadHostCache(MockCachingHostResolver* host_resolver,
-                               SpdySessionPoolPeer* pool_peer) {
-  const int kTestPort = 443;
-  struct TestHosts {
-    std::string name;
-    std::string iplist;
-  } test_hosts[] = {
-    { "www.google.com", "127.0.0.1"},
-  };
+void IPPoolingAddAlias(MockCachingHostResolver* host_resolver,
+                       SpdySessionPoolPeer* pool_peer,
+                       std::string host,
+                       int port,
+                       std::string iplist) {
+  // Create a host resolver dependency that returns address |iplist| for
+  // resolutions of |host|.
+  host_resolver->rules()->AddIPLiteralRule(host, iplist, "");
 
-  // Preload cache entries into HostCache.
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
-    host_resolver->rules()->AddIPLiteralRule(test_hosts[i].name,
-        test_hosts[i].iplist, "");
+  // Setup a HostPortProxyPair.
+  HostPortPair host_port_pair(host, port);
+  HostPortProxyPair pair = HostPortProxyPair(host_port_pair,
+                                             ProxyServer::Direct());
 
-    AddressList addresses;
-    // 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));
-    host_resolver->Resolve(
-        info, &addresses, NULL, NULL, BoundNetLog());
+  // Resolve the host and port.
+  AddressList addresses;
+  HostResolver::RequestInfo info(host_port_pair);
+  host_resolver->Resolve(info, &addresses, NULL, NULL, BoundNetLog());
 
-    // Setup a HostPortProxyPair
-    HostPortProxyPair pair = HostPortProxyPair(
-        HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct());
-
-    const addrinfo* address = addresses.head();
-    pool_peer->AddAlias(address, pair);
-  }
+  // Add the first address as an alias. It would have been better to call
+  // MockClientSocket::GetPeerAddress but that returns 192.0.2.33 whereas
+  // MockHostResolver returns 127.0.0.1 (MockHostResolverBase::Reset). So we use
+  // the first address (127.0.0.1) returned by MockHostResolver as an alias for
+  // the |pair|.
+  const addrinfo* address = addresses.head();
+  pool_peer->AddAlias(address, pair);
 }
 
 TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) {
   HttpStreamFactory::set_use_alternate_protocols(true);
   HttpStreamFactory::set_next_protos(kExpectedNPNString);
 
   // Set up a special HttpNetworkSession with a MockCachingHostResolver.
   SessionDependencies session_deps;
   MockCachingHostResolver host_resolver;
   net::HttpNetworkSession::Params params;
@@ skipping 60 matching lines @@
   std::string response_data;
   ASSERT_EQ(OK, ReadTransaction(&trans1, &response_data));
   EXPECT_EQ("hello!", response_data);
 
   // Preload www.gmail.com into HostCache.
   HostPortPair host_port("www.gmail.com", 443);
   HostResolver::RequestInfo resolve_info(host_port);
   AddressList ignored;
   host_resolver.Resolve(resolve_info, &ignored, NULL, NULL, BoundNetLog());
 
-  IPPoolingPreloadHostCache(&host_resolver, &pool_peer);
+  // MockHostResolver returns 127.0.0.1, port 443 for https://www.google.com/
+  // and https://www.gmail.com/. Add 127.0.0.1 as alias for host_port_pair:
+  // (www.google.com, 443).
+  IPPoolingAddAlias(&host_resolver, &pool_peer, "www.google.com", 443,
+                    "127.0.0.1");
 
   HttpRequestInfo request2;
   request2.method = "GET";
   request2.url = GURL("https://www.gmail.com/");
   request2.load_flags = 0;
   HttpNetworkTransaction trans2(session);
 
   rv = trans2.Start(&request2, &callback, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
@@ skipping 133 matching lines @@
   HostResolver::RequestInfo resolve_info(HostPortPair("www.gmail.com", 443));
   AddressList ignored;
   host_resolver.Resolve(resolve_info, &ignored, NULL, NULL, BoundNetLog());
 
   HttpRequestInfo request2;
   request2.method = "GET";
   request2.url = GURL("https://www.gmail.com/");
   request2.load_flags = 0;
   HttpNetworkTransaction trans2(session);
 
-  IPPoolingPreloadHostCache(host_resolver.GetMockHostResolver(), &pool_peer);
+  // MockHostResolver returns 127.0.0.1, port 443 for https://www.google.com/
+  // and https://www.gmail.com/. Add 127.0.0.1 as alias for host_port_pair:
+  // (www.google.com, 443).
+  IPPoolingAddAlias(host_resolver.GetMockHostResolver(), &pool_peer,
+                    "www.google.com", 443, "127.0.0.1");
 
   rv = trans2.Start(&request2, &callback, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, callback.WaitForResult());
 
   response = trans2.GetResponseInfo();
   ASSERT_TRUE(response != NULL);
   ASSERT_TRUE(response->headers != NULL);
   EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
   EXPECT_TRUE(response->was_fetched_via_spdy);
   EXPECT_TRUE(response->was_npn_negotiated);
   ASSERT_EQ(OK, ReadTransaction(&trans2, &response_data));
   EXPECT_EQ("hello!", response_data);
 
   HttpStreamFactory::set_next_protos("");
   HttpStreamFactory::set_use_alternate_protocols(false);
 }
 
 }  // namespace net