| Index: extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
|
| diff --git a/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc b/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
|
| index 6a7204c1dd9b4ff97e778d4e3632bc164e4ba0dc..036439b453d6076699bc1990c97b4e4701157e08 100644
|
| --- a/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
|
| +++ b/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
|
| @@ -157,7 +157,8 @@ void SocketsTcpUpdateFunction::Work() {
|
| }
|
|
|
| SocketsTcpSetPausedFunction::SocketsTcpSetPausedFunction()
|
| - : socket_event_dispatcher_(NULL) {}
|
| + : socket_event_dispatcher_(nullptr) {
|
| +}
|
|
|
| SocketsTcpSetPausedFunction::~SocketsTcpSetPausedFunction() {}
|
|
|
| @@ -171,7 +172,7 @@ bool SocketsTcpSetPausedFunction::Prepare() {
|
| "If this assertion is failing during a test, then it is likely that "
|
| "TestExtensionSystem is failing to provide an instance of "
|
| "TCPSocketEventDispatcher.";
|
| - return socket_event_dispatcher_ != NULL;
|
| + return socket_event_dispatcher_ != nullptr;
|
| }
|
|
|
| void SocketsTcpSetPausedFunction::Work() {
|
| @@ -243,7 +244,8 @@ void SocketsTcpSetNoDelayFunction::Work() {
|
| }
|
|
|
| SocketsTcpConnectFunction::SocketsTcpConnectFunction()
|
| - : socket_event_dispatcher_(NULL) {}
|
| + : socket_event_dispatcher_(nullptr) {
|
| +}
|
|
|
| SocketsTcpConnectFunction::~SocketsTcpConnectFunction() {}
|
|
|
| @@ -257,7 +259,7 @@ bool SocketsTcpConnectFunction::Prepare() {
|
| "If this assertion is failing during a test, then it is likely that "
|
| "TestExtensionSystem is failing to provide an instance of "
|
| "TCPSocketEventDispatcher.";
|
| - return socket_event_dispatcher_ != NULL;
|
| + return socket_event_dispatcher_ != nullptr;
|
| }
|
|
|
| void SocketsTcpConnectFunction::AsyncWorkStart() {
|
| @@ -436,7 +438,7 @@ bool SocketsTcpGetSocketsFunction::Prepare() { return true; }
|
| void SocketsTcpGetSocketsFunction::Work() {
|
| std::vector<linked_ptr<sockets_tcp::SocketInfo> > socket_infos;
|
| base::hash_set<int>* resource_ids = GetSocketIds();
|
| - if (resource_ids != NULL) {
|
| + if (resource_ids != nullptr) {
|
| for (base::hash_set<int>::iterator it = resource_ids->begin();
|
| it != resource_ids->end();
|
| ++it) {
|
| @@ -483,7 +485,7 @@ void SocketsTcpSecureFunction::AsyncWorkStart() {
|
| // Make sure it's a connected TCP client socket. Error out if it's already
|
| // secure()'d.
|
| if (socket->GetSocketType() != Socket::TYPE_TCP ||
|
| - socket->ClientStream() == NULL) {
|
| + socket->ClientStream() == nullptr) {
|
| SetResult(new base::FundamentalValue(net::ERR_INVALID_ARGUMENT));
|
| error_ = kInvalidSocketStateError;
|
| AsyncWorkCompleted();
|
| @@ -529,7 +531,7 @@ void SocketsTcpSecureFunction::AsyncWorkStart() {
|
| void SocketsTcpSecureFunction::TlsConnectDone(scoped_ptr<TLSSocket> socket,
|
| int result) {
|
| // If an error occurred, socket MUST be NULL
|
| - DCHECK(result == net::OK || socket == NULL);
|
| + DCHECK(result == net::OK || socket == nullptr);
|
|
|
| if (socket && result == net::OK) {
|
| socket->set_persistent(persistent_);
|
|
|