Landing Recent QUIC Changes.

net/quic/quic_unacked_packet_map.h

Index: net/quic/quic_unacked_packet_map.h
diff --git a/net/quic/quic_unacked_packet_map.h b/net/quic/quic_unacked_packet_map.h
index 51cc6346df24b393caca4800fdd0a121947da799..a7c62ccec78b44533e8ec09dabc2fabe5a717118 100644
--- a/net/quic/quic_unacked_packet_map.h
+++ b/net/quic/quic_unacked_packet_map.h
@@ -125,6 +125,9 @@ class NET_EXPORT_PRIVATE QuicUnackedPacketMap {
   // other packets from other transmissions.
   void RemoveRetransmittability(QuicPacketSequenceNumber sequence_number);
 
+  // Removes any other retransmissions and marks all transmissions unackable.
+  void RemoveAckability(TransmissionInfo* info);
+
   // Increases the largest observed.  Any packets less or equal to
   // |largest_acked_packet| are discarded if they are only for the RTT purposes.
   void IncreaseLargestObserved(QuicPacketSequenceNumber largest_observed);