| Index: content/renderer/media/video_capture_message_filter_unittest.cc
|
| diff --git a/content/renderer/media/video_capture_message_filter_unittest.cc b/content/renderer/media/video_capture_message_filter_unittest.cc
|
| index 6847d68c573cb586571026c59a1cb3e61383e0c9..de8b15c56c716f795532d2de87fed3af3108ddd6 100644
|
| --- a/content/renderer/media/video_capture_message_filter_unittest.cc
|
| +++ b/content/renderer/media/video_capture_message_filter_unittest.cc
|
| @@ -31,6 +31,10 @@ class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate {
|
| MOCK_METHOD3(OnBufferCreated, void(base::SharedMemoryHandle handle,
|
| int length,
|
| int buffer_id));
|
| + MOCK_METHOD3(OnGpuMemoryBufferCreated,
|
| + void(const std::vector<gfx::GpuMemoryBufferHandle>& gmb_handles,
|
| + const gfx::Size& size,
|
| + int buffer_id));
|
| MOCK_METHOD1(OnBufferDestroyed, void(int buffer_id));
|
| MOCK_METHOD8(OnBufferReceived,
|
| void(int buffer_id,
|
| @@ -40,7 +44,7 @@ class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate {
|
| media::VideoFrame::StorageType storage_type,
|
| const gfx::Size& coded_size,
|
| const gfx::Rect& visible_rect,
|
| - const gpu::MailboxHolder& mailbox_holder));
|
| + const std::vector<gpu::MailboxHolder>& mailbox_holders));
|
| MOCK_METHOD1(OnStateChanged, void(VideoCaptureState state));
|
| MOCK_METHOD1(OnDeviceSupportedFormatsEnumerated,
|
| void(const media::VideoCaptureFormats& formats));
|
| @@ -132,9 +136,10 @@ TEST(VideoCaptureMessageFilterTest, Basic) {
|
| gpu::Mailbox mailbox;
|
| const int8 mailbox_name[arraysize(mailbox.name)] = "TEST MAILBOX";
|
| mailbox.SetName(mailbox_name);
|
| - params_m.mailbox_holder = gpu::MailboxHolder(mailbox, 0, 44);
|
| + params_m.mailbox_holders =
|
| + std::vector<gpu::MailboxHolder>(1, gpu::MailboxHolder(mailbox, 0, 44));
|
|
|
| - gpu::MailboxHolder saved_mailbox_holder;
|
| + std::vector<gpu::MailboxHolder> saved_mailbox_holder;
|
| EXPECT_CALL(delegate, OnBufferReceived(params_m.buffer_id, params_m.timestamp,
|
| _, media::PIXEL_FORMAT_ARGB,
|
| media::VideoFrame::STORAGE_OPAQUE,
|
| @@ -145,7 +150,7 @@ TEST(VideoCaptureMessageFilterTest, Basic) {
|
| filter->OnMessageReceived(VideoCaptureMsg_BufferReady(params_m));
|
| Mock::VerifyAndClearExpectations(&delegate);
|
| EXPECT_EQ(memcmp(mailbox.name,
|
| - saved_mailbox_holder.mailbox.name,
|
| + saved_mailbox_holder[0].mailbox.name,
|
| sizeof(mailbox.name)),
|
| 0);
|
|
|
|
|