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

content/browser/webrtc/webrtc_image_capture_browsertest.cc

Index: content/browser/webrtc/webrtc_image_capture_browsertest.cc
diff --git a/content/browser/webrtc/webrtc_image_capture_browsertest.cc b/content/browser/webrtc/webrtc_image_capture_browsertest.cc
index 22b925ae4a5588977efe80a7e93007ef9e0bfebf..3cd33a9737c09d64fb0e3682ec77f25fe4c5bb77 100644
--- a/content/browser/webrtc/webrtc_image_capture_browsertest.cc
+++ b/content/browser/webrtc/webrtc_image_capture_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "content/browser/webrtc/webrtc_webcam_browsertest.h"
 #include "content/public/common/content_switches.h"
@@ -135,6 +136,14 @@ class WebRtcImageCaptureSucceedsBrowserTest
   WebRtcImageCaptureSucceedsBrowserTest() = default;
   ~WebRtcImageCaptureSucceedsBrowserTest() override = default;
 
+  void SetUp() override {
+    if (std::get<1>(GetParam()).use_video_capture_service) {
+      scoped_feature_list_.InitAndEnableFeature(
+          video_capture::kMojoVideoCapture);
+    }
+    WebRtcImageCaptureBrowserTestBase::SetUp();
+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcImageCaptureBrowserTestBase::SetUpCommandLine(command_line);
 
@@ -144,10 +153,6 @@ class WebRtcImageCaptureSucceedsBrowserTest
       ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeDeviceForMediaStream));
     }
-    if (std::get<1>(GetParam()).use_video_capture_service) {
-      base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-          switches::kEnableFeatures, video_capture::kMojoVideoCapture.name);
-    }
   }
 
   bool RunImageCaptureTestCase(const std::string& command) override {
@@ -161,6 +166,9 @@ class WebRtcImageCaptureSucceedsBrowserTest
     }
     return WebRtcImageCaptureBrowserTestBase::RunImageCaptureTestCase(command);
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
@@ -219,17 +227,24 @@ class WebRtcImageCaptureCustomConfigFakeDeviceBrowserTest
     : public WebRtcImageCaptureBrowserTestBase,
       public testing::WithParamInterface<TargetVideoCaptureStack> {
  public:
+  void SetUp() override {
+    if (GetParam().use_video_capture_service) {
+      scoped_feature_list_.InitAndEnableFeature(
+          video_capture::kMojoVideoCapture);
+    }
+    WebRtcImageCaptureBrowserTestBase::SetUp();
+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcImageCaptureBrowserTestBase::SetUpCommandLine(command_line);
 
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kUseFakeDeviceForMediaStream,
         std::string("config=") + FakeDeviceConfigTraits::config());
-    if (GetParam().use_video_capture_service) {
-      base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-          switches::kEnableFeatures, video_capture::kMojoVideoCapture.name);
-    }
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 struct GetPhotoStateFailsConfigTraits {