Independently enable SPDY versions from field trial.

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 <vector>
 
@@ skipping 253 matching lines @@
       net::HttpNetworkSession::Params* params);
 
   void InitializeNetworkOptions(const base::CommandLine& parsed_command_line);
 
   // Sets up TCP FastOpen if enabled via field trials or via the command line.
   void ConfigureTCPFastOpen(const base::CommandLine& command_line);
 
   // Sets up SDCH based on field trials.
   void ConfigureSdch();
 
-  // Enable SPDY with the given mode, which may contain the following:
-  //
-  //   "off"                      : Disables SPDY support entirely.
-  //   "ssl"                      : Forces SPDY for all HTTPS requests.
-  //   "no-ssl"                   : Forces SPDY for all HTTP requests.
-  //   "no-ping"                  : Disables SPDY ping connection testing.
-  //   "exclude=<host>"           : Disables SPDY support for the host <host>.
-  //   "no-compress"              : Disables SPDY header compression.
-  //   "no-alt-protocols          : Disables alternate protocol support.
-  //   "force-alt-protocols       : Forces an alternate protocol of SPDY/3
-  //                                on port 443.
-  //   "single-domain"            : Forces all spdy traffic to a single domain.
-  //   "init-max-streams=<limit>" : Specifies the maximum number of concurrent
-  //                                streams for a SPDY session, unless the
-  //                                specifies a different value via SETTINGS.
-  void EnableSpdy(const std::string& mode);
-
-  // Configures available SPDY protocol versions from the given trial.
-  // Used only if no command-line configuration was present.
-  static void ConfigureSpdyFromTrial(base::StringPiece spdy_trial_group,
-                                     Globals* globals);
+  // Configures available SPDY protocol versions in |globals| based on the flags
+  // in |command_lin| as well as SPDY field trial group and parameters.  Must be
+  // called after ConfigureQuicGlobals.
+  static void ConfigureSpdyGlobals(const base::CommandLine& command_line,
+                                   base::StringPiece quic_trial_group,
+                                   const VariationParameters& quic_trial_params,
+                                   Globals* globals);
 
   // Global state must be initialized on the IO thread, then this
   // method must be invoked on the UI thread.
   void InitSystemRequestContext();
 
   // Lazy initialization of system request context for
   // SystemURLRequestContextGetter. To be called on IO thread only
   // after global state has been initialized on the IO thread, and
   // SystemRequestContext state has been initialized on the UI thread.
   void InitSystemRequestContextOnIOThread();
@@ skipping 13 matching lines @@
   void ConfigureQuic(const base::CommandLine& command_line);
 
   extensions::EventRouterForwarder* extension_event_router_forwarder() {
 #if defined(ENABLE_EXTENSIONS)
     return extension_event_router_forwarder_;
 #else
     return NULL;
 #endif
   }
   // Configures QUIC options in |globals| based on the flags in |command_line|
-  // as well as the QUIC field trial group and parameters.
+  // as well as the QUIC field trial group and parameters.  Must be called
+  // before ConfigureSpdyGlobals.
   static void ConfigureQuicGlobals(
       const base::CommandLine& command_line,
       base::StringPiece quic_trial_group,
       const VariationParameters& quic_trial_params,
       Globals* globals);
 
   // Returns true if QUIC should be enabled, either as a result
   // of a field trial or a command line flag.
   static bool ShouldEnableQuic(
       const base::CommandLine& command_line,
@@ skipping 135 matching lines @@
   bool is_spdy_disabled_by_policy_;
 
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_