commit 37f5ecfd8f3337475872c9242221471784894f1c
author deadbeef <deadbeef@webrtc.org> Mon Feb 27 22:06:41 2017
committer Commit bot <commit-bot@chromium.org> Mon Feb 27 22:06:41 2017
tree dfd792b3d1ba6fbd819a3afedd1eb110e58a6d9e
parent c5da4785f346dc32e6219fa689d6cd619e55f114

Replace NULL with nullptr or null in webrtc/base/.

BUG=webrtc:7147

Review-Url: https://codereview.webrtc.org/2718663005
Cr-Commit-Position: refs/heads/master@{#16878}

webrtc/base/asynctcpsocket.cc

diff --git a/webrtc/base/asynctcpsocket.cc b/webrtc/base/asynctcpsocket.cc
index 0b92b38..658541c 100644
--- a/webrtc/base/asynctcpsocket.cc
+++ b/webrtc/base/asynctcpsocket.cc
@@ -47,11 +47,11 @@
   std::unique_ptr<rtc::AsyncSocket> owned_socket(socket);
   if (socket->Bind(bind_address) < 0) {
     LOG(LS_ERROR) << "Bind() failed with error " << socket->GetError();
-    return NULL;
+    return nullptr;
   }
   if (socket->Connect(remote_address) < 0) {
     LOG(LS_ERROR) << "Connect() failed with error " << socket->GetError();
-    return NULL;
+    return nullptr;
   }
   return owned_socket.release();
 }
@@ -67,7 +67,7 @@
     inbuf_.EnsureCapacity(kMinimumRecvSize);
   }
 
-  RTC_DCHECK(socket_.get() != NULL);
+  RTC_DCHECK(socket_.get() != nullptr);
   socket_->SignalConnectEvent.connect(
       this, &AsyncTCPSocketBase::OnConnectEvent);
   socket_->SignalReadEvent.connect(this, &AsyncTCPSocketBase::OnReadEvent);
@@ -260,7 +260,7 @@
 
 // AsyncTCPSocket
 // Binds and connects |socket| and creates AsyncTCPSocket for
-// it. Takes ownership of |socket|. Returns NULL if bind() or
+// it. Takes ownership of |socket|. Returns null if bind() or
 // connect() fail (|socket| is destroyed in that case).
 AsyncTCPSocket* AsyncTCPSocket::Create(
     AsyncSocket* socket,