| Index: media/capture/video/video_capture_device_unittest.cc
|
| diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
|
| index 4a59047df72eb198c6703ab0373eb801c52178ea..11031fec944b74abf4c0bca026dcd47d6706e7fe 100644
|
| --- a/media/capture/video/video_capture_device_unittest.cc
|
| +++ b/media/capture/video/video_capture_device_unittest.cc
|
| @@ -52,7 +52,7 @@
|
| #elif defined(OS_WIN)
|
| #define MAYBE_AllocateBadSize AllocateBadSize
|
| #define MAYBE_CaptureMjpeg CaptureMjpeg
|
| -#define MAYBE_TakePhoto DISABLED_TakePhoto
|
| +#define MAYBE_TakePhoto TakePhoto
|
| #elif defined(OS_ANDROID)
|
| #define MAYBE_AllocateBadSize AllocateBadSize
|
| #define MAYBE_CaptureMjpeg CaptureMjpeg
|
| @@ -535,7 +535,7 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_TakePhoto) {
|
| EXPECT_CALL(*video_capture_client_, OnError(_, _)).Times(0);
|
|
|
| VideoCaptureParams capture_params;
|
| - capture_params.requested_format.frame_size.SetSize(640, 480);
|
| + capture_params.requested_format.frame_size.SetSize(320, 240);
|
| capture_params.requested_format.frame_rate = 30;
|
| capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
|
| device->AllocateAndStart(capture_params, std::move(video_capture_client_));
|
|
|