| Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| index a5bba004c8b24477e36f30d141aad684fc120e76..f34ed11400b2ff0e960011b11f17aded505f6c29 100644
|
| --- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| +++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| @@ -41,13 +41,14 @@ const int kFrameRate = 30;
|
|
|
| class MockDeviceClient : public media::VideoCaptureDevice::Client {
|
| public:
|
| - MOCK_METHOD6(OnIncomingCapturedData,
|
| + MOCK_METHOD7(OnIncomingCapturedData,
|
| void(const uint8_t* data,
|
| int length,
|
| const media::VideoCaptureFormat& frame_format,
|
| int rotation,
|
| base::TimeTicks reference_time,
|
| - base::TimeDelta tiemstamp));
|
| + base::TimeDelta tiemstamp,
|
| + int frame_id));
|
| MOCK_METHOD0(DoReserveOutputBuffer, void(void));
|
| MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
|
| MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
|
| @@ -69,12 +70,14 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
|
| void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
|
| const media::VideoCaptureFormat& frame_format,
|
| base::TimeTicks reference_time,
|
| - base::TimeDelta timestamp) override {
|
| + base::TimeDelta timestamp,
|
| + int frame_id) override {
|
| DoOnIncomingCapturedBuffer();
|
| }
|
| void OnIncomingCapturedVideoFrame(
|
| std::unique_ptr<Buffer> buffer,
|
| - scoped_refptr<media::VideoFrame> frame) override {
|
| + scoped_refptr<media::VideoFrame> frame,
|
| + int frame_id) override {
|
| DoOnIncomingCapturedVideoFrame();
|
| }
|
| std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
|
|
|