| Index: content/browser/media/capture/web_contents_video_capture_device_unittest.cc
|
| diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
|
| index cc6bc3a3bd140d0cb3e49e3154ba5f7fb21e81fd..c6be44c2188c82962088bdd141201764b99c303b 100644
|
| --- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
|
| +++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
|
| @@ -338,13 +338,14 @@ class StubClient : public media::VideoCaptureDevice::Client {
|
| }
|
| ~StubClient() override {}
|
|
|
| - 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 timestamp));
|
| + base::TimeDelta timestamp,
|
| + int frame_id));
|
|
|
| MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
|
|
|
| @@ -367,15 +368,17 @@ class StubClient : public media::VideoCaptureDevice::Client {
|
|
|
| // Trampoline method to workaround GMOCK problems with std::unique_ptr<>.
|
| void OnIncomingCapturedBuffer(std::unique_ptr<Buffer> buffer,
|
| - const media::VideoCaptureFormat& frame_format,
|
| + const media::VideoCaptureFormat& 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 {
|
| EXPECT_FALSE(frame->visible_rect().IsEmpty());
|
| EXPECT_EQ(media::PIXEL_FORMAT_I420, frame->format());
|
| double frame_rate = 0;
|
|
|