Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Unified Diff: webrtc/base/win32window_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/win32window.cc ('k') | webrtc/base/winping.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/win32window_unittest.cc
diff --git a/webrtc/base/win32window_unittest.cc b/webrtc/base/win32window_unittest.cc
index 3738a7f4a50fb8cd1ab5c6be9e6a1de7fd01481c..f814752e39f744bf07b250bf7703c3af3aff8d9c 100644
--- a/webrtc/base/win32window_unittest.cc
+++ b/webrtc/base/win32window_unittest.cc
@@ -39,16 +39,16 @@ class TestWindow : public rtc::Win32Window {
TEST(Win32WindowTest, Basics) {
TestWindow wnd;
- EXPECT_TRUE(wnd.handle() == NULL);
+ EXPECT_TRUE(wnd.handle() == nullptr);
EXPECT_FALSE(wnd.destroyed());
EXPECT_TRUE(wnd.Create(0, L"Test", 0, 0, 0, 0, 100, 100));
- EXPECT_TRUE(wnd.handle() != NULL);
+ EXPECT_TRUE(wnd.handle() != nullptr);
EXPECT_EQ(kDummyResult, ::SendMessage(wnd.handle(), WM_USER, 1, 2));
EXPECT_EQ(static_cast<UINT>(WM_USER), wnd.msg().message);
EXPECT_EQ(1u, wnd.msg().wParam);
EXPECT_EQ(2l, wnd.msg().lParam);
wnd.Destroy();
- EXPECT_TRUE(wnd.handle() == NULL);
+ EXPECT_TRUE(wnd.handle() == nullptr);
EXPECT_TRUE(wnd.destroyed());
}
@@ -56,10 +56,10 @@ TEST(Win32WindowTest, MultipleWindows) {
TestWindow wnd1, wnd2;
EXPECT_TRUE(wnd1.Create(0, L"Test", 0, 0, 0, 0, 100, 100));
EXPECT_TRUE(wnd2.Create(0, L"Test", 0, 0, 0, 0, 100, 100));
- EXPECT_TRUE(wnd1.handle() != NULL);
- EXPECT_TRUE(wnd2.handle() != NULL);
+ EXPECT_TRUE(wnd1.handle() != nullptr);
+ EXPECT_TRUE(wnd2.handle() != nullptr);
wnd1.Destroy();
wnd2.Destroy();
- EXPECT_TRUE(wnd2.handle() == NULL);
- EXPECT_TRUE(wnd1.handle() == NULL);
+ EXPECT_TRUE(wnd2.handle() == nullptr);
+ EXPECT_TRUE(wnd1.handle() == nullptr);
}
« no previous file with comments | « webrtc/base/win32window.cc ('k') | webrtc/base/winping.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698