Chromium Code Reviews| Index: media/video/capture/fake_video_capture_device_unittest.cc |
| diff --git a/media/video/capture/fake_video_capture_device_unittest.cc b/media/video/capture/fake_video_capture_device_unittest.cc |
| index ee0c2af9ca46561c15f0decb636840fc50e6c16a..64f3d4d369cbbd45a8bd6a5a8134e469c31c4abf 100644 |
| --- a/media/video/capture/fake_video_capture_device_unittest.cc |
| +++ b/media/video/capture/fake_video_capture_device_unittest.cc |
| @@ -81,10 +81,10 @@ class MockClient : public VideoCaptureDevice::Client { |
| } |
| // Virtual methods for capturing using Client's Buffers. |
| - scoped_ptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format, |
| - const gfx::Size& dimensions) { |
| - EXPECT_TRUE(format == PIXEL_FORMAT_I420 || |
| - format == PIXEL_FORMAT_GPUMEMORYBUFFER); |
| + scoped_ptr<Buffer> ReserveOutputBuffer(const gfx::Size& dimensions, |
| + media::VideoPixelFormat format, |
| + media::VideoPixelStorage storage) { |
| + EXPECT_TRUE(format == PIXEL_FORMAT_I420 || format == PIXEL_FORMAT_ARGB); |
|
hubbe
2015/06/18 19:23:11
EXPECT for storage?
mcasas
2015/06/19 02:58:36
Done.
|
| EXPECT_GT(dimensions.GetArea(), 0); |
| const VideoCaptureFormat frame_format(dimensions, 0.0, format); |
| return make_scoped_ptr( |