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

Unified Diff: net/quic/quic_unacked_packet_map_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
« no previous file with comments | « net/quic/quic_unacked_packet_map.cc ('k') | net/quic/quic_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c49784070c7cd806ab7eacde2380658b78349fd0..4f5d6a501a405e2adb37d6ca7291edbb01a110bd 100644
--- a/net/quic/quic_unacked_packet_map_test.cc
+++ b/net/quic/quic_unacked_packet_map_test.cc
@@ -25,14 +25,14 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
SerializedPacket CreateRetransmittablePacket(
QuicPacketSequenceNumber sequence_number) {
- return SerializedPacket(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER, NULL,
- 0, new RetransmittableFrames());
+ return SerializedPacket(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER,
+ nullptr, 0, new RetransmittableFrames());
}
SerializedPacket CreateNonRetransmittablePacket(
QuicPacketSequenceNumber sequence_number) {
- return SerializedPacket(
- sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL);
+ return SerializedPacket(sequence_number, PACKET_1BYTE_SEQUENCE_NUMBER,
+ nullptr, 0, nullptr);
}
void VerifyInFlightPackets(QuicPacketSequenceNumber* packets,
@@ -84,7 +84,7 @@ class QuicUnackedPacketMapTest : public ::testing::Test {
size_t num_retransmittable_packets = 0;
for (QuicUnackedPacketMap::const_iterator it = unacked_packets_.begin();
it != unacked_packets_.end(); ++it) {
- if (it->retransmittable_frames != NULL) {
+ if (it->retransmittable_frames != nullptr) {
++num_retransmittable_packets;
}
}
@@ -106,13 +106,13 @@ TEST_F(QuicUnackedPacketMapTest, RttOnly) {
QuicPacketSequenceNumber unacked[] = { 1 };
VerifyUnackedPackets(unacked, arraysize(unacked));
- VerifyInFlightPackets(NULL, 0);
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyInFlightPackets(nullptr, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
unacked_packets_.IncreaseLargestObserved(1);
- VerifyUnackedPackets(NULL, 0);
- VerifyInFlightPackets(NULL, 0);
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyUnackedPackets(nullptr, 0);
+ VerifyInFlightPackets(nullptr, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
}
TEST_F(QuicUnackedPacketMapTest, DiscardOldRttOnly) {
@@ -141,17 +141,17 @@ TEST_F(QuicUnackedPacketMapTest, RetransmittableInflightAndRtt) {
unacked_packets_.RemoveRetransmittability(1);
VerifyUnackedPackets(unacked, arraysize(unacked));
VerifyInFlightPackets(unacked, arraysize(unacked));
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
unacked_packets_.IncreaseLargestObserved(1);
VerifyUnackedPackets(unacked, arraysize(unacked));
VerifyInFlightPackets(unacked, arraysize(unacked));
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
unacked_packets_.RemoveFromInFlight(1);
- VerifyUnackedPackets(NULL, 0);
- VerifyInFlightPackets(NULL, 0);
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyUnackedPackets(nullptr, 0);
+ VerifyInFlightPackets(nullptr, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
}
TEST_F(QuicUnackedPacketMapTest, RetransmittedPacket) {
@@ -171,23 +171,23 @@ TEST_F(QuicUnackedPacketMapTest, RetransmittedPacket) {
unacked_packets_.RemoveRetransmittability(1);
VerifyUnackedPackets(unacked, arraysize(unacked));
VerifyInFlightPackets(unacked, arraysize(unacked));
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
unacked_packets_.IncreaseLargestObserved(2);
VerifyUnackedPackets(unacked, arraysize(unacked));
VerifyInFlightPackets(unacked, arraysize(unacked));
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
unacked_packets_.RemoveFromInFlight(2);
QuicPacketSequenceNumber unacked2[] = { 1 };
VerifyUnackedPackets(unacked, arraysize(unacked2));
VerifyInFlightPackets(unacked, arraysize(unacked2));
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
unacked_packets_.RemoveFromInFlight(1);
- VerifyUnackedPackets(NULL, 0);
- VerifyInFlightPackets(NULL, 0);
- VerifyRetransmittablePackets(NULL, 0);
+ VerifyUnackedPackets(nullptr, 0);
+ VerifyInFlightPackets(nullptr, 0);
+ VerifyRetransmittablePackets(nullptr, 0);
}
TEST_F(QuicUnackedPacketMapTest, RetransmitThreeTimes) {
« no previous file with comments | « net/quic/quic_unacked_packet_map.cc ('k') | net/quic/quic_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698