Verify returned frames from media::VideoFrame::Wrap*() methods

content/common/gpu/media/video_encode_accelerator_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <queue>
 #include <string>
@@ skipping 1303 matching lines @@
     FeedEncoderWithOneInput();
 }
 
 scoped_refptr<media::VideoFrame> VEAClient::CreateFrame(off_t position) {
   uint8_t* frame_data_y = const_cast<uint8_t*>(
       test_stream_->mapped_aligned_in_file.data() + position);
   uint8_t* frame_data_u = frame_data_y + test_stream_->aligned_plane_size[0];
   uint8_t* frame_data_v = frame_data_u + test_stream_->aligned_plane_size[1];
   CHECK_GT(current_framerate_, 0U);
 
-  return media::VideoFrame::WrapExternalYuvData(
-      kInputFormat, input_coded_size_, gfx::Rect(test_stream_->visible_size),
-      test_stream_->visible_size, input_coded_size_.width(),
-      input_coded_size_.width() / 2, input_coded_size_.width() / 2,
-      frame_data_y, frame_data_u, frame_data_v,
-      base::TimeDelta().FromMilliseconds(next_input_id_ *
-                                         base::Time::kMillisecondsPerSecond /
-                                         current_framerate_));
+  scoped_refptr<media::VideoFrame> video_frame =
+      media::VideoFrame::WrapExternalYuvData(
+          kInputFormat, input_coded_size_,
+          gfx::Rect(test_stream_->visible_size), test_stream_->visible_size,
+          input_coded_size_.width(), input_coded_size_.width() / 2,
+          input_coded_size_.width() / 2, frame_data_y, frame_data_u,
+          frame_data_v,
+          base::TimeDelta().FromMilliseconds(
+              next_input_id_ * base::Time::kMillisecondsPerSecond /
+              current_framerate_));
+  EXPECT_NE(video_frame.get(), nullptr);

[mcasas, 2016/01/12 17:46:16]

nit: Same here, ASSERT(video_frame) for tests.

[emircan, 2016/01/14 23:07:40]

ASSERT has the same problem as above.

+  return video_frame;
 }
 
 scoped_refptr<media::VideoFrame> VEAClient::PrepareInputFrame(
     off_t position,
     int32_t* input_id) {
   CHECK_LE(position + test_stream_->aligned_buffer_size,
            test_stream_->mapped_aligned_in_file.length());
 
   scoped_refptr<media::VideoFrame> frame = CreateFrame(position);
+  EXPECT_NE(frame.get(), nullptr);
   frame->AddDestructionObserver(
           media::BindToCurrentLoop(
               base::Bind(&VEAClient::InputNoLongerNeededCallback,
                          base::Unretained(this),
                          next_input_id_)));
 
   LOG_ASSERT(inputs_at_client_.insert(next_input_id_).second);
 
   *input_id = next_input_id_++;
   return frame;
@@ skipping 427 matching lines @@
 
   content::g_env =
       reinterpret_cast<content::VideoEncodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new content::VideoEncodeAcceleratorTestEnvironment(
                   std::move(test_stream_data), log_path, run_at_fps,
                   needs_encode_latency, verify_all_output)));
 
   return RUN_ALL_TESTS();
 }