Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1608)

Unified Diff: net/quic/congestion_control/tcp_loss_algorithm_test.cc

Issue 612323013: QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/congestion_control/tcp_loss_algorithm_test.cc
diff --git a/net/quic/congestion_control/tcp_loss_algorithm_test.cc b/net/quic/congestion_control/tcp_loss_algorithm_test.cc
index eccda4a81c5fcb58f6e52c5ac04ce8aac9ac98cd..988f42740e741d3d1d2bce23aa70e1c9aed06c9d 100644
--- a/net/quic/congestion_control/tcp_loss_algorithm_test.cc
+++ b/net/quic/congestion_control/tcp_loss_algorithm_test.cc
@@ -26,7 +26,7 @@ class TcpLossAlgorithmTest : 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,11 +58,11 @@ TEST_F(TcpLossAlgorithmTest, NackRetransmit1Packet) {
// No loss on one ack.
unacked_packets_.RemoveFromInFlight(2);
unacked_packets_.NackPacket(1, 1);
- VerifyLosses(2, NULL, 0);
+ VerifyLosses(2, nullptr, 0);
// No loss on two acks.
unacked_packets_.RemoveFromInFlight(3);
unacked_packets_.NackPacket(1, 2);
- VerifyLosses(3, NULL, 0);
+ VerifyLosses(3, nullptr, 0);
// Loss on three acks.
unacked_packets_.RemoveFromInFlight(4);
unacked_packets_.NackPacket(1, 3);
@@ -117,7 +117,7 @@ TEST_F(TcpLossAlgorithmTest, EarlyRetransmit1Packet) {
// Early retransmit when the final packet gets acked and the first is nacked.
unacked_packets_.RemoveFromInFlight(2);
unacked_packets_.NackPacket(1, 1);
- VerifyLosses(2, NULL, 0);
+ VerifyLosses(2, nullptr, 0);
EXPECT_EQ(clock_.Now().Add(rtt_stats_.SmoothedRtt().Multiply(1.25)),
loss_algorithm_.GetLossTimeout());
@@ -175,7 +175,7 @@ TEST_F(TcpLossAlgorithmTest, DontEarlyRetransmitNeuteredPacket) {
unacked_packets_.IncreaseLargestObserved(2);
unacked_packets_.RemoveFromInFlight(2);
unacked_packets_.NackPacket(1, 1);
- VerifyLosses(2, NULL, 0);
+ VerifyLosses(2, nullptr, 0);
EXPECT_EQ(QuicTime::Zero(), loss_algorithm_.GetLossTimeout());
}
« no previous file with comments | « net/quic/congestion_control/send_algorithm_simulator.cc ('k') | net/quic/congestion_control/time_loss_algorithm_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698