Revert of Landing Recent QUIC Changes.

net/quic/quic_sent_entropy_manager.cc

 // Copyright 2013 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_sent_entropy_manager.h"
 
 #include "base/logging.h"
 #include "net/base/linked_hash_map.h"
 
 using std::make_pair;
@@ skipping 30 matching lines @@
   }
 }
 
 void QuicSentEntropyManager::RecordPacketEntropyHash(
     QuicPacketSequenceNumber sequence_number,
     QuicPacketEntropyHash entropy_hash) {
   if (!packets_entropy_.empty()) {
     // Ensure packets always are recorded in order.
     // Every packet's entropy is recorded, even if it's not sent, so there
     // are not sequence number gaps.
-    DCHECK_EQ(GetLargestPacketWithEntropy() + 1, sequence_number);
+    DCHECK_LT(GetLargestPacketWithEntropy(), sequence_number);
   }
   packets_entropy_.push_back(entropy_hash);
   DVLOG(2) << "Recorded sequence number " << sequence_number
            << " with entropy hash: " << static_cast<int>(entropy_hash);
 }
 
 QuicPacketEntropyHash QuicSentEntropyManager::GetCumulativeEntropy(
     QuicPacketSequenceNumber sequence_number) {
   DCHECK_LE(last_cumulative_entropy_.sequence_number, sequence_number);
   DCHECK_GE(GetLargestPacketWithEntropy(), sequence_number);
@@ skipping 41 matching lines @@
     UpdateCumulativeEntropy(sequence_number, &last_valid_entropy_);
   }
   while (map_offset_ < sequence_number) {
     packets_entropy_.pop_front();
     ++map_offset_;
   }
   DVLOG(2) << "Cleared entropy before: " << sequence_number;
 }
 
 }  // namespace net