| Index: content/browser/renderer_host/media/desktop_capture_device_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
|
| index 5a8a145bbda349dd3f26fbf22143f7d89407bfc6..71a3cf5eb7c99fbbb6e5083961b62cf26c35de4a 100644
|
| --- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
|
| +++ b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
|
| @@ -40,8 +40,7 @@ const int kFrameRate = 30;
|
|
|
| class MockDeviceClient : public media::VideoCaptureDevice::Client {
|
| public:
|
| - MOCK_METHOD1(ReserveOutputBuffer,
|
| - scoped_refptr<media::VideoFrame>(const gfx::Size& size));
|
| + MOCK_METHOD0(DoReserveOutputBuffer, void());
|
| MOCK_METHOD0(OnError, void());
|
| MOCK_METHOD1(OnFrameInfo, void(const media::VideoCaptureCapability& info));
|
| MOCK_METHOD1(OnFrameInfoChanged,
|
| @@ -52,9 +51,21 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
|
| int rotation,
|
| bool flip_vert,
|
| bool flip_horiz));
|
| - MOCK_METHOD2(OnIncomingCapturedVideoFrame,
|
| - void(const scoped_refptr<media::VideoFrame>& frame,
|
| - base::Time timestamp));
|
| + MOCK_METHOD0(DoOnIncomingCapturedBuffer, void());
|
| +
|
| + virtual scoped_ptr<media::VideoCaptureDevice::Client::Buffer>
|
| + ReserveOutputBuffer(media::VideoFrame::Format format,
|
| + const gfx::Size& dimensions) OVERRIDE {
|
| + DoReserveOutputBuffer();
|
| + return scoped_ptr<media::VideoCaptureDevice::Client::Buffer>();
|
| + }
|
| +
|
| + virtual void OnIncomingCapturedBuffer(scoped_ptr<Buffer> buffer,
|
| + media::VideoFrame::Format format,
|
| + const gfx::Size& dimensions,
|
| + base::Time timestamp) {
|
| + DoOnIncomingCapturedBuffer();
|
| + }
|
| };
|
|
|
| // TODO(sergeyu): Move this to a separate file where it can be reused.
|
|
|