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

media/capture/content/thread_safe_capture_oracle.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
 #define MEDIA_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 80 matching lines @@
   void ReportError(const tracked_objects::Location& from_here,
                    const std::string& reason);
 
   void OnConsumerReportingUtilization(int frame_number, double utilization);
 
  private:
   friend class base::RefCountedThreadSafe<ThreadSafeCaptureOracle>;
   virtual ~ThreadSafeCaptureOracle();
 
   // Callback invoked on completion of all captures.
-  void DidCaptureFrame(int frame_number,
-                       VideoCaptureDevice::Client::Buffer buffer,
-                       base::TimeTicks capture_begin_time,
-                       base::TimeDelta estimated_frame_duration,
-                       scoped_refptr<VideoFrame> frame,
-                       base::TimeTicks reference_time,
-                       bool success);
+  void DidCaptureFrame(
+      int frame_number,
+      std::unique_ptr<VideoCaptureDevice::Client::Buffer> buffer,
+      base::TimeTicks capture_begin_time,
+      base::TimeDelta estimated_frame_duration,
+      scoped_refptr<VideoFrame> frame,
+      base::TimeTicks reference_time,
+      bool success);
 
   // Callback invoked once all consumers have finished with a delivered video
   // frame.  Consumer feedback signals are scanned from the frame's |metadata|.
   void DidConsumeFrame(int frame_number,
                        const media::VideoFrameMetadata* metadata);
 
   // Protects everything below it.
   mutable base::Lock lock_;
 
   // Recipient of our capture activity.
   std::unique_ptr<VideoCaptureDevice::Client> client_;
 
   // Makes the decision to capture a frame.
   VideoCaptureOracle oracle_;
 
   // The video capture parameters used to construct the oracle proxy.
   const VideoCaptureParams params_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_CONTENT_THREAD_SAFE_CAPTURE_ORACLE_H_