diff --git a/AUTHORS b/AUTHORS index d231ba26e54173..d7f0a3dc9b6723 100644 --- a/AUTHORS +++ b/AUTHORS @@ -667,7 +667,6 @@ Raveendra Karu Ravi Nanjundappa Ravi Phaneendra Kasibhatla Ravi Phaneendra Kasibhatla -Réda Housni Alaoui Refael Ackermann Renata Hodovan Rene Bolldorf @@ -914,7 +913,6 @@ BlackBerry Limited <*@blackberry.com> Canonical Limited <*@canonical.com> Code Aurora Forum <*@codeaurora.org> Comodo CA Limited -Cosium <*@cosium.com> Endless Mobile, Inc. <*@endlessm.com> Facebook, Inc. <*@fb.com> Facebook, Inc. <*@oculus.com> diff --git a/content/browser/webrtc/webrtc_image_capture_browsertest.cc b/content/browser/webrtc/webrtc_image_capture_browsertest.cc index 2028b32464af5c..f4757d01c4a5d6 100644 --- a/content/browser/webrtc/webrtc_image_capture_browsertest.cc +++ b/content/browser/webrtc/webrtc_image_capture_browsertest.cc @@ -46,26 +46,13 @@ namespace { static const char kImageCaptureHtmlFile[] = "/media/image_capture_test.html"; -enum class Camera { - FAKE, - DEFAULT, -#if defined(OS_WIN) - // Media Foundation is only available in Windows versions >= 7, below that the - // following flag has no effect - WIN_MEDIA_FOUNDATION -#endif -}; - // TODO(mcasas): enable real-camera tests by disabling the Fake Device for // platforms where the ImageCaptureCode is landed, https://crbug.com/656810 static struct TargetCamera { - Camera camera; -} const kTargetCameras[] = {{Camera::FAKE}, + bool use_fake; +} const kTargetCameras[] = {{true}, #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID) - {Camera::DEFAULT}, -#endif -#if defined(OS_WIN) - {Camera::WIN_MEDIA_FOUNDATION} + {false} #endif }; @@ -158,23 +145,11 @@ class WebRtcImageCaptureSucceedsBrowserTest void SetUpCommandLine(base::CommandLine* command_line) override { WebRtcImageCaptureBrowserTestBase::SetUpCommandLine(command_line); - switch (std::get<0>(GetParam()).camera) { - case Camera::FAKE: - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kUseFakeDeviceForMediaStream); - ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kUseFakeDeviceForMediaStream)); - break; -#if defined(OS_WIN) - case Camera::WIN_MEDIA_FOUNDATION: - base::CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kForceMediaFoundationVideoCapture); - ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kForceMediaFoundationVideoCapture)); - break; -#endif - default: - break; + if (std::get<0>(GetParam()).use_fake) { + base::CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kUseFakeDeviceForMediaStream); + ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kUseFakeDeviceForMediaStream)); } } @@ -182,7 +157,7 @@ class WebRtcImageCaptureSucceedsBrowserTest // TODO(chfremer): Enable test cases using the video capture service with // real cameras as soon as root cause for https://crbug.com/733582 is // understood and resolved. - if ((std::get<0>(GetParam()).camera != Camera::FAKE) && + if ((!std::get<0>(GetParam()).use_fake) && (std::get<1>(GetParam()).use_video_capture_service)) { LOG(INFO) << "Skipping this test case"; return true; diff --git a/content/test/data/media/image_capture_test.html b/content/test/data/media/image_capture_test.html index 52391632b72f00..beb85fa9977624 100644 --- a/content/test/data/media/image_capture_test.html +++ b/content/test/data/media/image_capture_test.html @@ -6,7 +6,7 @@