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

content/browser/renderer_host/media/video_capture_device_client_unittest.cc

Index: content/browser/renderer_host/media/video_capture_device_client_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_device_client_unittest.cc b/content/browser/renderer_host/media/video_capture_device_client_unittest.cc
index 0276d14498308dbd97533a143f02e5e4dafc9706..49c72c72d7243b169e502d788c4c2d0a982cb3d5 100644
--- a/content/browser/renderer_host/media/video_capture_device_client_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client_unittest.cc
@@ -42,12 +42,18 @@ class MockVideoCaptureController : public VideoCaptureController {
   MOCK_METHOD1(MockOnIncomingCapturedVideoFrame, void(const gfx::Size&));
   MOCK_METHOD0(OnError, void());
   MOCK_METHOD1(OnLog, void(const std::string& message));
-  MOCK_METHOD1(OnBufferDestroyed, void(int buffer_id_to_drop));
+  MOCK_METHOD1(OnBufferDestroyed, void(int buffer_id));
 
-  void OnIncomingCapturedVideoFrame(
-      media::VideoCaptureDevice::Client::Buffer buffer,
-      scoped_refptr<media::VideoFrame> frame) override {
-    MockOnIncomingCapturedVideoFrame(frame->coded_size());
+  void OnNewBufferHandle(
+      int buffer_id,
+      std::unique_ptr<media::BufferHandleProvider> handle_provider) override {}
+
+  void OnFrameReadyInBuffer(
+      int32_t buffer_id,
+      int frame_feedback_id,
+      std::unique_ptr<media::Ownership> buffer_usage_reservation,
+      media::mojom::VideoFrameInfoPtr frame_info) override {
+    MockOnIncomingCapturedVideoFrame(frame_info->coded_size);
   }
 };
 
@@ -74,10 +80,9 @@ class VideoCaptureDeviceClientTest : public ::testing::Test {
         base::MakeUnique<VideoFrameReceiverOnIOThread>(
             controller_->GetWeakPtrForIOThread()),
         buffer_pool,
-        base::Bind(
-            &CreateGpuJpegDecoder,
-            base::Bind(&media::VideoFrameReceiver::OnIncomingCapturedVideoFrame,
-                       controller_->GetWeakPtrForIOThread())));
+        base::Bind(&CreateGpuJpegDecoder,
+                   base::Bind(&media::VideoFrameReceiver::OnFrameReadyInBuffer,
+                              controller_->GetWeakPtrForIOThread())));
   }
   ~VideoCaptureDeviceClientTest() override {}