SPDY & HPACK: Land recent internal changes (through 65328503)

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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 65 matching lines @@
   if (identical) return;
   ADD_FAILURE()
       << "Description:\n"
       << description
       << "\n\nExpected:\n"
       << HexDumpWithMarks(expected, expected_len, marks.get(), max_len)
       << "\nActual:\n"
       << HexDumpWithMarks(actual, actual_len, marks.get(), max_len);
 }
 
-void SetFrameFlags(SpdyFrame* frame, uint8 flags, int spdy_version) {
+void SetFrameFlags(SpdyFrame* frame,
+                   uint8 flags,
+                   SpdyMajorVersion spdy_version) {
   switch (spdy_version) {
-    case 2:
-    case 3:
+    case SPDY2:
+    case SPDY3:
       frame->data()[4] = flags;
       break;
-    case 4:
+    case SPDY4:
+    case SPDY5:
       frame->data()[3] = flags;
       break;
     default:
       LOG(FATAL) << "Unsupported SPDY version.";
   }
 }
 
-void SetFrameLength(SpdyFrame* frame, size_t length, int spdy_version) {
+void SetFrameLength(SpdyFrame* frame,
+                    size_t length,
+                    SpdyMajorVersion spdy_version) {
   switch (spdy_version) {
-    case 2:
-    case 3:
+    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 4:
+    case SPDY4:
+    case SPDY5:
       CHECK_GT(1u<<14, length);
       {
         int32 wire_length = base::HostToNet16(static_cast<uint16>(length));
         memcpy(frame->data(),
                reinterpret_cast<char*>(&wire_length),
                sizeof(uint16));
       }
       break;
     default:
       LOG(FATAL) << "Unsupported SPDY version.";
   }
 }
 
 
 }  // namespace test
 
 }  // namespace net