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

diff --git a/webrtc/base/proxy_unittest.cc b/webrtc/base/proxy_unittest.cc
index 5c5a748..b72d228 100644
--- a/webrtc/base/proxy_unittest.cc
+++ b/webrtc/base/proxy_unittest.cc
@@ -31,16 +31,14 @@
 // Sets up a virtual socket server and HTTPS/SOCKS5 proxy servers.
 class ProxyTest : public testing::Test {
  public:
-  ProxyTest() : ss_(new rtc::VirtualSocketServer(NULL)) {
+  ProxyTest() : ss_(new rtc::VirtualSocketServer(nullptr)) {
     Thread::Current()->set_socketserver(ss_.get());
     socks_.reset(new rtc::SocksProxyServer(
         ss_.get(), kSocksProxyIntAddr, ss_.get(), kSocksProxyExtAddr));
     https_.reset(new rtc::HttpListenServer());
     https_->Listen(kHttpsProxyIntAddr);
   }
-  ~ProxyTest() {
-    Thread::Current()->set_socketserver(NULL);
-  }
+  ~ProxyTest() { Thread::Current()->set_socketserver(nullptr); }
 
   rtc::SocketServer* ss() { return ss_.get(); }
 
@@ -65,7 +63,7 @@
 
   rtc::AsyncTCPSocket* packet_socket = rtc::AsyncTCPSocket::Create(
       proxy_socket, SocketAddress(INADDR_ANY, 0), server.address());
-  EXPECT_TRUE(packet_socket != NULL);
+  EXPECT_TRUE(packet_socket != nullptr);
   rtc::TestClient client(packet_socket);
 
   EXPECT_EQ(Socket::CS_CONNECTING, proxy_socket->GetState());
@@ -73,6 +71,6 @@
   EXPECT_EQ(Socket::CS_CONNECTED, proxy_socket->GetState());
   EXPECT_EQ(server.address(), client.remote_address());
   client.Send("foo", 3);
-  EXPECT_TRUE(client.CheckNextPacket("foo", 3, NULL));
+  EXPECT_TRUE(client.CheckNextPacket("foo", 3, nullptr));
   EXPECT_TRUE(client.CheckNoPacket());
 }