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

chrome/browser/io_thread.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 CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "net/base/network_change_notifier.h"
+#include "net/socket/next_proto.h"
 
 class ChromeNetLog;
 class CommandLine;
 class PrefProxyConfigTrackerImpl;
 class PrefService;
 class SystemURLRequestContextGetter;
 
 namespace chrome_browser_net {
 class DnsProbeService;
 class HttpPipeliningCompatibilityClient;
@@ skipping 32 matching lines @@
 }  // namespace policy
 
 // Contains state associated with, initialized and cleaned up on, and
 // primarily used on, the IO thread.
 //
 // If you are looking to interact with the IO thread (e.g. post tasks
 // to it or check if it is the current thread), see
 // content::BrowserThread.
 class IOThread : public content::BrowserThreadDelegate {
  public:
+  enum OptionalBoolean {
+    DEFAULT,
+    TRUE,
+    FALSE,
+  };

[Nico, 2012/12/02 03:54:23]

Ugh. Do we have an optional<> template somewhere? If not, can you add a small
nexted optional<> class here?

[Ryan Hamilton, 2012/12/03 23:04:12]

Done.

   struct Globals {
     class SystemRequestContextLeakChecker {
      public:
       explicit SystemRequestContextLeakChecker(Globals* globals);
       ~SystemRequestContextLeakChecker();
 
      private:
       Globals* const globals_;
     };
 
@@ skipping 38 matching lines @@
         extension_event_router_forwarder;
     scoped_ptr<chrome_browser_net::HttpPipeliningCompatibilityClient>
         http_pipelining_compatibility_client;
     scoped_ptr<chrome_browser_net::LoadTimeStats> load_time_stats;
     scoped_ptr<net::HostMappingRules> host_mapping_rules;
     scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
     bool ignore_certificate_errors;
     bool http_pipelining_enabled;
     uint16 testing_fixed_http_port;
     uint16 testing_fixed_https_port;
+    int max_spdy_sessions_per_domain;
+    size_t initial_max_spdy_concurrent_streams;
+    size_t max_spdy_concurrent_streams_limit;
+    OptionalBoolean force_spdy_single_domain;
+    OptionalBoolean enable_spdy_ip_pooling;
+    OptionalBoolean enable_spdy_credential_frames;
+    OptionalBoolean enable_spdy_compression;
+    OptionalBoolean enable_spdy_ping_based_connection_checking;
+    net::NextProto spdy_default_protocol;
     // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
     // main frame load fails with a DNS error in order to provide more useful
     // information to the renderer so it can show a more specific error page.
     scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service;
   };
 
   // |net_log| must either outlive the IOThread or be NULL.
   IOThread(PrefService* local_state,
            policy::PolicyService* policy_service,
            ChromeNetLog* net_log,
@@ skipping 121 matching lines @@
 
   // True if SPDY is disabled by policy.
   bool is_spdy_disabled_by_policy_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_