Revert of [Mojo Video Capture] Replace method OnIncomingCapturedVideoFrame with OnIncomingCapturedBufferExt

media/capture/video/linux/v4l2_capture_delegate_unittest.cc

 // Copyright 2016 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 <sys/fcntl.h>
 #include <sys/ioctl.h>
 
 #include "base/files/file_enumerator.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 152 matching lines @@
                                        media::VideoPixelFormat,
                                        media::VideoPixelStorage,
                                        int));
   void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
                                 const VideoCaptureFormat& frame_format,
                                 base::TimeTicks reference_time,
                                 base::TimeDelta timestamp) override {
     DoOnIncomingCapturedBuffer();
   }
   MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
-  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 {
     DoOnIncomingCapturedVideoFrame();
   }
   MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
   MOCK_METHOD4(ResurrectLastOutputBuffer,
                std::unique_ptr<Buffer>(const gfx::Size&,
                                        VideoPixelFormat,
                                        VideoPixelStorage,
                                        int));
   MOCK_METHOD2(OnError,
                void(const tracked_objects::Location& from_here,
@@ skipping 62 matching lines @@
   // their |default_value|s.
   {
     base::ScopedFD device_fd(
         HANDLE_EINTR(open(device_descriptor_.device_id.c_str(), O_RDWR)));
     ASSERT_TRUE(device_fd.is_valid());
     VerifyUserControlsAreSetToDefaultValues(device_fd.get());
   }
 }
 
 };  // namespace media