| 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 db033a910af959be2887e5523a174b210ae8807b..0ff0cf0326de9058e0b9a6799ca15e0c25c2b431 100644
|
| --- a/net/quic/quic_unacked_packet_map_test.cc
|
| +++ b/net/quic/quic_unacked_packet_map_test.cc
|
| @@ -36,17 +36,17 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
|
| void VerifyPendingPackets(QuicPacketSequenceNumber* packets,
|
| size_t num_packets) {
|
| if (num_packets == 0) {
|
| - EXPECT_FALSE(unacked_packets_.HasPendingPackets());
|
| - EXPECT_FALSE(unacked_packets_.HasMultiplePendingPackets());
|
| + EXPECT_FALSE(unacked_packets_.HasInFlightPackets());
|
| + EXPECT_FALSE(unacked_packets_.HasMultipleInFlightPackets());
|
| return;
|
| }
|
| if (num_packets == 1) {
|
| - EXPECT_TRUE(unacked_packets_.HasPendingPackets());
|
| - EXPECT_FALSE(unacked_packets_.HasMultiplePendingPackets());
|
| + EXPECT_TRUE(unacked_packets_.HasInFlightPackets());
|
| + EXPECT_FALSE(unacked_packets_.HasMultipleInFlightPackets());
|
| }
|
| for (size_t i = 0; i < num_packets; ++i) {
|
| ASSERT_TRUE(unacked_packets_.IsUnacked(packets[i]));
|
| - EXPECT_TRUE(unacked_packets_.GetTransmissionInfo(packets[i]).pending);
|
| + EXPECT_TRUE(unacked_packets_.GetTransmissionInfo(packets[i]).in_flight);
|
| }
|
| }
|
|
|
| @@ -119,7 +119,7 @@ TEST_F(QuicUnackedPacketMapTest, RetransmittableInflightAndRtt) {
|
| VerifyPendingPackets(unacked, arraysize(unacked));
|
| VerifyRetransmittablePackets(NULL, 0);
|
|
|
| - unacked_packets_.SetNotPending(1);
|
| + unacked_packets_.RemoveFromInFlight(1);
|
| VerifyUnackedPackets(NULL, 0);
|
| VerifyPendingPackets(NULL, 0);
|
| VerifyRetransmittablePackets(NULL, 0);
|
| @@ -149,13 +149,13 @@ TEST_F(QuicUnackedPacketMapTest, RetransmittedPacket) {
|
| VerifyPendingPackets(unacked, arraysize(unacked));
|
| VerifyRetransmittablePackets(NULL, 0);
|
|
|
| - unacked_packets_.SetNotPending(2);
|
| + unacked_packets_.RemoveFromInFlight(2);
|
| QuicPacketSequenceNumber unacked2[] = { 1 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked2));
|
| VerifyPendingPackets(unacked, arraysize(unacked2));
|
| VerifyRetransmittablePackets(NULL, 0);
|
|
|
| - unacked_packets_.SetNotPending(1);
|
| + unacked_packets_.RemoveFromInFlight(1);
|
| VerifyUnackedPackets(NULL, 0);
|
| VerifyPendingPackets(NULL, 0);
|
| VerifyRetransmittablePackets(NULL, 0);
|
|
|