Land Recent QUIC Changes.

net/quic/quic_sent_packet_manager.h

Index: net/quic/quic_sent_packet_manager.h
diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 9ca89b354952602b7da1fb31dbaa4ee93bae6552..e11cce503120aa56de288b41d705a3d685d1281c 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -20,7 +20,6 @@
 #include "net/quic/quic_protocol.h"
 
 NET_EXPORT_PRIVATE extern bool FLAGS_track_retransmission_history;
-NET_EXPORT_PRIVATE extern bool FLAGS_limit_rto_increase_for_tests;
 NET_EXPORT_PRIVATE extern bool FLAGS_enable_quic_pacing;
 
 namespace net {
@@ -296,6 +295,9 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   void CleanupPacketHistory();
 
+  // Removes |sequence_number| as a previous transmission of any other packets.
+  void RemovePreviousTransmission(QuicPacketSequenceNumber sequence_number);
+
   // Newly serialized retransmittable and fec packets are added to this map,
   // which contains owning pointers to any contained frames.  If a packet is
   // retransmitted, this map will contain entries for both the old and the new