[SPDY] Reenable SPDY/2 for M32

chrome/browser/io_thread.cc

 // 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.
 
 #include "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 715 matching lines @@
     if (command_line.HasSwitch(switches::kUseSpdy)) {
       std::string spdy_mode =
           command_line.GetSwitchValueASCII(switches::kUseSpdy);
       EnableSpdy(spdy_mode);
     } else if (command_line.HasSwitch(switches::kEnableHttp2Draft04)) {
       net::HttpStreamFactory::EnableNpnHttp2Draft04();
     } else if (command_line.HasSwitch(switches::kEnableSpdy4a2)) {
       net::HttpStreamFactory::EnableNpnSpdy4a2();
     } else if (command_line.HasSwitch(switches::kDisableSpdy31)) {
       net::HttpStreamFactory::EnableNpnSpdy3();
-    } else if (command_line.HasSwitch(switches::kEnableSpdy2)) {
-      net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2();
+    } else if (command_line.HasSwitch(switches::kDisableSpdy2)) {
+      net::HttpStreamFactory::EnableNpnSpdy31();
     } else if (command_line.HasSwitch(switches::kEnableNpnHttpOnly)) {
       net::HttpStreamFactory::EnableNpnHttpOnly();
     } else {
       if (spdy_trial_group == kSpdyFieldTrialDisabledGroupName &&
           !command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) {
          net::HttpStreamFactory::set_spdy_enabled(false);
       } else {
         // Use SPDY/3.1 by default.
-        net::HttpStreamFactory::EnableNpnSpdy31();
+        //
+        // TODO(akalin): Turn off SPDY/2 by default
+        // (http://crbug.com/318651).
+        net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2();
       }
     }
   }
 
   // TODO(rch): Make the client socket factory a per-network session
   // instance, constructed from a NetworkSession::Params, to allow us
   // to move this option to IOThread::Globals &
   // HttpNetworkSession::Params.
   if (command_line.HasSwitch(switches::kEnableTcpFastOpen))
     net::SetTCPFastOpenEnabled(true);
@@ skipping 271 matching lines @@
   if (command_line.HasSwitch(switches::kDisableQuicHttps))
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuicHttps))
     return true;
 
   // HTTPS over QUIC should only be enabled if we are in the https
   // field trial group.
   return quic_trial_group == kQuicFieldTrialHttpsEnabledGroupName;
 }