| Index: net/quic/congestion_control/time_loss_algorithm_test.cc
|
| diff --git a/net/quic/congestion_control/time_loss_algorithm_test.cc b/net/quic/congestion_control/time_loss_algorithm_test.cc
|
| index bd03e608bcc1cd619ea99874bbc887d145ea2573..4139019ef90d7f6f0cf8426dd6bc078ceed4458c 100644
|
| --- a/net/quic/congestion_control/time_loss_algorithm_test.cc
|
| +++ b/net/quic/congestion_control/time_loss_algorithm_test.cc
|
| @@ -26,7 +26,7 @@ class TimeLossAlgorithmTest : public ::testing::Test {
|
|
|
| void SendDataPacket(QuicPacketSequenceNumber sequence_number) {
|
| SerializedPacket packet(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER,
|
| - NULL, 0, new RetransmittableFrames());
|
| + nullptr, 0, new RetransmittableFrames());
|
| unacked_packets_.AddPacket(packet);
|
| unacked_packets_.SetSent(sequence_number, clock_.Now(), 1000, true);
|
| }
|
| @@ -58,7 +58,7 @@ TEST_F(TimeLossAlgorithmTest, NoLossFor500Nacks) {
|
| unacked_packets_.RemoveFromInFlight(2);
|
| for (size_t i = 1; i < 500; ++i) {
|
| unacked_packets_.NackPacket(1, i);
|
| - VerifyLosses(2, NULL, 0);
|
| + VerifyLosses(2, nullptr, 0);
|
| }
|
| EXPECT_EQ(rtt_stats_.SmoothedRtt().Multiply(1.25),
|
| loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
|
| @@ -76,12 +76,12 @@ TEST_F(TimeLossAlgorithmTest, NoLossUntilTimeout) {
|
| // The packet should not be lost until 1.25 RTTs pass.
|
| unacked_packets_.NackPacket(1, 1);
|
| unacked_packets_.RemoveFromInFlight(2);
|
| - VerifyLosses(2, NULL, 0);
|
| + VerifyLosses(2, nullptr, 0);
|
| // Expect the timer to be set to 0.25 RTT's in the future.
|
| EXPECT_EQ(rtt_stats_.SmoothedRtt().Multiply(0.25),
|
| loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
|
| unacked_packets_.NackPacket(1, 5);
|
| - VerifyLosses(2, NULL, 0);
|
| + VerifyLosses(2, nullptr, 0);
|
| clock_.AdvanceTime(rtt_stats_.SmoothedRtt().Multiply(0.25));
|
| QuicPacketSequenceNumber lost[] = { 1 };
|
| VerifyLosses(2, lost, arraysize(lost));
|
| @@ -99,13 +99,13 @@ TEST_F(TimeLossAlgorithmTest, NoLossWithoutNack) {
|
| EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
|
| // The packet should not be lost without a nack.
|
| unacked_packets_.RemoveFromInFlight(1);
|
| - VerifyLosses(1, NULL, 0);
|
| + VerifyLosses(1, nullptr, 0);
|
| // The timer should still not be set.
|
| EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
|
| clock_.AdvanceTime(rtt_stats_.SmoothedRtt().Multiply(0.25));
|
| - VerifyLosses(1, NULL, 0);
|
| + VerifyLosses(1, nullptr, 0);
|
| clock_.AdvanceTime(rtt_stats_.SmoothedRtt());
|
| - VerifyLosses(1, NULL, 0);
|
| + VerifyLosses(1, nullptr, 0);
|
|
|
| EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
|
| }
|
| @@ -124,7 +124,7 @@ TEST_F(TimeLossAlgorithmTest, MultipleLossesAtOnce) {
|
| unacked_packets_.NackPacket(i, 1);
|
| }
|
| unacked_packets_.RemoveFromInFlight(10);
|
| - VerifyLosses(10, NULL, 0);
|
| + VerifyLosses(10, nullptr, 0);
|
| // Expect the timer to be set to 0.25 RTT's in the future.
|
| EXPECT_EQ(rtt_stats_.SmoothedRtt().Multiply(0.25),
|
| loss_algorithm_.GetLossTimeout().Subtract(clock_.Now()));
|
|
|