[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() and OnFrameReadyInBuffer(

content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc

Index: content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
diff --git a/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc b/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
index 5d9ad23c809cb49901ad5114ff091501061c4aa6..4b7ffed0a6ad50c398ba64f88aff7d9fedbdbaa0 100644
--- a/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
+++ b/content/browser/renderer_host/media/video_frame_receiver_on_io_thread.cc
@@ -14,31 +14,47 @@ VideoFrameReceiverOnIOThread::VideoFrameReceiverOnIOThread(
 
 VideoFrameReceiverOnIOThread::~VideoFrameReceiverOnIOThread() = default;
 
-void VideoFrameReceiverOnIOThread::OnIncomingCapturedVideoFrame(
-    media::VideoCaptureDevice::Client::Buffer buffer,
-    scoped_refptr<media::VideoFrame> frame) {
+void VideoFrameReceiverOnIOThread::OnNewBufferHandle(
+    int buffer_id,
+    std::unique_ptr<media::VideoCaptureDevice::Client::Buffer::HandleProvider>
+        handle_provider) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnIncomingCapturedVideoFrame, receiver_,
-                 base::Passed(&buffer), frame));
+      base::Bind(&VideoFrameReceiver::OnNewBufferHandle, receiver_, buffer_id,
+                 base::Passed(std::move(handle_provider))));
 }
 
-void VideoFrameReceiverOnIOThread::OnError() {
+void VideoFrameReceiverOnIOThread::OnFrameReadyInBuffer(
+    int buffer_id,
+    int frame_feedback_id,
+    std::unique_ptr<
+        media::VideoCaptureDevice::Client::Buffer::ScopedAccessPermission>
+        buffer_read_permission,
+    media::mojom::VideoFrameInfoPtr frame_info) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnError, receiver_));
+      base::Bind(&VideoFrameReceiver::OnFrameReadyInBuffer, receiver_,
+                 buffer_id, frame_feedback_id,
+                 base::Passed(&buffer_read_permission),
+                 base::Passed(&frame_info)));
 }
 
-void VideoFrameReceiverOnIOThread::OnLog(const std::string& message) {
+void VideoFrameReceiverOnIOThread::OnBufferRetired(int buffer_id) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnLog, receiver_, message));
+      base::Bind(&VideoFrameReceiver::OnBufferRetired, receiver_, buffer_id));
 }
 
-void VideoFrameReceiverOnIOThread::OnBufferRetired(int buffer_id) {
+void VideoFrameReceiverOnIOThread::OnError() {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&VideoFrameReceiver::OnBufferRetired, receiver_, buffer_id));
+      base::Bind(&VideoFrameReceiver::OnError, receiver_));
+}
+
+void VideoFrameReceiverOnIOThread::OnLog(const std::string& message) {
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&VideoFrameReceiver::OnLog, receiver_, message));
 }
 
 }  // namespace content