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

Side by Side Diff: webrtc/base/event_tracer_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/event.cc ('k') | webrtc/base/fileutils.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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 14 matching lines...) Expand all
25 events_logged_ = 0; 25 events_logged_ = 0;
26 } 26 }
27 27
28 void Increment() { 28 void Increment() {
29 ++events_logged_; 29 ++events_logged_;
30 } 30 }
31 31
32 int Count() const { return events_logged_; } 32 int Count() const { return events_logged_; }
33 33
34 static TestStatistics* Get() { 34 static TestStatistics* Get() {
35 static TestStatistics* test_stats = NULL; 35 static TestStatistics* test_stats = nullptr;
36 if (!test_stats) 36 if (!test_stats)
37 test_stats = new TestStatistics(); 37 test_stats = new TestStatistics();
38 return test_stats; 38 return test_stats;
39 } 39 }
40 40
41 private: 41 private:
42 int events_logged_; 42 int events_logged_;
43 }; 43 };
44 44
45 static const unsigned char* GetCategoryEnabledHandler(const char* name) { 45 static const unsigned char* GetCategoryEnabledHandler(const char* name) {
(...skipping 27 matching lines...) Expand all
73 TEST(EventTracerTest, ScopedTraceEvent) { 73 TEST(EventTracerTest, ScopedTraceEvent) {
74 SetupEventTracer(&GetCategoryEnabledHandler, &AddTraceEventHandler); 74 SetupEventTracer(&GetCategoryEnabledHandler, &AddTraceEventHandler);
75 { 75 {
76 TRACE_EVENT0("test", "ScopedTraceEvent"); 76 TRACE_EVENT0("test", "ScopedTraceEvent");
77 } 77 }
78 EXPECT_EQ(2, TestStatistics::Get()->Count()); 78 EXPECT_EQ(2, TestStatistics::Get()->Count());
79 TestStatistics::Get()->Reset(); 79 TestStatistics::Get()->Reset();
80 } 80 }
81 81
82 } // namespace webrtc 82 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/base/event.cc ('k') | webrtc/base/fileutils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698