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

net/http/http_stream_factory.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_H_
 
 #include <list>
 #include <string>
 #include <vector>
@@ skipping 228 matching lines @@
   // supported via NPN.
   static void EnableNpnSpdy();
 
   // Sets http/1.1, spdy/2, and spdy/3 as the protocols supported via NPN.
   static void EnableNpnSpdy3();
 
   // Sets http/1.1, spdy/2, spdy/3, and spdy/3.1 as the protocols
   // supported via NPN.
   static void EnableNpnSpdy31();
 
-  // Sets http/1.1, spdy/2, spdy/3, spdy/3.1, and spdy/4a1 as the
+  // Sets http/1.1, spdy/2, spdy/3, spdy/3.1, and spdy/4a2 as the
   // protocols supported via NPN.
-  static void EnableNpnSpdy4a1();
+  static void EnableNpnSpdy4a2();

[Ryan Hamilton, 2013/05/15 18:32:48]

Totally your cal.  I'm happy for you to keep this method around, and just not
called (Because you removed the option).  But either way.

[akalin, 2013/05/15 18:50:00]

Meh, I can always resurrect it from source control. I like keeping dead code
out. :)

 
   // Sets the protocols supported by NPN (next protocol negotiation) during the
   // SSL handshake as well as by HTTP Alternate-Protocol.
   static void SetNextProtos(const std::vector<std::string>& value);
   static bool has_next_protos() { return next_protos_ != NULL; }
   static const std::vector<std::string>& next_protos() {
     return *next_protos_;
   }
 
  protected:
   HttpStreamFactory();
 
  private:
   static std::vector<std::string>* next_protos_;
   static bool enabled_protocols_[NUM_ALTERNATE_PROTOCOLS];
   static bool spdy_enabled_;
   static bool use_alternate_protocols_;
   static bool force_spdy_over_ssl_;
   static bool force_spdy_always_;
   static std::list<HostPortPair>* forced_spdy_exclusions_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_H_