HTTP2 draft 14 support

net/spdy/spdy_test_utils.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/spdy/spdy_test_utils.h"
 
 #include <cstring>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 73 matching lines @@
       << "\nActual:\n"
       << HexDumpWithMarks(actual, actual_len, marks.get(), max_len);
 }
 
 void SetFrameFlags(SpdyFrame* frame,
                    uint8 flags,
                    SpdyMajorVersion spdy_version) {
   switch (spdy_version) {
     case SPDY2:
     case SPDY3:
-      frame->data()[4] = flags;
-      break;
     case SPDY4:
     case SPDY5:
-      frame->data()[3] = flags;
+      frame->data()[4] = flags;
       break;
     default:
       LOG(FATAL) << "Unsupported SPDY version.";
   }
 }
 
 void SetFrameLength(SpdyFrame* frame,
                     size_t length,
                     SpdyMajorVersion spdy_version) {
   switch (spdy_version) {
     case SPDY2:
     case SPDY3:
       CHECK_EQ(0u, length & ~kLengthMask);
       {
         int32 wire_length = base::HostToNet32(length);
         // The length field in SPDY 2 and 3 is a 24-bit (3B) integer starting at
         // offset 5.
         memcpy(frame->data() + 5, reinterpret_cast<char*>(&wire_length) + 1, 3);
       }
       break;
     case SPDY4:
     case SPDY5:
       CHECK_GT(1u<<14, length);
       {
-        int32 wire_length = base::HostToNet16(static_cast<uint16>(length));
+        int32 wire_length = base::HostToNet32(length);
         memcpy(frame->data(),
-               reinterpret_cast<char*>(&wire_length),
-               sizeof(uint16));
+               reinterpret_cast<char*>(&wire_length) + 1,
+               3);
       }
       break;
     default:
       LOG(FATAL) << "Unsupported SPDY version.";
   }
 }
 
 std::string a2b_hex(const char* hex_data) {
   std::vector<uint8> output;
   std::string result;
   if (base::HexStringToBytes(hex_data, &output))
     result.assign(reinterpret_cast<const char*>(&output[0]), output.size());
   return result;
 }
 
 }  // namespace test
 
 }  // namespace net