Reland: GpuMemoryBuffer interface change: Map(**) to Map() and memory(plane); stride(plane)

content/renderer/media/video_capture_impl_unittest.cc

 // Copyright (c) 2012 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 "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 34 matching lines @@
   std::vector<gpu::MailboxHolder> mailbox_holders;
 };
 
 static const BufferReceivedTestArg kBufferFormats[]  = {
   BufferReceivedTestArg(media::PIXEL_FORMAT_I420),
   BufferReceivedTestArg(
       media::PIXEL_FORMAT_ARGB,
       std::vector<gpu::MailboxHolder>(
           1, gpu::MailboxHolder(gpu::Mailbox::Generate(), 0, 0)))};
 
-class VideoCaptureImplTest :
-    public ::testing::TestWithParam<BufferReceivedTestArg> {
+class VideoCaptureImplTest
+    : public ::testing::TestWithParam<BufferReceivedTestArg> {
  public:
   class MockVideoCaptureImpl : public VideoCaptureImpl {
    public:
     MockVideoCaptureImpl(const media::VideoCaptureSessionId id,
                          VideoCaptureMessageFilter* filter)
-        : VideoCaptureImpl(id, filter), received_buffer_count_(0) {
-    }
+        : VideoCaptureImpl(id, filter), received_buffer_count_(0) {}
     ~MockVideoCaptureImpl() override {}
 
     // Override Send() to mimic device to send events.
     void Send(IPC::Message* message) override {
       CHECK(message);
 
       // In this method, messages are sent to the according handlers as if
       // we are the device.
       bool handled = true;
       IPC_BEGIN_MESSAGE_MAP(MockVideoCaptureImpl, *message)
@@ skipping 227 matching lines @@
 // Check that a request to GetDeviceFormatsInUse() ends up eventually in the
 // provided callback.
 TEST_F(VideoCaptureImplTest, GetDeviceFormatsInUse) {
   EXPECT_CALL(*this, OnDeviceFormatsInUse(_));
 
   Init();
   GetDeviceFormatsInUse();
   DeInit();
 }
 
-// NEW TEST
 TEST_P(VideoCaptureImplTest, BufferReceivedWithFormat) {
   EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED)).Times(1);
   EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED)).Times(1);
   EXPECT_CALL(*this, OnFrameReady(_, _)).Times(1);
 
   const BufferReceivedTestArg& buffer_arg = GetParam();
   const gfx::Size size(1280, 720);
 
   // Create a fake shared memory for buffer.
   base::SharedMemory shm;
@@ skipping 11 matching lines @@
   BufferReceived(0, size, buffer_arg.pixel_format, buffer_arg.mailbox_holders);
   StopCapture(0);
   BufferDestroyed(0);
   DeInit();
 }
 
 INSTANTIATE_TEST_CASE_P(I420AndARGB,
                         VideoCaptureImplTest,
                         testing::ValuesIn(kBufferFormats));
 
-// NEW TEST
 TEST_F(VideoCaptureImplTest, BufferReceivedAfterStop) {
   EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED)).Times(1);
   EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED)).Times(1);
   EXPECT_CALL(*this, OnFrameReady(_, _)).Times(0);
 
   // Create a fake shared memory for buffer.
   base::SharedMemory shm;
   const size_t i420_frame_size = media::VideoFrame::AllocationSize(
       media::PIXEL_FORMAT_I420, params_large_.requested_format.frame_size);
   ASSERT_TRUE(shm.CreateAndMapAnonymous(i420_frame_size));
@@ skipping 46 matching lines @@
    StartCapture(0, params_small_);
 
    // Receive state change message from browser.
    video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ERROR);
 
    StopCapture(0);
    DeInit();
 }
 
 }  // namespace content