[SPDY] Incorporate latest framing changes from HTTP2 into SPDY 4 as SPDY 4a2.

net/http/http_stream_factory.cc

Index: net/http/http_stream_factory.cc
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index 8432fb64083d353d076c56149bb9eb075ab3c6c8..eeba46b6fa927116c371c2a94e3a5dcebb35c2a0 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -180,14 +180,14 @@ void HttpStreamFactory::EnableNpnSpdy31() {
 }
 
 // static
-void HttpStreamFactory::EnableNpnSpdy4a1() {
+void HttpStreamFactory::EnableNpnSpdy4a2() {
   set_use_alternate_protocols(true);
   std::vector<std::string> next_protos;
   next_protos.push_back("http/1.1");
   next_protos.push_back("spdy/2");
   next_protos.push_back("spdy/3");
   next_protos.push_back("spdy/3.1");
-  next_protos.push_back("spdy/4a1");
+  next_protos.push_back("spdy/4a2");

[Ryan Hamilton, 2013/05/08 22:15:50]

I think I might be more inclined to comment out this line until we get test
coverage.  Or, to remove the --enable-spdy4 flag altogether.

[akalin, 2013/05/15 00:16:08]

Done.

   SetNextProtos(next_protos);
 }
 
@@ -212,8 +212,8 @@ void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) {
       enabled_protocols_[NPN_SPDY_3] = true;
     } else if (value[i] == "spdy/3.1") {
       enabled_protocols_[NPN_SPDY_3_1] = true;
-    } else if (value[i] == "spdy/4a1") {
-      enabled_protocols_[NPN_SPDY_4a1] = true;
+    } else if (value[i] == "spdy/4a2") {
+      enabled_protocols_[NPN_SPDY_4A2] = true;
     } else if (value[i] == "quic") {
       enabled_protocols_[QUIC] = true;
     }