Mojo: NULL -> nullptr in mojo/system and mojo/embedder.

mojo/system/channel.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/system/channel.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 228 matching lines @@
     base::AutoLock locker_(lock_);
     if (!is_running_)
       return;
 
     IdToEndpointMap::iterator it = local_id_to_endpoint_map_.find(local_id);
     DCHECK(it != local_id_to_endpoint_map_.end());
 
     switch (it->second->state_) {
       case ChannelEndpoint::STATE_NORMAL:
         it->second->state_ = ChannelEndpoint::STATE_WAIT_REMOTE_REMOVE_ACK;
-        it->second->message_pipe_ = NULL;
+        it->second->message_pipe_ = nullptr;
         if (remote_id == MessageInTransit::kInvalidEndpointId)
           return;
         // We have to send a remove message (outside the lock).
         break;
       case ChannelEndpoint::STATE_WAIT_LOCAL_DETACH:
         endpoint_to_detach = it->second;
         local_id_to_endpoint_map_.erase(it);
         // We have to detach (outside the lock).
         break;
       case ChannelEndpoint::STATE_WAIT_REMOTE_REMOVE_ACK:
@@ skipping 228 matching lines @@
     if (it == local_id_to_endpoint_map_.end()) {
       DVLOG(2) << "Remove message pipe error: not found";
       return false;
     }
 
     switch (it->second->state_) {
       case ChannelEndpoint::STATE_NORMAL:
         it->second->state_ = ChannelEndpoint::STATE_WAIT_LOCAL_DETACH;
         message_pipe = it->second->message_pipe_;
         port = it->second->port_;
-        it->second->message_pipe_ = NULL;
+        it->second->message_pipe_ = nullptr;
         // We have to send a remove ack message (outside the lock).
         break;
       case ChannelEndpoint::STATE_WAIT_LOCAL_DETACH:
         DVLOG(2) << "Remove message pipe error: wrong state";
         return false;
       case ChannelEndpoint::STATE_WAIT_REMOTE_REMOVE_ACK:
         endpoint_to_detach = it->second;
         local_id_to_endpoint_map_.erase(it);
         // We have to detach (outside the lock).
         break;
@@ skipping 18 matching lines @@
   message_pipe->OnRemove(port);
 
   return true;
 }
 
 bool Channel::SendControlMessage(MessageInTransit::Subtype subtype,
                                  MessageInTransit::EndpointId local_id,
                                  MessageInTransit::EndpointId remote_id) {
   DVLOG(2) << "Sending channel control message: subtype " << subtype
            << ", local ID " << local_id << ", remote ID " << remote_id;
-  scoped_ptr<MessageInTransit> message(
-      new MessageInTransit(MessageInTransit::kTypeChannel, subtype, 0, NULL));
+  scoped_ptr<MessageInTransit> message(new MessageInTransit(
+      MessageInTransit::kTypeChannel, subtype, 0, nullptr));
   message->set_source_id(local_id);
   message->set_destination_id(remote_id);
   return WriteMessage(message.Pass());
 }
 
 void Channel::HandleRemoteError(const base::StringPiece& error_message) {
   // TODO(vtl): Is this how we really want to handle this? Probably we want to
   // terminate the connection, since it's spewing invalid stuff.
   LOG(WARNING) << error_message;
 }
 
 void Channel::HandleLocalError(const base::StringPiece& error_message) {
   // TODO(vtl): Is this how we really want to handle this?
   // Sometimes we'll want to propagate the error back to the message pipe
   // (endpoint), and notify it that the remote is (effectively) closed.
   // Sometimes we'll want to kill the channel (and notify all the endpoints that
   // their remotes are dead.
   LOG(WARNING) << error_message;
 }
 
 }  // namespace system
 }  // namespace mojo