Land Recent QUIC Changes

net/quic/quic_data_writer.cc

Index: net/quic/quic_data_writer.cc
diff --git a/net/quic/quic_data_writer.cc b/net/quic/quic_data_writer.cc
index f90670f181930655997de5399cc2baec2162bc00..4182d9a4d294023508f75f5168915c9a3155e10d 100644
--- a/net/quic/quic_data_writer.cc
+++ b/net/quic/quic_data_writer.cc
@@ -109,18 +109,30 @@ void QuicDataWriter::WritePadding() {
 
 bool QuicDataWriter::WriteUInt8ToOffset(uint8 value, size_t offset) {
   DCHECK_LT(offset, capacity_);
-  int latched_length = length_;
+  size_t latched_length = length_;
   length_ = offset;
   bool success = WriteUInt8(value);
+  DCHECK_LE(length_, latched_length);
+  length_ = latched_length;
+  return success;
+}
+
+bool QuicDataWriter::WriteUInt32ToOffset(uint32 value, size_t offset) {
+  DCHECK_LT(offset, capacity_);
+  size_t latched_length = length_;
+  length_ = offset;
+  bool success = WriteUInt32(value);
+  DCHECK_LE(length_, latched_length);
   length_ = latched_length;
   return success;
 }
 
 bool QuicDataWriter::WriteUInt48ToOffset(uint64 value, size_t offset) {
   DCHECK_LT(offset, capacity_);
-  int latched_length = length_;
+  size_t latched_length = length_;
   length_ = offset;
   bool success = WriteUInt48(value);
+  DCHECK_LE(length_, latched_length);
   length_ = latched_length;
   return success;
 }