[Cleanup] Move all browsertests to use ScopedFeatureList to modify features

content/browser/renderer_host/media/video_capture_browsertest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/media_switches.h"
 #include "media/capture/video_capture_types.h"
@@ skipping 121 matching lines @@
     video_capture_manager_->DisconnectClient(controller_.get(), stub_client_id_,
                                              &mock_controller_event_handler_,
                                              false);
 
     EXPECT_CALL(mock_stream_provider_listener_, Closed(_, _))
         .WillOnce(InvokeWithoutArgs([continuation]() { continuation.Run(); }));
 
     video_capture_manager_->Close(session_id_);
   }
 
+  void SetUp() override {
+    if (params_.use_mojo_service) {
+      scoped_feature_list_.InitAndEnableFeature(
+          video_capture::kMojoVideoCapture);
+    }
+    ContentBrowserTest::SetUp();
+  }
+
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kUseFakeDeviceForMediaStream,
                                     kFakeDeviceFactoryConfigString);
     command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
     if (params_.exercise_accelerated_jpeg_decoding) {
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kUseFakeJpegDecodeAccelerator);
     } else {
       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
   // SetUp() is invoked, the BrowserMainLoop does not exist yet.
   void SetUpRequiringBrowserMainLoopOnMainThread() {
     BrowserMainLoop* browser_main_loop = BrowserMainLoop::GetInstance();
     ASSERT_TRUE(browser_main_loop);
     media_stream_manager_ = browser_main_loop->media_stream_manager();
     ASSERT_TRUE(media_stream_manager_);
   }
@@ skipping 30 matching lines @@
 
  protected:
   TestParams params_;
   MediaStreamManager* media_stream_manager_ = nullptr;
   VideoCaptureManager* video_capture_manager_ = nullptr;
   int session_id_ = 0;
   const VideoCaptureControllerID stub_client_id_ = 123;
   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) {
 #if defined(OS_ANDROID)
   // Mojo video capture is currently not supported on Android.
   // TODO(chfremer): Remove this as soon as https://crbug.com/720500 is
   // resolved.
   if (params_.use_mojo_service)
     return;
 #endif
@@ skipping 125 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(,
                         VideoCaptureBrowserTest,
                         Combine(Values(0, 1, 2),             // DeviceIndex
                                 Values(gfx::Size(640, 480),  // Resolution
                                        gfx::Size(1280, 720)),
                                 Bool(),    // ExerciseAcceleratedJpegDecoding
                                 Bool()));  // UseMojoService
 
 }  // namespace content