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

Unified Diff: webrtc/base/thread_unittest.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. 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
Index: webrtc/base/thread_unittest.cc
diff --git a/webrtc/base/thread_unittest.cc b/webrtc/base/thread_unittest.cc
index b0c8cb59af952a3f7afea26702d758934987bdac..88915e9d1e4deeb50257c0e81a41811ae84fc954 100644
--- a/webrtc/base/thread_unittest.cc
+++ b/webrtc/base/thread_unittest.cc
@@ -243,7 +243,7 @@ TEST(ThreadTest, Names) {
delete thread;
thread = new Thread();
// Name with no object parameter
- EXPECT_TRUE(thread->SetName("No object", NULL));
+ EXPECT_TRUE(thread->SetName("No object", nullptr));
EXPECT_TRUE(thread->Start());
thread->Stop();
delete thread;
@@ -292,7 +292,7 @@ TEST(ThreadTest, Invoke) {
TEST(ThreadTest, TwoThreadsInvokeNoDeadlock) {
AutoThread thread;
Thread* current_thread = Thread::Current();
- ASSERT_TRUE(current_thread != NULL);
+ ASSERT_TRUE(current_thread != nullptr);
Thread other_thread;
other_thread.Start();
@@ -441,7 +441,7 @@ class AsyncInvokeTest : public testing::Test {
AsyncInvokeTest()
: int_value_(0),
invoke_started_(true, false),
- expected_thread_(NULL) {}
+ expected_thread_(nullptr) {}
int int_value_;
Event invoke_started_;
@@ -751,7 +751,7 @@ class ComThreadTest : public testing::Test, public MessageHandler {
ComThreadTest() : done_(false) {}
protected:
virtual void OnMessage(Message* message) {
- HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+ HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
// S_FALSE means the thread was already inited for a multithread apartment.
EXPECT_EQ(S_FALSE, hr);
if (SUCCEEDED(hr)) {

Powered by Google App Engine
This is Rietveld 408576698