| Index: net/quic/quic_sent_packet_manager_test.cc
|
| diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc
|
| index 9918d149f2255d8e459abd654e61b0fe74f6df08..42c9a6f617b79aac18e235b1c4cb36f7ca9dc2a5 100644
|
| --- a/net/quic/quic_sent_packet_manager_test.cc
|
| +++ b/net/quic/quic_sent_packet_manager_test.cc
|
| @@ -181,20 +181,19 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
|
| SerializedPacket CreatePacket(QuicPacketSequenceNumber sequence_number,
|
| bool retransmittable) {
|
| packets_.push_back(QuicPacket::NewDataPacket(
|
| - NULL, kDefaultLength, false, PACKET_8BYTE_CONNECTION_ID, false,
|
| + nullptr, kDefaultLength, false, PACKET_8BYTE_CONNECTION_ID, false,
|
| PACKET_6BYTE_SEQUENCE_NUMBER));
|
| return SerializedPacket(
|
| - sequence_number, PACKET_6BYTE_SEQUENCE_NUMBER,
|
| - packets_.back(), 0u,
|
| - retransmittable ? new RetransmittableFrames() : NULL);
|
| + sequence_number, PACKET_6BYTE_SEQUENCE_NUMBER, packets_.back(), 0u,
|
| + retransmittable ? new RetransmittableFrames() : nullptr);
|
| }
|
|
|
| SerializedPacket CreateFecPacket(QuicPacketSequenceNumber sequence_number) {
|
| packets_.push_back(QuicPacket::NewFecPacket(
|
| - NULL, kDefaultLength, false, PACKET_8BYTE_CONNECTION_ID, false,
|
| + nullptr, kDefaultLength, false, PACKET_8BYTE_CONNECTION_ID, false,
|
| PACKET_6BYTE_SEQUENCE_NUMBER));
|
| return SerializedPacket(sequence_number, PACKET_6BYTE_SEQUENCE_NUMBER,
|
| - packets_.back(), 0u, NULL);
|
| + packets_.back(), 0u, nullptr);
|
| }
|
|
|
| void SendDataPacket(QuicPacketSequenceNumber sequence_number) {
|
| @@ -269,7 +268,7 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
|
| };
|
|
|
| TEST_F(QuicSentPacketManagerTest, IsUnacked) {
|
| - VerifyUnackedPackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
| SendDataPacket(1);
|
|
|
| QuicPacketSequenceNumber unacked[] = { 1 };
|
| @@ -304,7 +303,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitThenAck) {
|
| QuicPacketSequenceNumber unacked[] = { 1 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
| }
|
|
|
| TEST_F(QuicSentPacketManagerTest, RetransmitThenAckBeforeSend) {
|
| @@ -323,8 +322,8 @@ TEST_F(QuicSentPacketManagerTest, RetransmitThenAckBeforeSend) {
|
| EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
|
|
| // No unacked packets remain.
|
| - VerifyUnackedPackets(NULL, 0);
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
| EXPECT_EQ(0u, stats_.packets_spuriously_retransmitted);
|
| }
|
|
|
| @@ -344,7 +343,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitThenAckPrevious) {
|
| QuicPacketSequenceNumber unacked[] = { 2 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
|
|
| EXPECT_EQ(1u, stats_.packets_spuriously_retransmitted);
|
| }
|
| @@ -381,9 +380,9 @@ TEST_F(QuicSentPacketManagerTest, RetransmitThenAckPreviousThenNackRetransmit) {
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| // No packets remain unacked.
|
| - VerifyUnackedPackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
| EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
|
|
| // Verify that the retransmission alarm would not fire,
|
| // since there is no retransmittable data outstanding.
|
| @@ -415,7 +414,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitTwiceThenAckPreviousBeforeSend) {
|
| QuicPacketSequenceNumber unacked[] = { 2 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
|
|
| // Verify that the retransmission alarm would not fire,
|
| // since there is no retransmittable data outstanding.
|
| @@ -444,14 +443,14 @@ TEST_F(QuicSentPacketManagerTest, RetransmitTwiceThenAckFirst) {
|
| QuicPacketSequenceNumber unacked[] = { 2, 3 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
|
|
| // Ensure packet 2 is lost when 4 is sent and 3 and 4 are acked.
|
| SendDataPacket(4);
|
| ack_frame.largest_observed = 4;
|
| ack_frame.missing_packets.insert(2);
|
| QuicPacketSequenceNumber acked[] = { 3, 4 };
|
| - ExpectAcksAndLosses(true, acked, arraysize(acked), NULL, 0);
|
| + ExpectAcksAndLosses(true, acked, arraysize(acked), nullptr, 0);
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| QuicPacketSequenceNumber unacked2[] = { 2 };
|
| @@ -463,7 +462,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitTwiceThenAckFirst) {
|
| ExpectAckAndLoss(true, 5, 2);
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| - VerifyUnackedPackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
| EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| EXPECT_EQ(2u, stats_.packets_spuriously_retransmitted);
|
| }
|
| @@ -480,7 +479,7 @@ TEST_F(QuicSentPacketManagerTest, LoseButDontRetransmitRevivedPacket) {
|
| ack_frame.missing_packets.insert(1);
|
| ack_frame.revived_packets.insert(1);
|
| QuicPacketSequenceNumber acked[] = { 2, 3 };
|
| - ExpectAcksAndLosses(true, acked, arraysize(acked), NULL, 0);
|
| + ExpectAcksAndLosses(true, acked, arraysize(acked), nullptr, 0);
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| @@ -496,7 +495,7 @@ TEST_F(QuicSentPacketManagerTest, LoseButDontRetransmitRevivedPacket) {
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
| }
|
|
|
| TEST_F(QuicSentPacketManagerTest, MarkLostThenReviveAndDontRetransmitPacket) {
|
| @@ -529,7 +528,7 @@ TEST_F(QuicSentPacketManagerTest, MarkLostThenReviveAndDontRetransmitPacket) {
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
| }
|
|
|
| TEST_F(QuicSentPacketManagerTest, TruncatedAck) {
|
| @@ -549,7 +548,7 @@ TEST_F(QuicSentPacketManagerTest, TruncatedAck) {
|
| ack_frame.is_truncated = true;
|
|
|
| QuicPacketSequenceNumber lost[] = { 1 };
|
| - ExpectAcksAndLosses(true, NULL, 0, lost, arraysize(lost));
|
| + ExpectAcksAndLosses(true, nullptr, 0, lost, arraysize(lost));
|
| manager_.OnIncomingAck(ack_frame, clock_.Now());
|
|
|
| // High water mark will be raised.
|
| @@ -615,7 +614,7 @@ TEST_F(QuicSentPacketManagerTest, GetLeastUnackedUnackedFec) {
|
| }
|
|
|
| TEST_F(QuicSentPacketManagerTest, GetLeastUnackedAndDiscard) {
|
| - VerifyUnackedPackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
|
|
| SendFecPacket(1);
|
| EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| @@ -628,7 +627,7 @@ TEST_F(QuicSentPacketManagerTest, GetLeastUnackedAndDiscard) {
|
|
|
| QuicPacketSequenceNumber unacked[] = { 1, 2, 3 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
|
|
| // Ack 2, so there's an rtt update.
|
| ExpectAck(2);
|
| @@ -641,7 +640,7 @@ TEST_F(QuicSentPacketManagerTest, GetLeastUnackedAndDiscard) {
|
| }
|
|
|
| TEST_F(QuicSentPacketManagerTest, GetSentTime) {
|
| - VerifyUnackedPackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
|
|
| QuicTime sent_time = clock_.Now();
|
| SendFecPacket(1);
|
| @@ -649,7 +648,7 @@ TEST_F(QuicSentPacketManagerTest, GetSentTime) {
|
| SendFecPacket(2);
|
| QuicPacketSequenceNumber unacked[] = { 1, 2 };
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
|
|
| EXPECT_TRUE(manager_.HasUnackedPackets());
|
| EXPECT_EQ(sent_time, QuicSentPacketManagerPeer::GetSentTime(&manager_, 1));
|
| @@ -790,7 +789,7 @@ TEST_F(QuicSentPacketManagerTest, TailLossProbeTimeout) {
|
| // Acking two more packets will lose both of them due to nacks.
|
| ack_frame.largest_observed = 5;
|
| QuicPacketSequenceNumber lost[] = { 1, 2 };
|
| - ExpectAcksAndLosses(false, NULL, 0, lost, arraysize(lost));
|
| + ExpectAcksAndLosses(false, nullptr, 0, lost, arraysize(lost));
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
|
|
| EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| @@ -882,7 +881,7 @@ TEST_F(QuicSentPacketManagerTest, CryptoHandshakeTimeout) {
|
| // Now ack the two crypto packets and the speculatively encrypted request,
|
| // and ensure the first four crypto packets get abandoned, but not lost.
|
| QuicPacketSequenceNumber acked[] = { 3, 4, 5, 8, 9 };
|
| - ExpectAcksAndLosses(true, acked, arraysize(acked), NULL, 0);
|
| + ExpectAcksAndLosses(true, acked, arraysize(acked), nullptr, 0);
|
| QuicAckFrame ack_frame;
|
| ack_frame.largest_observed = 9;
|
| ack_frame.missing_packets.insert(1);
|
| @@ -1016,7 +1015,7 @@ TEST_F(QuicSentPacketManagerTest,
|
| manager_.NeuterUnencryptedPackets();
|
| QuicPacketSequenceNumber unacked[] = { 1, 2, 3};
|
| VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
| EXPECT_FALSE(manager_.HasPendingRetransmissions());
|
| EXPECT_FALSE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_));
|
| EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
|
| @@ -1028,8 +1027,8 @@ TEST_F(QuicSentPacketManagerTest,
|
| ack_frame.missing_packets.insert(2);
|
| ExpectUpdatedRtt(3);
|
| manager_.OnIncomingAck(ack_frame, clock_.ApproximateNow());
|
| - VerifyUnackedPackets(NULL, 0);
|
| - VerifyRetransmittablePackets(NULL, 0);
|
| + VerifyUnackedPackets(nullptr, 0);
|
| + VerifyRetransmittablePackets(nullptr, 0);
|
| }
|
|
|
| TEST_F(QuicSentPacketManagerTest, ResetRecentMinRTTWithEmptyWindow) {
|
|
|