Index: extensions/browser/api/socket/tcp_socket.cc |
diff --git a/extensions/browser/api/socket/tcp_socket.cc b/extensions/browser/api/socket/tcp_socket.cc |
index 28ce6df8ac0539f31a1c1b8047df4ef16faf8464..2bf755adbce8bb336117f5fce53ed00e56683bf1 100644 |
--- a/extensions/browser/api/socket/tcp_socket.cc |
+++ b/extensions/browser/api/socket/tcp_socket.cc |
@@ -102,7 +102,7 @@ void TCPSocket::Connect(const std::string& address, |
} |
socket_.reset( |
- new net::TCPClientSocket(address_list, NULL, net::NetLog::Source())); |
+ new net::TCPClientSocket(address_list, nullptr, net::NetLog::Source())); |
connect_callback_ = callback; |
result = socket_->Connect( |
@@ -117,11 +117,11 @@ void TCPSocket::Disconnect() { |
is_connected_ = false; |
if (socket_.get()) |
socket_->Disconnect(); |
- server_socket_.reset(NULL); |
+ server_socket_.reset(nullptr); |
connect_callback_.Reset(); |
read_callback_.Reset(); |
accept_callback_.Reset(); |
- accept_socket_.reset(NULL); |
+ accept_socket_.reset(nullptr); |
} |
int TCPSocket::Bind(const std::string& address, int port) { |
@@ -132,22 +132,22 @@ void TCPSocket::Read(int count, const ReadCompletionCallback& callback) { |
DCHECK(!callback.is_null()); |
if (socket_mode_ != CLIENT) { |
- callback.Run(net::ERR_FAILED, NULL); |
+ callback.Run(net::ERR_FAILED, nullptr); |
return; |
} |
if (!read_callback_.is_null()) { |
- callback.Run(net::ERR_IO_PENDING, NULL); |
+ callback.Run(net::ERR_IO_PENDING, nullptr); |
return; |
} |
if (count < 0) { |
- callback.Run(net::ERR_INVALID_ARGUMENT, NULL); |
+ callback.Run(net::ERR_INVALID_ARGUMENT, nullptr); |
return; |
} |
if (!socket_.get() || !IsConnected()) { |
- callback.Run(net::ERR_SOCKET_NOT_CONNECTED, NULL); |
+ callback.Run(net::ERR_SOCKET_NOT_CONNECTED, nullptr); |
return; |
} |
@@ -165,7 +165,7 @@ void TCPSocket::Read(int count, const ReadCompletionCallback& callback) { |
void TCPSocket::RecvFrom(int count, |
const RecvFromCompletionCallback& callback) { |
- callback.Run(net::ERR_FAILED, NULL, NULL, 0); |
+ callback.Run(net::ERR_FAILED, nullptr, nullptr, 0); |
} |
void TCPSocket::SendTo(scoped_refptr<net::IOBuffer> io_buffer, |
@@ -200,7 +200,8 @@ int TCPSocket::Listen(const std::string& address, |
socket_mode_ = SERVER; |
if (!server_socket_.get()) { |
- server_socket_.reset(new net::TCPServerSocket(NULL, net::NetLog::Source())); |
+ server_socket_.reset( |
+ new net::TCPServerSocket(nullptr, net::NetLog::Source())); |
} |
int result = server_socket_->ListenWithAddressAndPort(address, port, backlog); |
@@ -211,13 +212,13 @@ int TCPSocket::Listen(const std::string& address, |
void TCPSocket::Accept(const AcceptCompletionCallback& callback) { |
if (socket_mode_ != SERVER || !server_socket_.get()) { |
- callback.Run(net::ERR_FAILED, NULL); |
+ callback.Run(net::ERR_FAILED, nullptr); |
return; |
} |
// Limits to only 1 blocked accept call. |
if (!accept_callback_.is_null()) { |
- callback.Run(net::ERR_FAILED, NULL); |
+ callback.Run(net::ERR_FAILED, nullptr); |
return; |
} |
@@ -230,7 +231,7 @@ void TCPSocket::Accept(const AcceptCompletionCallback& callback) { |
accept_callback_ = callback; |
this->OnAccept(result); |
} else { |
- callback.Run(result, NULL); |
+ callback.Run(result, nullptr); |
} |
} |
@@ -299,7 +300,7 @@ void TCPSocket::OnAccept(int result) { |
accept_callback_.Run( |
result, static_cast<net::TCPClientSocket*>(accept_socket_.release())); |
} else { |
- accept_callback_.Run(result, NULL); |
+ accept_callback_.Run(result, nullptr); |
} |
accept_callback_.Reset(); |
} |
@@ -326,7 +327,7 @@ void TCPSocket::Release() { |
net::TCPClientSocket* TCPSocket::ClientStream() { |
if (socket_mode_ != CLIENT || GetSocketType() != TYPE_TCP) |
- return NULL; |
+ return nullptr; |
return socket_.get(); |
} |