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 268 matching lines @@
   //   "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);
+  static void EnableSpdy(const std::string& mode, IOThread::Globals* globals);

[Ryan Hamilton, 2015/03/20 23:38:07]

Hm. This method doesn't actually "enable spdy", rather it sets up the spdy
globals, right? Sounds like the same thing the method below does. I think we
need a better name.

[Bence, 2015/03/23 14:19:13]

Done.

 
-  // 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.
+  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 169 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_