Make the SentPacketManager remove pending retransmissions for reset

net/quic/quic_unacked_packet_map_test.cc

 // Copyright 2014 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_unacked_packet_map.h"
 
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::min;
@@ skipping 171 matching lines @@
   unacked_packets_.AddSentPacket(
       CreateRetransmittablePacketForStream(1, stream_id), 0, NOT_RETRANSMISSION,
       now_, kDefaultLength, true);
 
   QuicPacketSequenceNumber unacked[] = {1};
   VerifyUnackedPackets(unacked, arraysize(unacked));
   VerifyInFlightPackets(unacked, arraysize(unacked));
   QuicPacketSequenceNumber retransmittable[] = {1};
   VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
 
-  unacked_packets_.StopRetransmissionForStream(stream_id);
+  unacked_packets_.CancelRetransmissionsForStream(stream_id);
   VerifyUnackedPackets(unacked, arraysize(unacked));
   VerifyInFlightPackets(unacked, arraysize(unacked));
   VerifyRetransmittablePackets(nullptr, 0);
 }
 
 TEST_F(QuicUnackedPacketMapTest, StopRetransmissionOnOtherStream) {
   const QuicStreamId stream_id = 2;
   unacked_packets_.AddSentPacket(
       CreateRetransmittablePacketForStream(1, stream_id), 0, NOT_RETRANSMISSION,
       now_, kDefaultLength, true);
 
   QuicPacketSequenceNumber unacked[] = {1};
   VerifyUnackedPackets(unacked, arraysize(unacked));
   VerifyInFlightPackets(unacked, arraysize(unacked));
   QuicPacketSequenceNumber retransmittable[] = {1};
   VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
 
   // Stop retransmissions on another stream and verify the packet is unchanged.
-  unacked_packets_.StopRetransmissionForStream(stream_id + 2);
+  unacked_packets_.CancelRetransmissionsForStream(stream_id + 2);
   VerifyUnackedPackets(unacked, arraysize(unacked));
   VerifyInFlightPackets(unacked, arraysize(unacked));
   VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
 }
 
 TEST_F(QuicUnackedPacketMapTest, StopRetransmissionAfterRetransmission) {
   const QuicStreamId stream_id = 2;
   unacked_packets_.AddSentPacket(
       CreateRetransmittablePacketForStream(1, stream_id), 0, NOT_RETRANSMISSION,
       now_, kDefaultLength, true);
   unacked_packets_.AddSentPacket(CreateNonRetransmittablePacket(2), 1,
                                  LOSS_RETRANSMISSION, now_, kDefaultLength,
                                  true);
 
   QuicPacketSequenceNumber unacked[] = {1, 2};
   VerifyUnackedPackets(unacked, arraysize(unacked));
   VerifyInFlightPackets(unacked, arraysize(unacked));
   QuicPacketSequenceNumber retransmittable[] = {2};
   VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
 
-  unacked_packets_.StopRetransmissionForStream(stream_id);
+  unacked_packets_.CancelRetransmissionsForStream(stream_id);
   VerifyUnackedPackets(unacked, arraysize(unacked));
   VerifyInFlightPackets(unacked, arraysize(unacked));
   VerifyRetransmittablePackets(nullptr, 0);
 }
 
 TEST_F(QuicUnackedPacketMapTest, RetransmittedPacket) {
   // Simulate a retransmittable packet being sent, retransmitted, and the first
   // transmission being acked.
   unacked_packets_.AddSentPacket(CreateRetransmittablePacket(1), 0,
                                  NOT_RETRANSMISSION, now_, kDefaultLength,
@@ skipping 194 matching lines @@
   EXPECT_TRUE(unacked_packets_.IsUnacked(3));
   EXPECT_FALSE(unacked_packets_.IsUnacked(4));
   EXPECT_TRUE(unacked_packets_.IsUnacked(5));
   EXPECT_EQ(5u, unacked_packets_.largest_sent_packet());
 }
 
 
 }  // namespace
 }  // namespace test
 }  // namespace net