| Index: content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc
|
| index 2dd75f7b88c89f0ea036ad80b8785784e83f4c39..e593cfe2869d632beb8dc134bed523e639ab2b4a 100644
|
| --- a/content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc
|
| +++ b/content/browser/renderer_host/media/desktop_capture_device_aura_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "content/browser/browser_thread_impl.h"
|
| #include "content/public/browser/desktop_media_id.h"
|
| +#include "media/base/video_frame.h"
|
| #include "media/video/capture/video_capture_types.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -36,15 +37,14 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
|
| MOCK_METHOD5(OnIncomingCapturedFrame,
|
| void(const uint8* data,
|
| int length,
|
| - base::TimeTicks timestamp,
|
| + const media::VideoCaptureFormat& frame_format,
|
| int rotation,
|
| - const media::VideoCaptureFormat& frame_format));
|
| - MOCK_METHOD5(OnIncomingCapturedBuffer,
|
| + base::TimeTicks timestamp));
|
| + MOCK_METHOD4(OnIncomingCapturedVideoFrame,
|
| void(const scoped_refptr<Buffer>& buffer,
|
| - media::VideoFrame::Format format,
|
| - const gfx::Size& dimensions,
|
| - base::TimeTicks timestamp,
|
| - int frame_rate));
|
| + const media::VideoCaptureFormat& buffer_format,
|
| + const scoped_refptr<media::VideoFrame>& frame,
|
| + base::TimeTicks timestamp));
|
| };
|
|
|
| // Test harness that sets up a minimal environment with necessary stubs.
|
|
|