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/socketstream.cc

diff --git a/webrtc/base/socketstream.cc b/webrtc/base/socketstream.cc
index 9407c96..a218dd8 100644
--- a/webrtc/base/socketstream.cc
+++ b/webrtc/base/socketstream.cc
@@ -14,7 +14,7 @@
 
 namespace rtc {
 
-SocketStream::SocketStream(AsyncSocket* socket) : socket_(NULL) {
+SocketStream::SocketStream(AsyncSocket* socket) : socket_(nullptr) {
   Attach(socket);
 }
 
@@ -41,13 +41,13 @@
     socket_->SignalReadEvent.disconnect(this);
     socket_->SignalWriteEvent.disconnect(this);
     socket_->SignalCloseEvent.disconnect(this);
-    socket_ = NULL;
+    socket_ = nullptr;
   }
   return socket;
 }
 
 StreamState SocketStream::GetState() const {
-  RTC_DCHECK(socket_ != NULL);
+  RTC_DCHECK(socket_ != nullptr);
   switch (socket_->GetState()) {
     case Socket::CS_CONNECTED:
       return SS_OPEN;
@@ -61,7 +61,7 @@
 
 StreamResult SocketStream::Read(void* buffer, size_t buffer_len,
                                 size_t* read, int* error) {
-  RTC_DCHECK(socket_ != NULL);
+  RTC_DCHECK(socket_ != nullptr);
   int result = socket_->Recv(buffer, buffer_len, nullptr);
   if (result < 0) {
     if (socket_->IsBlocking())
@@ -80,7 +80,7 @@
 
 StreamResult SocketStream::Write(const void* data, size_t data_len,
                                  size_t* written, int* error) {
-  RTC_DCHECK(socket_ != NULL);
+  RTC_DCHECK(socket_ != nullptr);
   int result = socket_->Send(data, data_len);
   if (result < 0) {
     if (socket_->IsBlocking())
@@ -95,7 +95,7 @@
 }
 
 void SocketStream::Close() {
-  RTC_DCHECK(socket_ != NULL);
+  RTC_DCHECK(socket_ != nullptr);
   socket_->Close();
 }