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

Unified Diff: net/quic/reliable_quic_stream.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_utils_chromium_test.cc ('k') | net/quic/reliable_quic_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/reliable_quic_stream.cc
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 8c3e90690ee2ad157a43d07cc9cb56a74ae9ff18..a10b0abe0d9c05f6dba2cc75aa94f488c380fe38 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -274,7 +274,7 @@ void ReliableQuicStream::WriteOrBufferData(
}
scoped_refptr<ProxyAckNotifierDelegate> proxy_delegate;
- if (ack_notifier_delegate != NULL) {
+ if (ack_notifier_delegate != nullptr) {
proxy_delegate = new ProxyAckNotifierDelegate(ack_notifier_delegate);
}
@@ -298,7 +298,7 @@ void ReliableQuicStream::WriteOrBufferData(
write_completed = true;
}
- if ((proxy_delegate.get() != NULL) &&
+ if ((proxy_delegate.get() != nullptr) &&
(consumed_data.bytes_consumed > 0 || consumed_data.fin_consumed)) {
proxy_delegate->WroteData(write_completed);
}
@@ -317,13 +317,13 @@ void ReliableQuicStream::OnCanWrite() {
if (consumed_data.bytes_consumed == pending_data->data.size() &&
fin == consumed_data.fin_consumed) {
queued_data_.pop_front();
- if (delegate != NULL) {
+ if (delegate != nullptr) {
delegate->WroteData(true);
}
} else {
if (consumed_data.bytes_consumed > 0) {
pending_data->data.erase(0, consumed_data.bytes_consumed);
- if (delegate != NULL) {
+ if (delegate != nullptr) {
delegate->WroteData(false);
}
}
« no previous file with comments | « net/quic/quic_utils_chromium_test.cc ('k') | net/quic/reliable_quic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698