Index: net/tools/quic/test_tools/quic_test_utils.cc |
diff --git a/net/tools/quic/test_tools/quic_test_utils.cc b/net/tools/quic/test_tools/quic_test_utils.cc |
index 8df57e2431cb3005dae335dd6b04d4fce9e62baf..8fdbe001c68cc0187e46494cb0d6f9e7b003063a 100644 |
--- a/net/tools/quic/test_tools/quic_test_utils.cc |
+++ b/net/tools/quic/test_tools/quic_test_utils.cc |
@@ -97,7 +97,7 @@ QuicAckFrame MakeAckFrameWithNackRanges( |
TestSession::TestSession(QuicConnection* connection, |
const QuicConfig& config) |
: QuicSession(connection, config), |
- crypto_stream_(NULL) { |
+ crypto_stream_(nullptr) { |
InitializeSession(); |
} |
@@ -129,7 +129,7 @@ MockAckNotifierDelegate::MockAckNotifierDelegate() { |
MockAckNotifierDelegate::~MockAckNotifierDelegate() { |
} |
-TestWriterFactory::TestWriterFactory() : current_writer_(NULL) {} |
+TestWriterFactory::TestWriterFactory() : current_writer_(nullptr) {} |
TestWriterFactory::~TestWriterFactory() {} |
QuicPacketWriter* TestWriterFactory::Create(QuicPacketWriter* writer, |
@@ -138,15 +138,15 @@ QuicPacketWriter* TestWriterFactory::Create(QuicPacketWriter* writer, |
} |
void TestWriterFactory::OnPacketSent(WriteResult result) { |
- if (current_writer_ != NULL && result.status == WRITE_STATUS_ERROR) { |
+ if (current_writer_ != nullptr && result.status == WRITE_STATUS_ERROR) { |
current_writer_->connection()->OnWriteError(result.error_code); |
- current_writer_ = NULL; |
+ current_writer_ = nullptr; |
} |
} |
void TestWriterFactory::Unregister(PerConnectionPacketWriter* writer) { |
if (current_writer_ == writer) { |
- current_writer_ = NULL; |
+ current_writer_ = nullptr; |
} |
} |
@@ -167,9 +167,10 @@ WriteResult TestWriterFactory::PerConnectionPacketWriter::WritePacket( |
size_t buf_len, |
const IPAddressNumber& self_address, |
const IPEndPoint& peer_address) { |
- // A DCHECK(factory_current_writer_ == NULL) would be wrong here -- this class |
- // may be used in a setting where connection()->OnPacketSent() is called in a |
- // different way, so TestWriterFactory::OnPacketSent might never be called. |
+ // A DCHECK(factory_current_writer_ == nullptr) would be wrong here -- this |
+ // class may be used in a setting where connection()->OnPacketSent() is called |
+ // in a different way, so TestWriterFactory::OnPacketSent might never be |
+ // called. |
factory_->current_writer_ = this; |
return QuicPerConnectionPacketWriter::WritePacket(buffer, |
buf_len, |