Simplify QuicUnackedPacketMap's RemovePreviousTransmissions by always

net/quic/quic_unacked_packet_map_test.cc

Index: net/quic/quic_unacked_packet_map_test.cc
diff --git a/net/quic/quic_unacked_packet_map_test.cc b/net/quic/quic_unacked_packet_map_test.cc
index 9c4a6a32888dc547dd12a448d4d21943b102cb58..c9d4491cf8a2e680b81453e711d0f8a3d35954c3 100644
--- a/net/quic/quic_unacked_packet_map_test.cc
+++ b/net/quic/quic_unacked_packet_map_test.cc
@@ -255,14 +255,38 @@ TEST_F(QuicUnackedPacketMapTest, RetransmitThreeTimes) {
   QuicPacketSequenceNumber pending5[] = { 7 };
   VerifyInFlightPackets(pending5, arraysize(pending5));
 
-  // Now test ClearPreviousTransmissions.
-  unacked_packets_.ClearPreviousRetransmissions(5);
+  // Now test ClearAllPreviousTransmissions, leaving one packet.
+  unacked_packets_.ClearAllPreviousRetransmissions();
   QuicPacketSequenceNumber unacked5[] = { 7 };
   VerifyUnackedPackets(unacked5, arraysize(unacked5));
   QuicPacketSequenceNumber retransmittable5[] = { 7 };
   VerifyRetransmittablePackets(retransmittable5, arraysize(retransmittable5));
 }
 
+TEST_F(QuicUnackedPacketMapTest, RestoreInflight) {
+  // Simulate a retransmittable packet being sent, retransmitted, and the first
+  // transmission being acked.
+  unacked_packets_.AddPacket(CreateRetransmittablePacket(1));
+  unacked_packets_.SetSent(1, now_, kDefaultLength, true);
+  unacked_packets_.OnRetransmittedPacket(1, 2, RTO_RETRANSMISSION);
+  unacked_packets_.RemoveFromInFlight(1);
+  unacked_packets_.SetSent(2, now_, kDefaultLength, true);
+
+  QuicPacketSequenceNumber unacked[] = { 1, 2 };
+  VerifyUnackedPackets(unacked, arraysize(unacked));
+  QuicPacketSequenceNumber retransmittable[] = { 2 };
+  VerifyInFlightPackets(retransmittable, arraysize(retransmittable));
+  VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
+  EXPECT_EQ(kDefaultLength, unacked_packets_.bytes_in_flight());
+
+  // Simulate an F-RTO, and restore 1 to flight.
+  unacked_packets_.RestoreInFlight(1);
+  VerifyUnackedPackets(unacked, arraysize(unacked));
+  VerifyInFlightPackets(unacked, arraysize(unacked));
+  VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
+  EXPECT_EQ(2 * kDefaultLength, unacked_packets_.bytes_in_flight());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace net