[SPDY] Reenable SPDY/2 for M32

This will be merged to the M32 branch and then reverted on trunk.

BUG=318651
R=jam@chromium.org, rch@chromium.org

Review URL: https://codereview.chromium.org/71383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234959 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 12 deletions

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index d72cefc..42645ea 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -733,8 +733,8 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) {
       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 {
@@ -743,7 +743,10 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) {
          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();
       }
     }
   }
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index edf351e..4a8a9c1 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -424,6 +424,13 @@ const char kDisableRestoreSessionState[]    = "disable-restore-session-state";
 const char kDisableScriptedPrintThrottling[] =
     "disable-scripted-print-throttling";
 
+// Disable SPDY/2. This is a temporary testing flag. See
+// http://crbug.com/303957 .
+const char kDisableSpdy2[]                  = "disable-spdy2";
+
+// Disable SPDY/3.1. This is a temporary testing flag.
+const char kDisableSpdy31[]                 = "disable-spdy31";
+
 // Disables syncing browser data to a Google Account.
 const char kDisableSync[]                   = "disable-sync";
 
@@ -740,13 +747,6 @@ const char kEnableStickyKeys[]              = "enable-sticky-keys";
 // Disables support of sticky keys.
 const char kDisableStickyKeys[]              = "disable-sticky-keys";
 
-// Enable SPDY/2. This is a temporary testing flag. See
-// http://crbug.com/303957 .
-const char kEnableSpdy2[]                   = "enable-spdy2";
-
-// Disable SPDY/3.1. This is a temporary testing flag.
-const char kDisableSpdy31[]                 = "disable-spdy31";
-
 // Enable SPDY/4 alpha 2. This is a temporary testing flag.
 const char kEnableSpdy4a2[]                 = "enable-spdy4a2";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 811df50..30e708e 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -128,6 +128,7 @@ extern const char kDisableQuicHttps[];
 extern const char kDisableRestoreBackgroundContents[];
 extern const char kDisableRestoreSessionState[];
 extern const char kDisableScriptedPrintThrottling[];
+extern const char kDisableSpdy2[];
 extern const char kDisableSpdy31[];
 extern const char kDisableSync[];
 extern const char kDisableSyncAppSettings[];
@@ -211,8 +212,6 @@ extern const char kEnableSavePasswordBubble[];
 extern const char kEnableSdch[];
 extern const char kEnableStickyKeys[];
 extern const char kDisableStickyKeys[];
-extern const char kEnableSpdy2[];
-extern const char kDisableSpdy31[];
 extern const char kEnableSpdy4a2[];
 extern const char kEnableSpellingAutoCorrect[];
 extern const char kEnableSpellingServiceFeedback[];