Land Recent QUIC Changes

net/quic/quic_protocol.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/quic/quic_protocol.h"
 #include "base/stl_util.h"
 
 using base::StringPiece;
 using std::map;
 using std::numeric_limits;
@@ skipping 15 matching lines @@
 
 size_t GetStartOfFecProtectedData(bool include_version) {
   return GetPacketHeaderSize(include_version);
 }
 
 size_t GetStartOfEncryptedData(bool include_version) {
   return GetPacketHeaderSize(include_version) - kPrivateFlagsSize -
       kFecGroupSize;
 }
 
+uint32 MakeQuicTag(char a, char b, char c, char d) {
+  return static_cast<uint32>(a) |
+         static_cast<uint32>(b) << 8 |
+         static_cast<uint32>(c) << 16 |
+         static_cast<uint32>(d) << 24;
+}
+
 QuicPacketPublicHeader::QuicPacketPublicHeader()
     : guid(0),
       reset_flag(false),
       version_flag(false) {
 }
 
 QuicPacketPublicHeader::QuicPacketPublicHeader(
     const QuicPacketPublicHeader& other)
     : guid(other.guid),
       reset_flag(other.reset_flag),
@@ skipping 278 matching lines @@
   return os;
 }
 
 ostream& operator<<(ostream& os, const QuicConsumedData& s) {
   os << "bytes_consumed: " << s.bytes_consumed
      << " fin_consumed: " << s.fin_consumed;
   return os;
 }
 
 }  // namespace net