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

Side by Side Diff: webrtc/base/signalthread_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « webrtc/base/signalthread.cc ('k') | webrtc/base/sigslot.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 18 matching lines...) Expand all
29 29
30 virtual ~SlowSignalThread() { 30 virtual ~SlowSignalThread() {
31 EXPECT_EQ(harness_->main_thread_, Thread::Current()); 31 EXPECT_EQ(harness_->main_thread_, Thread::Current());
32 ++harness_->thread_deleted_; 32 ++harness_->thread_deleted_;
33 } 33 }
34 34
35 const SignalThreadTest* harness() { return harness_; } 35 const SignalThreadTest* harness() { return harness_; }
36 36
37 protected: 37 protected:
38 virtual void OnWorkStart() { 38 virtual void OnWorkStart() {
39 ASSERT_TRUE(harness_ != NULL); 39 ASSERT_TRUE(harness_ != nullptr);
40 ++harness_->thread_started_; 40 ++harness_->thread_started_;
41 EXPECT_EQ(harness_->main_thread_, Thread::Current()); 41 EXPECT_EQ(harness_->main_thread_, Thread::Current());
42 EXPECT_FALSE(worker()->RunningForTest()); // not started yet 42 EXPECT_FALSE(worker()->RunningForTest()); // not started yet
43 } 43 }
44 44
45 virtual void OnWorkStop() { 45 virtual void OnWorkStop() {
46 ++harness_->thread_stopped_; 46 ++harness_->thread_stopped_;
47 EXPECT_EQ(harness_->main_thread_, Thread::Current()); 47 EXPECT_EQ(harness_->main_thread_, Thread::Current());
48 EXPECT_TRUE(worker()->RunningForTest()); // not stopped yet 48 EXPECT_TRUE(worker()->RunningForTest()); // not stopped yet
49 } 49 }
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 EXPECT_STATE(1, 0, 0, 1, 1); 196 EXPECT_STATE(1, 0, 0, 1, 1);
197 } 197 }
198 198
199 TEST_F(SignalThreadTest, DeferredDestroyedThreadCleansUp) { 199 TEST_F(SignalThreadTest, DeferredDestroyedThreadCleansUp) {
200 thread_->Start(); 200 thread_->Start();
201 EXPECT_STATE(1, 0, 0, 0, 0); 201 EXPECT_STATE(1, 0, 0, 0, 0);
202 thread_->Destroy(false); 202 thread_->Destroy(false);
203 EXPECT_STATE(1, 0, 0, 1, 0); 203 EXPECT_STATE(1, 0, 0, 1, 0);
204 EXPECT_STATE_WAIT(1, 1, 0, 1, 1, kTimeout); 204 EXPECT_STATE_WAIT(1, 1, 0, 1, 1, kTimeout);
205 } 205 }
OLDNEW
« no previous file with comments | « webrtc/base/signalthread.cc ('k') | webrtc/base/sigslot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698