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

media/capture/video/linux/v4l2_capture_delegate_unittest.cc

Index: media/capture/video/linux/v4l2_capture_delegate_unittest.cc
diff --git a/media/capture/video/linux/v4l2_capture_delegate_unittest.cc b/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
index c5f1080a1e6a6b1200d443f152aa0c7219500724..3febf4456d63ce720589fcf65de6ccc44a20c577 100644
--- a/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
@@ -159,11 +159,11 @@
                     base::TimeDelta,
                     int));
   MOCK_METHOD4(ReserveOutputBuffer,
-               Buffer(const gfx::Size&,
-                      media::VideoPixelFormat,
-                      media::VideoPixelStorage,
-                      int));
-  void OnIncomingCapturedBuffer(Buffer buffer,
+               std::unique_ptr<Buffer>(const gfx::Size&,
+                                       media::VideoPixelFormat,
+                                       media::VideoPixelStorage,
+                                       int));
+  void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
                                 const VideoCaptureFormat& frame_format,
                                 base::TimeTicks reference_time,
                                 base::TimeDelta timestamp) override {
@@ -171,7 +171,7 @@
   }
   MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
   void OnIncomingCapturedBufferExt(
-      Buffer buffer,
+      std::unique_ptr<Buffer> buffer,
       const VideoCaptureFormat& format,
       base::TimeTicks reference_time,
       base::TimeDelta timestamp,
@@ -180,9 +180,11 @@
     DoOnIncomingCapturedVideoFrame();
   }
   MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
-  MOCK_METHOD4(
-      ResurrectLastOutputBuffer,
-      Buffer(const gfx::Size&, VideoPixelFormat, VideoPixelStorage, int));
+  MOCK_METHOD4(ResurrectLastOutputBuffer,
+               std::unique_ptr<Buffer>(const gfx::Size&,
+                                       VideoPixelFormat,
+                                       VideoPixelStorage,
+                                       int));
   MOCK_METHOD2(OnError,
                void(const tracked_objects::Location& from_here,
                     const std::string& reason));