Revert of Reland [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame() with OnIncomingCapturedBuf

media/capture/video/fake_video_capture_device_unittest.cc

 // 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.
 
 #include "media/capture/video/fake_video_capture_device.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 83 matching lines @@
     const VideoCaptureFormat frame_format(dimensions, 0.0, format);
     return base::MakeUnique<MockBuffer>(0, frame_feedback_id,
                                         frame_format.ImageAllocationSize());
   }
   void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
                                 const VideoCaptureFormat& format,
                                 base::TimeTicks reference_time,
                                 base::TimeDelta timestamp) override {
     frame_cb_.Run(format);
   }
-  void OnIncomingCapturedBufferExt(
+  void OnIncomingCapturedVideoFrame(
       std::unique_ptr<Buffer> buffer,
-      const VideoCaptureFormat& format,
-      base::TimeTicks reference_time,
-      base::TimeDelta timestamp,
-      gfx::Rect visible_rect,
-      const VideoFrameMetadata& additional_metadata) override {
+      scoped_refptr<media::VideoFrame> frame) override {
+    VideoCaptureFormat format(frame->natural_size(), 30.0,
+                              PIXEL_FORMAT_I420);
     frame_cb_.Run(format);
   }
   std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
       const gfx::Size& dimensions,
       media::VideoPixelFormat format,
       media::VideoPixelStorage storage,
       int frame_feedback_id) override {
     return std::unique_ptr<Buffer>();
   }
   double GetBufferPoolUtilization() const override { return 0.0; }
@@ skipping 355 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     ,
     FakeVideoCaptureDeviceCommandLineTest,
     Values(CommandLineTestData{"fps=-1", 5, 1u},
            CommandLineTestData{"fps=29.97, device-count=1", 29.97f, 1u},
            CommandLineTestData{"fps=60, device-count=2", 60, 2u},
            CommandLineTestData{"fps=1000, device-count=-1", 60, 1u},
            CommandLineTestData{"device-count=2", 20, 2u},
            CommandLineTestData{"device-count=0", 20, 1u}));
 };  // namespace media