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

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 112 matching lines @@
   // which share IP address resolutions.
   static void enable_ip_pooling(bool value) { g_enable_ip_pooling = value; }
 
   // CertDatabase::Observer methods:
   virtual void OnUserCertAdded(const X509Certificate* cert);
   virtual void OnCertTrustChanged(const X509Certificate* cert);
 
  private:
   friend class SpdySessionPoolPeer;  // For testing.
   friend class SpdyNetworkTransactionTest;  // For testing.
+  friend class SpdySessionTest;  // For testing.

[willchan no longer on Chromium, 2011/07/17 01:23:45]

Rather than add all of these friends, can you just use the SpdySessionPoolPeer?
That's the friended class that you can change to expose whatever functionality
you want. That way we don't need to add all these ugly/fragile FRIEND_TEST
macros.

[ramant (doing other things), 2011/07/17 08:12:30]

Done.

   FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, WindowUpdateOverflow);
+  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GoAway);
+  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, OnSettings);
+  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, CancelPendingCreateStream);
+  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SendSettingsOnNewSession);
+  FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, IPPoolingTest);
+  FRIEND_TEST_ALL_PREFIXES(SSLClientSocketPoolTest, IPPooling);
 
   typedef std::list<scoped_refptr<SpdySession> > SpdySessionList;
   typedef std::map<HostPortProxyPair, SpdySessionList*> SpdySessionsMap;
   typedef std::map<IPEndPoint, HostPortProxyPair> SpdyAliasMap;
 
 
   scoped_refptr<SpdySession> GetInternal(
       const HostPortProxyPair& host_port_proxy_pair,
       const BoundNetLog& net_log,
       bool only_use_existing_sessions);
@@ skipping 12 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 the addresses from LookupAddresses for |pair| as IP-equivalent
+  // addresses for |pair|. Used by unit tests only.

[willchan no longer on Chromium, 2011/07/17 01:23:45]

This seems a bit weird, since for LookupAddresses(), that means we'd have to
pre-populate the HostCache in the test. I suggest just allowing AddAlias() to
add whatever value. Perhaps you should rename this to AddAlias(const IPEndPoint&
endpoint, const HostPortProxyPair& pair);

[ramant (doing other things), 2011/07/17 08:12:30]

Done.

+  void AddAliases(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* const resolver_;
 
   // Defaults to true. May be controlled via SpdySessionPoolPeer for tests.
   bool verify_domain_authentication_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_