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

net/spdy/spdy_test_util_common.cc

 // Copyright (c) 2013 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/spdy/spdy_test_util_common.h"
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
@@ skipping 499 matching lines @@
   pool_->enable_sending_initial_settings_ = enabled;
 }
 
 NextProto NextProtoFromSpdyVersion(int spdy_version) {
   switch (spdy_version) {
   case kSpdyVersion2:
     return kProtoSPDY2;
   case kSpdyVersion3:
     return kProtoSPDY3;
   case kSpdyVersion4:
-    return kProtoSPDY4a1;
+    return kProtoSPDY4a2;
   default:
     NOTREACHED();
     return kProtoUnknown;
   }
 }
 
 int SpdyVersionFromNextProto(NextProto next_proto) {
   switch (next_proto) {
   case kProtoSPDY2:
   case kProtoSPDY21:
     return kSpdyVersion2;
   case kProtoSPDY3:
   case kProtoSPDY31:
     return kSpdyVersion3;
-  case kProtoSPDY4a1:
+  case kProtoSPDY4a2:
     return kSpdyVersion4;
   default:
     NOTREACHED();
     return 0;
   }
 }
 
 SpdyTestUtil::SpdyTestUtil(NextProto protocol)
     : protocol_(protocol),
       spdy_version_(SpdyVersionFromNextProto(protocol)) {
@@ skipping 113 matching lines @@
     DATA_FLAG_NONE
   };
   scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock());
   AppendToHeaderBlock(extra_headers, extra_header_count, headers.get());
   if (kHeaders && kHeadersSize)
     AppendToHeaderBlock(kHeaders, kHeadersSize / 2, headers.get());
   return ConstructSpdyFrame(kSynStartHeader, headers.Pass());
 }
 
 }  // namespace net