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

Side by Side Diff: webrtc/base/unittest_main.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/transformadapter.cc ('k') | webrtc/base/unixfilesystem.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 2007 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2007 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 *retval = 0; 59 *retval = 0;
60 return TRUE; 60 return TRUE;
61 } 61 }
62 } 62 }
63 #endif // WEBRTC_WIN 63 #endif // WEBRTC_WIN
64 64
65 int main(int argc, char** argv) { 65 int main(int argc, char** argv) {
66 testing::InitGoogleTest(&argc, argv); 66 testing::InitGoogleTest(&argc, argv);
67 rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, false); 67 rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, false);
68 if (FLAG_help) { 68 if (FLAG_help) {
69 rtc::FlagList::Print(NULL, false); 69 rtc::FlagList::Print(nullptr, false);
70 return 0; 70 return 0;
71 } 71 }
72 72
73 webrtc::test::SetExecutablePath(argv[0]); 73 webrtc::test::SetExecutablePath(argv[0]);
74 webrtc::test::InitFieldTrialsFromString(FLAG_force_fieldtrials); 74 webrtc::test::InitFieldTrialsFromString(FLAG_force_fieldtrials);
75 75
76 #if defined(WEBRTC_WIN) 76 #if defined(WEBRTC_WIN)
77 if (!FLAG_default_error_handlers) { 77 if (!FLAG_default_error_handlers) {
78 // Make sure any errors don't throw dialogs hanging the test run. 78 // Make sure any errors don't throw dialogs hanging the test run.
79 _set_invalid_parameter_handler(TestInvalidParameterHandler); 79 _set_invalid_parameter_handler(TestInvalidParameterHandler);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 #if defined(WEBRTC_WIN) 116 #if defined(WEBRTC_WIN)
117 // Unhook crt function so that we don't ever log after statics have been 117 // Unhook crt function so that we don't ever log after statics have been
118 // uninitialized. 118 // uninitialized.
119 if (!FLAG_default_error_handlers) 119 if (!FLAG_default_error_handlers)
120 _CrtSetReportHook2(_CRT_RPTHOOK_REMOVE, TestCrtReportHandler); 120 _CrtSetReportHook2(_CRT_RPTHOOK_REMOVE, TestCrtReportHandler);
121 #endif 121 #endif
122 122
123 return res; 123 return res;
124 } 124 }
OLDNEW
« no previous file with comments | « webrtc/base/transformadapter.cc ('k') | webrtc/base/unixfilesystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698