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

Unified Diff: webrtc/base/messagequeue_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/messagequeue.cc ('k') | webrtc/base/nat_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/messagequeue_unittest.cc
diff --git a/webrtc/base/messagequeue_unittest.cc b/webrtc/base/messagequeue_unittest.cc
index 8834ab57ef177ad100536fa587250a8be1b349ac..9652bb38d533cd296c9b0859d251eb6191e1bc93 100644
--- a/webrtc/base/messagequeue_unittest.cc
+++ b/webrtc/base/messagequeue_unittest.cc
@@ -57,13 +57,13 @@ struct DeletedLockChecker {
static void DelayedPostsWithIdenticalTimesAreProcessedInFifoOrder(
MessageQueue* q) {
- EXPECT_TRUE(q != NULL);
+ EXPECT_TRUE(q != nullptr);
int64_t now = TimeMillis();
- q->PostAt(RTC_FROM_HERE, now, NULL, 3);
- q->PostAt(RTC_FROM_HERE, now - 2, NULL, 0);
- q->PostAt(RTC_FROM_HERE, now - 1, NULL, 1);
- q->PostAt(RTC_FROM_HERE, now, NULL, 4);
- q->PostAt(RTC_FROM_HERE, now - 1, NULL, 2);
+ q->PostAt(RTC_FROM_HERE, now, nullptr, 3);
+ q->PostAt(RTC_FROM_HERE, now - 2, nullptr, 0);
+ q->PostAt(RTC_FROM_HERE, now - 1, nullptr, 1);
+ q->PostAt(RTC_FROM_HERE, now, nullptr, 4);
+ q->PostAt(RTC_FROM_HERE, now - 1, nullptr, 2);
Message msg;
for (size_t i=0; i<5; ++i) {
@@ -120,7 +120,7 @@ TEST_F(MessageQueueTest, DiposeHandlerWithPostedMessagePending) {
}
struct UnwrapMainThreadScope {
- UnwrapMainThreadScope() : rewrap_(Thread::Current() != NULL) {
+ UnwrapMainThreadScope() : rewrap_(Thread::Current() != nullptr) {
if (rewrap_) ThreadManager::Instance()->UnwrapCurrentThread();
}
~UnwrapMainThreadScope() {
« no previous file with comments | « webrtc/base/messagequeue.cc ('k') | webrtc/base/nat_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698