| Index: content/browser/media/capture/screen_capture_device_android_unittest.cc
|
| diff --git a/content/browser/media/capture/screen_capture_device_android_unittest.cc b/content/browser/media/capture/screen_capture_device_android_unittest.cc
|
| index f903f19f761f5da6ad4f9723dd3d32eb04b9e816..8b359d023c09bc0d438260a0d118fde01fa4ac11 100644
|
| --- a/content/browser/media/capture/screen_capture_device_android_unittest.cc
|
| +++ b/content/browser/media/capture/screen_capture_device_android_unittest.cc
|
| @@ -16,13 +16,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));
|
| @@ -45,12 +46,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(
|
|
|