| Index: media/capture/video/video_capture_device_unittest.cc
|
| diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
|
| index 6b593dc3755e64e663fb45537befc084c08c1e69..d6bce33a865fb942fdf35d5cce9ea2226e39a35a 100644
|
| --- a/media/capture/video/video_capture_device_unittest.cc
|
| +++ b/media/capture/video/video_capture_device_unittest.cc
|
| @@ -114,23 +114,24 @@ class MockVideoCaptureClient : public VideoCaptureDevice::Client {
|
| const VideoCaptureFormat& format,
|
| int rotation,
|
| base::TimeTicks reference_time,
|
| - base::TimeDelta timestamp) override {
|
| + base::TimeDelta timestamp,
|
| + int frame_feedback_id) override {
|
| ASSERT_GT(length, 0);
|
| ASSERT_TRUE(data);
|
| main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, format));
|
| }
|
|
|
| // Trampoline methods to workaround GMOCK problems with std::unique_ptr<>.
|
| - std::unique_ptr<Buffer> ReserveOutputBuffer(
|
| - const gfx::Size& dimensions,
|
| - media::VideoPixelFormat format,
|
| - media::VideoPixelStorage storage) override {
|
| + std::unique_ptr<Buffer> ReserveOutputBuffer(const gfx::Size& dimensions,
|
| + media::VideoPixelFormat format,
|
| + media::VideoPixelStorage storage,
|
| + int frame_feedback_id) override {
|
| DoReserveOutputBuffer();
|
| NOTREACHED() << "This should never be called";
|
| return std::unique_ptr<Buffer>();
|
| }
|
| void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
|
| - const VideoCaptureFormat& frame_format,
|
| + const VideoCaptureFormat& format,
|
| base::TimeTicks reference_time,
|
| base::TimeDelta timestamp) override {
|
| DoOnIncomingCapturedBuffer();
|
| @@ -142,7 +143,8 @@ class MockVideoCaptureClient : public VideoCaptureDevice::Client {
|
| std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
|
| const gfx::Size& dimensions,
|
| media::VideoPixelFormat format,
|
| - media::VideoPixelStorage storage) {
|
| + media::VideoPixelStorage storage,
|
| + int frame_feedback_id) {
|
| DoResurrectLastOutputBuffer();
|
| NOTREACHED() << "This should never be called";
|
| return std::unique_ptr<Buffer>();
|
|
|