Move a number of static variables SPDY to HttpNetworkSession::Params.

net/spdy/spdy_session_pool.h

 // Copyright (c) 2012 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_
 
 #include <map>
 #include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/cert_database.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/ssl_config_service.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_server.h"
+#include "net/socket/next_proto.h"
 
 namespace net {
 
 class AddressList;
 class BoundNetLog;
 class ClientSocketHandle;
 class HostResolver;
 class HttpServerProperties;
 class SpdySession;
 
 namespace test_spdy2 {
 class SpdySessionPoolPeer;
 }  // namespace test_spdy
 
 namespace test_spdy3 {
 class SpdySessionPoolPeer;
 }  // namespace test_spdy
 
 // This is a very simple pool for open SpdySessions.
 class NET_EXPORT SpdySessionPool
     : public NetworkChangeNotifier::IPAddressObserver,
       public SSLConfigService::Observer,
       public CertDatabase::Observer {
  public:
+  typedef base::TimeTicks (*TimeFunc)(void);
+
   SpdySessionPool(HostResolver* host_resolver,
                   SSLConfigService* ssl_config_service,
                   HttpServerProperties* http_server_properties,
+                  size_t max_sessions_per_domain,
+                  bool force_single_domain,
+                  bool enable_ip_pooling,
+                  bool enable_credential_frames,
+                  bool enable_compression,
+                  bool enable_ping_based_connection_checking,
+                  NextProto default_protocol,
+                  size_t default_initial_recv_window_size,
+                  size_t initial_max_concurrent_streams,
+                  size_t max_concurrent_streams_limit,
+                  SpdySessionPool::TimeFunc time_func,
                   const std::string& trusted_spdy_proxy);
   virtual ~SpdySessionPool();
 
   // Either returns an existing SpdySession or creates a new SpdySession for
   // use.
   scoped_refptr<SpdySession> Get(
       const HostPortProxyPair& host_port_proxy_pair,
       const BoundNetLog& net_log);
 
   // Only returns a SpdySession if it already exists.
   scoped_refptr<SpdySession> GetIfExists(
       const HostPortProxyPair& host_port_proxy_pair,
       const BoundNetLog& net_log);
 
-  // Set the maximum concurrent sessions per domain.
-  static void set_max_sessions_per_domain(int max) {
-    if (max >= 1)
-      g_max_sessions_per_domain = max;
-  }
-
   // Builds a SpdySession from an existing SSL socket.  Users should try
   // calling Get() first to use an existing SpdySession so we don't get
   // multiple SpdySessions per domain.  Note that ownership of |connection| is
   // transferred from the caller to the SpdySession.
   // |certificate_error_code| is used to indicate the certificate error
   // encountered when connecting the SSL socket.  OK means there was no error.
   // For testing, setting is_secure to false allows Spdy to connect with a
   // pre-existing TCP socket.
   // Returns OK on success, and the |spdy_session| will be provided.
   // Returns an error on failure, and |spdy_session| will be NULL.
@@ skipping 38 matching lines @@
   // We flush all idle sessions and release references to the active ones so
   // they won't get re-used.  The active ones will either complete successfully
   // or error out due to the IP address change.
   virtual void OnIPAddressChanged() OVERRIDE;
 
   // SSLConfigService::Observer methods:
 
   // We perform the same flushing as described above when SSL settings change.
   virtual void OnSSLConfigChanged() OVERRIDE;
 
-  // A debugging mode where we compress all accesses through a single domain.
-  static void ForceSingleDomain() { g_force_single_domain = true; }
-
-  // Controls whether the pool allows use of a common session for domains
-  // which share IP address resolutions.
-  static void enable_ip_pooling(bool value) { g_enable_ip_pooling = value; }
-
   // CertDatabase::Observer methods:
   virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE;
   virtual void OnCertTrustChanged(const X509Certificate* cert) OVERRIDE;
 
  private:
   friend class test_spdy2::SpdySessionPoolPeer;  // For testing.
   friend class test_spdy3::SpdySessionPoolPeer;  // For testing.
   friend class SpdyNetworkTransactionSpdy2Test;  // For testing.
   friend class SpdyNetworkTransactionSpdy3Test;  // For testing.
   FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionSpdy2Test,
@@ skipping 44 matching lines @@
   bool RemoveFromSessionList(const scoped_refptr<SpdySession>& session,
                              const HostPortProxyPair& pair);
 
   HttpServerProperties* const http_server_properties_;
 
   // 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_;
 
   bool enable_sending_initial_settings_;
 
+  size_t max_sessions_per_domain_;
+

[willchan no longer on Chromium, 2012/12/01 20:49:13]

I try to avoid nitting on stuff like this, but all the vertical whitespace
bothers me. If you don't feel strongly, can you eliminate them? If you do, then
keep them :)

[Ryan Hamilton, 2012/12/01 23:02:25]

Done.

+  bool force_single_domain_;
+
+  bool enable_ip_pooling_;
+
+  bool enable_credential_frames_;
+
+  bool enable_compression_;
+
+  bool enable_ping_based_connection_checking_;
+
+  NextProto default_protocol_;
+
+  size_t initial_recv_window_size_;
+
+  size_t initial_max_concurrent_streams_;
+
+  size_t max_concurrent_streams_limit_;
+
+  SpdySessionPool::TimeFunc time_func_;

[willchan no longer on Chromium, 2012/12/01 20:49:13]

No need for SpdySessionPool::

[Ryan Hamilton, 2012/12/01 23:02:25]

Done.

+
   // This SPDY proxy is allowed to push resources from origins that are
   // different from those of their associated streams.
   HostPortPair trusted_spdy_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_