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

Unified Diff: webrtc/tools/frame_editing/frame_editing_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/tools/frame_editing/frame_editing_unittest.cc
diff --git a/webrtc/tools/frame_editing/frame_editing_unittest.cc b/webrtc/tools/frame_editing/frame_editing_unittest.cc
index d61ec00bd78009e85cd6f6b6a1af09d52264a12b..01843e8df5451eb2177360bc9d103643dcacfd84 100644
--- a/webrtc/tools/frame_editing/frame_editing_unittest.cc
+++ b/webrtc/tools/frame_editing/frame_editing_unittest.cc
@@ -34,7 +34,7 @@ class FrameEditingTest : public ::testing::Test {
"frame_editing_unittest.yuv");
original_fid_ = fopen(reference_video_.c_str(), "rb");
- ASSERT_TRUE(original_fid_ != NULL);
+ ASSERT_TRUE(original_fid_ != nullptr);
// Ensure the output file exists on disk.
std::ofstream(test_video_.c_str(), std::ios::out);
@@ -42,7 +42,7 @@ class FrameEditingTest : public ::testing::Test {
// TODO(holmer): Figure out why this file has to be opened here (test fails
// if it's opened after the write operation performed in EditFrames).
edited_fid_ = fopen(test_video_.c_str(), "rb");
- ASSERT_TRUE(edited_fid_ != NULL);
+ ASSERT_TRUE(edited_fid_ != nullptr);
original_buffer_.reset(new int[kFrameSize]);
edited_buffer_.reset(new int[kFrameSize]);

Powered by Google App Engine
This is Rietveld 408576698