extensions/browser/api/cast_channel/cast_socket.cc - Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« extensions/browser/api/bluetooth/bluetooth_apitest.cc ('K') | « extensions/browser/api/cast_channel/cast_framer_unittest.cc ('k') | extensions/browser/api/cast_channel/cast_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/cast_channel/cast_socket.cc

diff --git a/extensions/browser/api/cast_channel/cast_socket.cc b/extensions/browser/api/cast_channel/cast_socket.cc

index 650857ce3694e0b0b0af3bf6039bc4910a129a63..c243c8fdf4aaf8167d378985fc3fb2518dbc30d5 100644

--- a/extensions/browser/api/cast_channel/cast_socket.cc

+++ b/extensions/browser/api/cast_channel/cast_socket.cc

@@ -853,7 +853,7 @@ int CastSocket::DoReadComplete(int result) {

}

size_t message_size;

- DCHECK(current_message_.get() == NULL);

+ DCHECK(current_message_.get() == nullptr);

current_message_ = framer_->Ingest(result, &message_size, &error_state_);

if (current_message_.get()) {

DCHECK_EQ(error_state_, CHANNEL_ERROR_NONE);

@@ -866,10 +866,10 @@ int CastSocket::DoReadComplete(int result) {

static_cast<uint32>(message_size)));

SetReadState(READ_STATE_DO_CALLBACK);

} else if (error_state_ != CHANNEL_ERROR_NONE) {

- DCHECK(current_message_.get() == NULL);

+ DCHECK(current_message_.get() == nullptr);

SetReadState(READ_STATE_ERROR);

} else {

- DCHECK(current_message_.get() == NULL);

+ DCHECK(current_message_.get() == nullptr);

SetReadState(READ_STATE_READ);

}

return net::OK;