[SPDY] Add flag and about:flags entry for SPDY/4 alpha 1

BUG=230124

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

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

5 files changed, 19 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 0c1177e..d613ca13 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6668,6 +6668,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_SPDY31_DESCRIPTION" desc="Description for the flag to enable SPDY/3.1.">
         Enable experimental SPDY/3.1.
       </message>
+      <message name="IDS_FLAGS_ENABLE_SPDY4A1_NAME" desc="Title for the flag to enable SPDY/4 alpha 1">
+        Enable SPDY/4 alpha 1
+      </message>
+      <message name="IDS_FLAGS_ENABLE_SPDY4A1_DESCRIPTION" desc="Description for the flag to enable SPDY/4 alpha 1.">
+        Enable experimental SPDY/4 alpha 1. Note that this also enables SPDY/3.1.
+      </message>
       <message name="IDS_FLAGS_ENABLE_ASYNC_DNS_NAME" desc="Title for the flag to enable asynchronous DNS client.">
         Built-in Asynchronous DNS
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 185883a..724937f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -662,6 +662,13 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableSpdy31)
   },
   {
+    "enable-spdy4a1",
+    IDS_FLAGS_ENABLE_SPDY4A1_NAME,
+    IDS_FLAGS_ENABLE_SPDY4A1_DESCRIPTION,
+    kOsAll,
+    SINGLE_VALUE_TYPE(switches::kEnableSpdy4a1)
+  },
+  {
     "enable-async-dns",
     IDS_FLAGS_ENABLE_ASYNC_DNS_NAME,
     IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION,
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 503d303..77e7674 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -659,6 +659,8 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) {
     std::string spdy_mode =
         command_line.GetSwitchValueASCII(switches::kUseSpdy);
     EnableSpdy(spdy_mode);
+  } else if (command_line.HasSwitch(switches::kEnableSpdy4a1)) {
+    net::HttpStreamFactory::EnableNpnSpdy4a1();
   } else if (command_line.HasSwitch(switches::kEnableSpdy31)) {
     net::HttpStreamFactory::EnableNpnSpdy31();
   } else if (command_line.HasSwitch(switches::kEnableNpn)) {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 8993c39..e0db12f 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -629,6 +629,9 @@ const char kEnableSdch[]                    = "enable-sdch";
 // Enable SPDY/3.1. This is a temporary testing flag.
 const char kEnableSpdy31[]                  = "enable-spdy31";
 
+// Enable SPDY/4 alpha 1. This is a temporary testing flag.
+const char kEnableSpdy4a1[]                 = "enable-spdy4a1";
+
 // Enable SPDY CREDENTIAL frame support.  This is a temporary testing flag.
 const char kEnableSpdyCredentialFrames[]    = "enable-spdy-credential-frames";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 9d14564..935c89f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -179,6 +179,7 @@ extern const char kEnableQuic[];
 extern const char kEnableResourceContentSettings[];
 extern const char kEnableSdch[];
 extern const char kEnableSpdy31[];
+extern const char kEnableSpdy4a1[];
 extern const char kEnableSpdyCredentialFrames[];
 extern const char kEnableSpellingAutoCorrect[];
 extern const char kEnableStackedTabStrip[];