Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
index 6979cd87d881b0c5095c19d21b6e7141f3d7d923..b1dd5386ce42593b25b48e8341d8bcce4db65547 100644 |
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc |
@@ -96,7 +96,7 @@ const base::FilePath::CharType* g_test_video_data = |
// The file path of the test output log. This is used to communicate the test |
// results to CrOS autotests. We can enable the log and specify the filename by |
// the "--output_log" switch. |
-const base::FilePath::CharType* g_output_log = NULL; |
+const base::FilePath::CharType* g_output_log = nullptr; |
// The value is set by the switch "--rendering_fps". |
double g_rendering_fps = 60; |
@@ -1065,8 +1065,8 @@ TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) { |
const bool suppress_rendering = g_rendering_fps == 0; |
std::vector<ClientStateNotification<ClientState>*> |
- notes(num_concurrent_decoders, NULL); |
- std::vector<GLRenderingVDAClient*> clients(num_concurrent_decoders, NULL); |
+ notes(num_concurrent_decoders, nullptr); |
+ std::vector<GLRenderingVDAClient*> clients(num_concurrent_decoders, nullptr); |
RenderingHelperParams helper_params; |
helper_params.rendering_fps = g_rendering_fps; |
@@ -1238,7 +1238,7 @@ TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) { |
// Output the frame delivery time to file |
// We can only make performance/correctness assertions if the decoder was |
// allowed to finish. |
- if (g_output_log != NULL && delete_decoder_state >= CS_FLUSHED) { |
+ if (g_output_log != nullptr && delete_decoder_state >= CS_FLUSHED) { |
base::File output_file( |
base::FilePath(g_output_log), |
base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE); |
@@ -1373,7 +1373,7 @@ TEST_F(VideoDecodeAcceleratorTest, TestDecodeTimeMedian) { |
decode_time_median.InMicroseconds()); |
LOG(INFO) << output_string; |
- if (g_output_log != NULL) |
+ if (g_output_log != nullptr) |
OutputLogFile(g_output_log, output_string); |
rendering_loop_proxy_->DeleteSoon(FROM_HERE, client); |