| Index: media/video/capture/video_capture_device_unittest.cc
|
| diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
|
| index f9d0ab2cb8abe84fbf7f06419b973d628b1e6c98..c2f9100721134c9b55a038188c23fdb8758a54d7 100644
|
| --- a/media/video/capture/video_capture_device_unittest.cc
|
| +++ b/media/video/capture/video_capture_device_unittest.cc
|
| @@ -64,8 +64,9 @@ namespace media {
|
|
|
| class MockClient : public media::VideoCaptureDevice::Client {
|
| public:
|
| - MOCK_METHOD1(ReserveOutputBuffer,
|
| - scoped_refptr<media::VideoFrame>(const gfx::Size&));
|
| + MOCK_METHOD2(ReserveOutputBuffer,
|
| + scoped_refptr<Buffer>(media::VideoFrame::Format format,
|
| + const gfx::Size& dimensions));
|
| MOCK_METHOD0(OnErr, void());
|
| MOCK_METHOD1(OnFrameInfo, void(const VideoCaptureCapability&));
|
| MOCK_METHOD1(OnFrameInfoChanged, void(const VideoCaptureCapability&));
|
| @@ -89,9 +90,10 @@ class MockClient : public media::VideoCaptureDevice::Client {
|
| main_thread_->PostTask(FROM_HERE, frame_cb_);
|
| }
|
|
|
| - virtual void OnIncomingCapturedVideoFrame(
|
| - const scoped_refptr<media::VideoFrame>& frame,
|
| - base::Time timestamp) OVERRIDE {
|
| + virtual void OnIncomingCapturedBuffer(const scoped_refptr<Buffer>& buffer,
|
| + media::VideoFrame::Format format,
|
| + const gfx::Size& dimensions,
|
| + base::Time timestamp) OVERRIDE {
|
| main_thread_->PostTask(FROM_HERE, frame_cb_);
|
| }
|
|
|
|
|