Land Recent QUIC Changes.

net/quic/quic_framer.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_framer.h"
 
 #include "base/containers/hash_tables.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_data_reader.h"
@@ skipping 1939 matching lines @@
   }
 
   size_t largest_observed_offset = writer->length();
   if (!AppendPacketSequenceNumber(PACKET_6BYTE_SEQUENCE_NUMBER,
                                   frame.received_info.largest_observed,
                                   writer)) {
     return false;
   }
   uint32 delta_time_largest_observed_us = kInvalidDeltaTime;
   if (!frame.received_info.delta_time_largest_observed.IsInfinite()) {
+    DCHECK_LE(0u,
+              frame.received_info.delta_time_largest_observed.ToMicroseconds());
     delta_time_largest_observed_us =
         frame.received_info.delta_time_largest_observed.ToMicroseconds();
   }
 
   size_t delta_time_largest_observed_offset = writer->length();
   if (!writer->WriteUInt32(delta_time_largest_observed_us)) {
     return false;
   }
 
   // We don't check for overflowing uint8 here, because we only can fit 192 acks
@@ skipping 118 matching lines @@
     return false;
   }
 
   if (!AppendPacketSequenceNumber(largest_observed_length,
                                   ack_largest_observed, writer)) {
     return false;
   }
 
   uint64 delta_time_largest_observed_us = kUFloat16MaxValue;
   if (!received_info.delta_time_largest_observed.IsInfinite()) {
+    DCHECK_LE(0u,
+              frame.received_info.delta_time_largest_observed.ToMicroseconds());
     delta_time_largest_observed_us =
         received_info.delta_time_largest_observed.ToMicroseconds();
   }
 
   if (!writer->WriteUFloat16(delta_time_largest_observed_us)) {
     return false;
   }
 
   if (ack_info.nack_ranges.empty()) {
     return true;
@@ skipping 170 matching lines @@
 
 bool QuicFramer::RaiseError(QuicErrorCode error) {
   DLOG(INFO) << detailed_error_;
   set_error(error);
   visitor_->OnError(this);
   reader_.reset(NULL);
   return false;
 }
 
 }  // namespace net