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

content/browser/renderer_host/media/video_capture_controller_unittest.cc

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index d1400bce5e85e23733f7cc1022bfbaf3094a6815..874be077349454583c766c1c6ccae9c2433db1d4 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -122,11 +122,14 @@ class VideoCaptureControllerTest : public testing::Test {
 
   scoped_refptr<media::VideoFrame> WrapI420Buffer(gfx::Size dimensions,
                                                   uint8_t* data) {
-    return media::VideoFrame::WrapExternalSharedMemory(
-        media::PIXEL_FORMAT_I420, dimensions, gfx::Rect(dimensions), dimensions,
-        data,
-        media::VideoFrame::AllocationSize(media::PIXEL_FORMAT_I420, dimensions),
-        base::SharedMemory::NULLHandle(), 0u, base::TimeDelta());
+    scoped_refptr<media::VideoFrame> video_frame =
+        media::VideoFrame::WrapExternalSharedMemory(
+            media::PIXEL_FORMAT_I420, dimensions, gfx::Rect(dimensions),
+            dimensions, data, media::VideoFrame::AllocationSize(
+                                  media::PIXEL_FORMAT_I420, dimensions),
+            base::SharedMemory::NULLHandle(), 0u, base::TimeDelta());
+    EXPECT_NE(video_frame.get(), nullptr);

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

nit: ASSERT_TRUE(video_frame) ?
probably doesn't make sense to continue the 
test if |video_frame| does not verify.
Same for the other EXPECT_NEs in this file below.

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

I cannot use ASSERT_TRUE(video_frame) when there is a non-void return from the
function, i.e. here. I will check them accordingly and add
ASSERT_TRUE(video_frame) where I can.

+    return video_frame;
   }
 
   TestBrowserThreadBundle bundle_;
@@ -317,6 +320,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   }
   scoped_refptr<media::VideoFrame> video_frame =
       WrapI420Buffer(capture_resolution, static_cast<uint8_t*>(buffer->data()));
+  EXPECT_NE(video_frame.get(), nullptr);
   ASSERT_FALSE(video_frame->metadata()->HasKey(
       media::VideoFrameMetadata::RESOURCE_UTILIZATION));
   client_a_->resource_utilization_ = 0.5;
@@ -346,6 +350,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   memset(buffer2->data(), buffer_no++, buffer2->mapped_size());
   video_frame = WrapI420Buffer(capture_resolution,
                                static_cast<uint8_t*>(buffer2->data()));
+  EXPECT_NE(video_frame.get(), nullptr);
   ASSERT_FALSE(video_frame->metadata()->HasKey(
       media::VideoFrameMetadata::RESOURCE_UTILIZATION));
   client_a_->resource_utilization_ = 0.5;
@@ -392,6 +397,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
     memset(buffer->data(), buffer_no++, buffer->mapped_size());
     video_frame = WrapI420Buffer(capture_resolution,
                                  static_cast<uint8_t*>(buffer->data()));
+    EXPECT_NE(video_frame.get(), nullptr);
     device_->OnIncomingCapturedVideoFrame(std::move(buffer), video_frame,
                                           base::TimeTicks());
   }
@@ -440,6 +446,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   memset(buffer3->data(), buffer_no++, buffer3->mapped_size());
   video_frame = WrapI420Buffer(capture_resolution,
                                static_cast<uint8_t*>(buffer3->data()));
+  EXPECT_NE(video_frame.get(), nullptr);
   device_->OnIncomingCapturedVideoFrame(std::move(buffer3), video_frame,
                                         base::TimeTicks());
 
@@ -457,6 +464,7 @@ TEST_F(VideoCaptureControllerTest, NormalCaptureMultipleClients) {
   memset(buffer4->data(), buffer_no++, buffer4->mapped_size());
   video_frame = WrapI420Buffer(capture_resolution,
                                static_cast<uint8_t*>(buffer4->data()));
+  EXPECT_NE(video_frame.get(), nullptr);
   device_->OnIncomingCapturedVideoFrame(std::move(buffer4), video_frame,
                                         base::TimeTicks());
   // B2 is the only client left, and is the only one that should
@@ -505,6 +513,7 @@ TEST_F(VideoCaptureControllerTest, ErrorBeforeDeviceCreation) {
   ASSERT_TRUE(buffer.get());
   scoped_refptr<media::VideoFrame> video_frame =
       WrapI420Buffer(capture_resolution, static_cast<uint8_t*>(buffer->data()));
+  EXPECT_NE(video_frame.get(), nullptr);
   device_->OnIncomingCapturedVideoFrame(std::move(buffer), video_frame,
                                         base::TimeTicks());
 
@@ -542,6 +551,7 @@ TEST_F(VideoCaptureControllerTest, ErrorAfterDeviceCreation) {
 
   scoped_refptr<media::VideoFrame> video_frame =
       WrapI420Buffer(dims, static_cast<uint8_t*>(buffer->data()));
+  EXPECT_NE(video_frame.get(), nullptr);
   device_->OnError(FROM_HERE, "Test Error");
   device_->OnIncomingCapturedVideoFrame(std::move(buffer), video_frame,
                                         base::TimeTicks());