| 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 386849eb8823fe02e7260146cdf3f4cd693fc430..b2ec90733ce17d7a53c5b5544f2e9c127fecbf6b 100644
|
| --- a/media/video/capture/fake_video_capture_device_unittest.cc
|
| +++ b/media/video/capture/fake_video_capture_device_unittest.cc
|
| @@ -81,12 +81,11 @@ 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);
|
| - EXPECT_GT(dimensions.GetArea(), 0);
|
| - const VideoCaptureFormat frame_format(dimensions, 0.0, format);
|
| + scoped_ptr<Buffer> ReserveOutputBuffer(
|
| + const media::VideoCaptureFormat& frame_format) {
|
| + EXPECT_TRUE(frame_format.pixel_format == PIXEL_FORMAT_I420 ||
|
| + frame_format.pixel_format == PIXEL_FORMAT_ARGB);
|
| + EXPECT_GT(frame_format.frame_size.GetArea(), 0);
|
| return make_scoped_ptr(
|
| new MockBuffer(0, frame_format.ImageAllocationSize()));
|
| }
|
|
|