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

net/spdy/spdy_session_pool.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_SESSION_POOL_H_
 #define NET_SPDY_SPDY_SESSION_POOL_H_
 #pragma once
 
 #include <map>
 #include <list>
@@ skipping 145 matching lines @@
       const HostPortProxyPair& host_port_proxy_pair);
   SpdySessionList* GetSessionList(
       const HostPortProxyPair& host_port_proxy_pair) const;
   void RemoveSessionList(const HostPortProxyPair& host_port_proxy_pair);
 
   // Does a DNS cache lookup for |pair|, and returns the |addresses| found.
   // Returns true if addresses found, false otherwise.
   bool LookupAddresses(const HostPortProxyPair& pair,
                        AddressList* addresses) const;
 
-  // Add a set of |addresses| as IP-equivalent addresses for |pair|.
-  void AddAliases(const AddressList& addresses, const HostPortProxyPair& pair);
+  // Add |endpoint| as an IP-equivalent address for |pair|.
+  void AddAlias(const addrinfo* address, const HostPortProxyPair& pair);
 
   // Remove all aliases for |pair| from the aliases table.
   void RemoveAliases(const HostPortProxyPair& pair);
 
   SpdySettingsStorage spdy_settings_;
 
   // This is our weak session pool - one session per domain.
   SpdySessionsMap sessions_;
   // A map of IPEndPoint aliases for sessions.
   SpdyAliasMap aliases_;
 
   static size_t g_max_sessions_per_domain;
   static bool g_force_single_domain;
   static bool g_enable_ip_pooling;
 
   const scoped_refptr<SSLConfigService> ssl_config_service_;
   HostResolver* resolver_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_