Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1655)

Unified Diff: media/video/capture/video_capture_device_unittest.cc

Issue 1215443003: [Android] Filter the unknown type in function GetDeviceSupportedFormats (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-enable failing test Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/video/capture/android/video_capture_device_factory_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « media/video/capture/android/video_capture_device_factory_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698