| Index: media/video/capture/video_capture_device_unittest.cc
|
| diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
|
| index fe71b173f1bbba88036a22405b629ba04704eb57..0002929a9fc9b199c0f3d2203bd9c80ea3fab76a 100644
|
| --- a/media/video/capture/video_capture_device_unittest.cc
|
| +++ b/media/video/capture/video_capture_device_unittest.cc
|
| @@ -467,13 +467,7 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) {
|
| device->StopAndDeAllocate();
|
| }
|
|
|
| -// Fails on Android - https://crbug.com/506520.
|
| -#if defined(OS_ANDROID)
|
| -#define MAYBE_GetDeviceSupportedFormats DISABLED_GetDeviceSupportedFormats
|
| -#else
|
| -#define MAYBE_GetDeviceSupportedFormats GetDeviceSupportedFormats
|
| -#endif
|
| -TEST_F(VideoCaptureDeviceTest, MAYBE_GetDeviceSupportedFormats) {
|
| +TEST_F(VideoCaptureDeviceTest, GetDeviceSupportedFormats) {
|
| // Use PIXEL_FORMAT_MAX to iterate all device names for testing
|
| // GetDeviceSupportedFormats().
|
| scoped_ptr<VideoCaptureDevice::Name> name =
|
|
|