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}
diff --git a/webrtc/base/win32socketserver_unittest.cc b/webrtc/base/win32socketserver_unittest.cc
index f40fd5f..94d96da 100644
--- a/webrtc/base/win32socketserver_unittest.cc
+++ b/webrtc/base/win32socketserver_unittest.cc
@@ -16,7 +16,7 @@
// Test that Win32SocketServer::Wait works as expected.
TEST(Win32SocketServerTest, TestWait) {
- Win32SocketServer server(NULL);
+ Win32SocketServer server(nullptr);
uint32_t start = Time();
server.Wait(1000, true);
EXPECT_GE(TimeSince(start), 1000);
@@ -24,12 +24,12 @@
// Test that Win32Socket::Pump does not touch general Windows messages.
TEST(Win32SocketServerTest, TestPump) {
- Win32SocketServer server(NULL);
+ Win32SocketServer server(nullptr);
SocketServerScope scope(&server);
- EXPECT_EQ(TRUE, PostMessage(NULL, WM_USER, 999, 0));
+ EXPECT_EQ(TRUE, PostMessage(nullptr, WM_USER, 999, 0));
server.Pump();
MSG msg;
- EXPECT_EQ(TRUE, PeekMessage(&msg, NULL, WM_USER, 0, PM_REMOVE));
+ EXPECT_EQ(TRUE, PeekMessage(&msg, nullptr, WM_USER, 0, PM_REMOVE));
EXPECT_EQ(static_cast<UINT>(WM_USER), msg.message);
EXPECT_EQ(999u, msg.wParam);
}
@@ -37,7 +37,7 @@
// Test that Win32Socket passes all the generic Socket tests.
class Win32SocketTest : public SocketTest {
protected:
- Win32SocketTest() : server_(NULL), scope_(&server_) {}
+ Win32SocketTest() : server_(nullptr), scope_(&server_) {}
Win32SocketServer server_;
SocketServerScope scope_;
};