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

net/http/http_stream_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "googleurl/src/gurl.h"
@@ skipping 162 matching lines @@
   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");
   SetNextProtos(next_protos);
 }
 
 // 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);
 }
 
 // static
 void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) {
   if (!next_protos_)
     next_protos_ = new std::vector<std::string>;
 
   *next_protos_ = value;
 
   for (uint32 i = 0; i < NUM_ALTERNATE_PROTOCOLS; ++i)
     enabled_protocols_[i] = false;
 
   // TODO(rtenneti): bug 116575 - consider using same strings/enums for SPDY
   // versions in next_protos and kAlternateProtocolStrings.
   for (uint32 i = 0; i < value.size(); ++i) {
     if (value[i] == "spdy/1") {
       enabled_protocols_[NPN_SPDY_1] = true;
     } else if (value[i] == "spdy/2") {
       enabled_protocols_[NPN_SPDY_2] = true;
     } else if (value[i] == "spdy/3") {
       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;
     }
   }
   // TODO(rch): Remove all support for spdy/1.
   enabled_protocols_[NPN_SPDY_1] = false;
 }
 
 HttpStreamFactory::HttpStreamFactory() {}
 
 }  // namespace net