Independently enable SPDY versions from field trial.

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 0da6e86de6fc096f37a34eba22ba6a265fd1e4cf..60dcd3a4f35103b613e51d97459e0f3c39422b2e 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -286,12 +286,14 @@ class IOThread : public content::BrowserThreadDelegate {
   //   "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);
+  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 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.