| Index: content/browser/renderer_host/media/video_capture_browsertest.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_browsertest.cc b/content/browser/renderer_host/media/video_capture_browsertest.cc
|
| index e4c37d1e64a1cce636638653185b47ece3eefd92..3a8ca72718aa01dfbbdfc7153efe4e2c2ebc0ed8 100644
|
| --- a/content/browser/renderer_host/media/video_capture_browsertest.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/run_loop.h"
|
| +#include "base/test/scoped_feature_list.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/browser_main_loop.h"
|
| #include "content/browser/renderer_host/media/media_stream_manager.h"
|
| @@ -110,7 +111,13 @@ class VideoCaptureBrowserTest : public ContentBrowserTest,
|
| ExerciseAcceleratedJpegDecoding,
|
| UseMojoService>> {
|
| public:
|
| - VideoCaptureBrowserTest() { params_ = TestParams(GetParam()); }
|
| + VideoCaptureBrowserTest() {
|
| + params_ = TestParams(GetParam());
|
| + if (params_.use_mojo_service) {
|
| + scoped_feature_list_.InitAndEnableFeature(
|
| + video_capture::kMojoVideoCapture);
|
| + }
|
| + }
|
|
|
| void SetUpAndStartCaptureDeviceOnIOThread(base::Closure continuation) {
|
| video_capture_manager_ = media_stream_manager_->video_capture_manager();
|
| @@ -157,10 +164,6 @@ class VideoCaptureBrowserTest : public ContentBrowserTest,
|
| base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kDisableAcceleratedMjpegDecode);
|
| }
|
| - if (params_.use_mojo_service) {
|
| - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
|
| - switches::kEnableFeatures, video_capture::kMojoVideoCapture.name);
|
| - }
|
| }
|
|
|
| // This cannot be part of an override of SetUp(), because at the time when
|
| @@ -211,6 +214,7 @@ class VideoCaptureBrowserTest : public ContentBrowserTest,
|
| MockMediaStreamProviderListener mock_stream_provider_listener_;
|
| MockVideoCaptureControllerEventHandler mock_controller_event_handler_;
|
| base::WeakPtr<VideoCaptureController> controller_;
|
| + base::test::ScopedFeatureList scoped_feature_list_;
|
| };
|
|
|
| IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) {
|
|
|