commit 37f5ecfd8f3337475872c9242221471784894f1c
author deadbeef <deadbeef@webrtc.org> Mon Feb 27 14:06:41 2017 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 27 22:06:41 2017 +0000
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/socket_unittest.cc

diff --git a/webrtc/base/socket_unittest.cc b/webrtc/base/socket_unittest.cc
index 16edf90..4a59a16 100644
--- a/webrtc/base/socket_unittest.cc
+++ b/webrtc/base/socket_unittest.cc
@@ -224,7 +224,7 @@
 
   // Ensure no pending server connections, since we haven't done anything yet.
   EXPECT_FALSE(sink.Check(server.get(), testing::SSE_READ));
-  EXPECT_TRUE(NULL == server->Accept(&accept_addr));
+  EXPECT_TRUE(nullptr == server->Accept(&accept_addr));
   EXPECT_TRUE(accept_addr.IsNil());
 
   // Attempt connect to listening socket.
@@ -335,7 +335,7 @@
 
   // Should be no pending server connections.
   EXPECT_FALSE(sink.Check(server.get(), testing::SSE_READ));
-  EXPECT_TRUE(NULL == server->Accept(&accept_addr));
+  EXPECT_TRUE(nullptr == server->Accept(&accept_addr));
   EXPECT_EQ(IPAddress(), accept_addr.ipaddr());
 }
 
@@ -376,7 +376,7 @@
   EXPECT_TRUE(client->GetRemoteAddress().IsNil());
   // Should be no pending server connections.
   EXPECT_FALSE(sink.Check(server.get(), testing::SSE_READ));
-  EXPECT_TRUE(NULL == server->Accept(&accept_addr));
+  EXPECT_TRUE(nullptr == server->Accept(&accept_addr));
   EXPECT_TRUE(accept_addr.IsNil());
 }