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

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

Issue 197873017: Reconnect VideoCaptureDeviceTest.GetDeviceSupportedFormats for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 | « no previous file | 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 45ae693bec29789b2c4ace2824ea0bada63bb066..3234d6150a11a488412dd3596ae4b6ecc7115ed4 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -358,13 +358,7 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) {
device->StopAndDeAllocate();
}
-#if defined(OS_ANDROID)
-// TODO(mcasas): Reenable this test that is disabled in Android due to
-// http://crbug.com/327043.
-TEST_F(VideoCaptureDeviceTest, DISABLED_GetDeviceSupportedFormats) {
-#else
TEST_F(VideoCaptureDeviceTest, GetDeviceSupportedFormats) {
-#endif
VideoCaptureDevice::GetDeviceNames(&names_);
if (!names_.size()) {
DVLOG(1) << "No camera available. Exiting test.";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698