[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..05114ba6a15cd5c51fc52239e8a07e25caa589a4 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -180,18 +180,6 @@ void HttpStreamFactory::EnableNpnSpdy31() {
 }
 
 // static
-void HttpStreamFactory::EnableNpnSpdy4a1() {
-  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");
-  SetNextProtos(next_protos);
-}
-
-// static
 void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) {
   if (!next_protos_)
     next_protos_ = new std::vector<std::string>;
@@ -212,8 +200,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;
     }