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

Unified Diff: extensions/browser/api/cast_channel/cast_transport.cc

Issue 843453002: Replace NULL with nullptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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: extensions/browser/api/cast_channel/cast_transport.cc
diff --git a/extensions/browser/api/cast_channel/cast_transport.cc b/extensions/browser/api/cast_channel/cast_transport.cc
index 2acf2d910d66d1577ae9e790e7280874833dddf9..0619e95260df4c9ba896dfd279788d45d6d23529 100644
--- a/extensions/browser/api/cast_channel/cast_transport.cc
+++ b/extensions/browser/api/cast_channel/cast_transport.cc
@@ -395,7 +395,7 @@ int CastTransportImpl::DoReadComplete(int result) {
}
size_t message_size;
- DCHECK(current_message_.get() == NULL);
+ DCHECK(current_message_.get() == nullptr);
imcheng 2015/01/15 19:26:45 DCHECK(!current_message_); ?
Kevin M 2015/01/27 00:56:45 Done.
ChannelError framing_error;
current_message_ = framer_->Ingest(result, &message_size, &framing_error);
if (current_message_.get() && (framing_error == CHANNEL_ERROR_NONE)) {
@@ -406,11 +406,11 @@ int CastTransportImpl::DoReadComplete(int result) {
static_cast<uint32>(message_size)));
SetReadState(READ_STATE_DO_CALLBACK);
} else if (framing_error != CHANNEL_ERROR_NONE) {
- DCHECK(current_message_.get() == NULL);
+ DCHECK(current_message_.get() == nullptr);
imcheng 2015/01/15 19:26:45 ditto
Kevin M 2015/01/27 00:56:45 Done.
SetErrorState(CHANNEL_ERROR_INVALID_MESSAGE);
SetReadState(READ_STATE_ERROR);
} else {
- DCHECK(current_message_.get() == NULL);
+ DCHECK(current_message_.get() == nullptr);
imcheng 2015/01/15 19:26:45 ditto
Kevin M 2015/01/27 00:56:45 Done.
SetReadState(READ_STATE_READ);
}
return net::OK;

Powered by Google App Engine
This is Rietveld 408576698