Revert 234959 "[SPDY] Reenable SPDY/2 for M32"

trunk/src/chrome/browser/io_thread.cc

Index: trunk/src/chrome/browser/io_thread.cc
===================================================================
--- trunk/src/chrome/browser/io_thread.cc	(revision 235897)
+++ trunk/src/chrome/browser/io_thread.cc	(working copy)
@@ -733,8 +733,8 @@
       net::HttpStreamFactory::EnableNpnSpdy4a2();
     } else if (command_line.HasSwitch(switches::kDisableSpdy31)) {
       net::HttpStreamFactory::EnableNpnSpdy3();
-    } else if (command_line.HasSwitch(switches::kDisableSpdy2)) {
-      net::HttpStreamFactory::EnableNpnSpdy31();
+    } else if (command_line.HasSwitch(switches::kEnableSpdy2)) {
+      net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2();
     } else if (command_line.HasSwitch(switches::kEnableNpnHttpOnly)) {
       net::HttpStreamFactory::EnableNpnHttpOnly();
     } else {
@@ -743,10 +743,7 @@
          net::HttpStreamFactory::set_spdy_enabled(false);
       } else {
         // Use SPDY/3.1 by default.
-        //
-        // TODO(akalin): Turn off SPDY/2 by default
-        // (http://crbug.com/318651).
-        net::HttpStreamFactory::EnableNpnSpdy31WithSpdy2();
+        net::HttpStreamFactory::EnableNpnSpdy31();
       }
     }
   }