Reland [Mojo Video Capture] Simplify media::VideoCaptureDevice::Client:Buffer to a struct

media/capture/video/linux/v4l2_capture_delegate_unittest.cc

 // Copyright 2016 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 <sys/fcntl.h>
 #include <sys/ioctl.h>
 
 #include "base/files/file_enumerator.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 141 matching lines @@
  public:
   MOCK_METHOD7(OnIncomingCapturedData,
                void(const uint8_t*,
                     int,
                     const VideoCaptureFormat&,
                     int,
                     base::TimeTicks,
                     base::TimeDelta,
                     int));
   MOCK_METHOD4(ReserveOutputBuffer,
-               std::unique_ptr<Buffer>(const gfx::Size&,
-                                       media::VideoPixelFormat,
-                                       media::VideoPixelStorage,
-                                       int));
-  void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
+               Buffer(const gfx::Size&,
+                      media::VideoPixelFormat,
+                      media::VideoPixelStorage,
+                      int));
+  void OnIncomingCapturedBuffer(Buffer buffer,
                                 const VideoCaptureFormat& frame_format,
                                 base::TimeTicks reference_time,
                                 base::TimeDelta timestamp) override {
     DoOnIncomingCapturedBuffer();
   }
   MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
   void OnIncomingCapturedBufferExt(
-      std::unique_ptr<Buffer> buffer,
+      Buffer buffer,
       const VideoCaptureFormat& format,
       base::TimeTicks reference_time,
       base::TimeDelta timestamp,
       gfx::Rect visible_rect,
       const VideoFrameMetadata& additional_metadata) override {
     DoOnIncomingCapturedVideoFrame();
   }
   MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
-  MOCK_METHOD4(ResurrectLastOutputBuffer,
-               std::unique_ptr<Buffer>(const gfx::Size&,
-                                       VideoPixelFormat,
-                                       VideoPixelStorage,
-                                       int));
+  MOCK_METHOD4(
+      ResurrectLastOutputBuffer,
+      Buffer(const gfx::Size&, VideoPixelFormat, VideoPixelStorage, int));
   MOCK_METHOD2(OnError,
                void(const tracked_objects::Location& from_here,
                     const std::string& reason));
   MOCK_CONST_METHOD0(GetBufferPoolUtilization, double(void));
 };
 
 class V4L2CaptureDelegateTest : public ::testing::Test {
  public:
   V4L2CaptureDelegateTest()
       : device_descriptor_("Device 0", "/dev/video0"),
@@ skipping 54 matching lines @@
   // their |default_value|s.
   {
     base::ScopedFD device_fd(
         HANDLE_EINTR(open(device_descriptor_.device_id.c_str(), O_RDWR)));
     ASSERT_TRUE(device_fd.is_valid());
     VerifyUserControlsAreSetToDefaultValues(device_fd.get());
   }
 }
 
 };  // namespace media