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

content/browser/webrtc/webrtc_image_capture_browsertest.cc

 // Copyright 2016 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/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"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
 #include "media/capture/video/fake_video_capture_device_factory.h"
@@ skipping 109 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WebRtcImageCaptureBrowserTestBase);
 };
 
 // Test fixture for setting up a capture device (real or fake) that successfully
 // serves all image capture requests.
 class WebRtcImageCaptureSucceedsBrowserTest
     : public WebRtcImageCaptureBrowserTestBase,
       public testing::WithParamInterface<
           std::tuple<TargetCamera, TargetVideoCaptureStack>> {
  public:
-  WebRtcImageCaptureSucceedsBrowserTest() = default;
+  WebRtcImageCaptureSucceedsBrowserTest() {
+    if (std::get<1>(GetParam()).use_video_capture_service) {
+      scoped_feature_list_.InitAndEnableFeature(
+          video_capture::kMojoVideoCapture);
+    }
+  }
+
   ~WebRtcImageCaptureSucceedsBrowserTest() override = default;
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcImageCaptureBrowserTestBase::SetUpCommandLine(command_line);
 
     if (std::get<0>(GetParam()).use_fake) {
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kUseFakeDeviceForMediaStream);
       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 {
     // 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()).use_fake) &&
         (std::get<1>(GetParam()).use_video_capture_service)) {
       LOG(INFO) << "Skipping this test case";
       return true;
     }
     return WebRtcImageCaptureBrowserTestBase::RunImageCaptureTestCase(command);
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
                        MAYBE_GetPhotoCapabilities) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(
       RunImageCaptureTestCase("testCreateAndGetPhotoCapabilitiesSucceeds()"));
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
@@ skipping 38 matching lines @@
                      testing::ValuesIn(kTargetVideoCaptureStacks)));
 
 // Test fixture template for setting up a fake device with a custom
 // configuration. We are going to use this to set up fake devices that respond
 // to invocation of various ImageCapture API calls with a failure response.
 template <typename FakeDeviceConfigTraits>
 class WebRtcImageCaptureCustomConfigFakeDeviceBrowserTest
     : public WebRtcImageCaptureBrowserTestBase,
       public testing::WithParamInterface<TargetVideoCaptureStack> {
  public:
+  WebRtcImageCaptureCustomConfigFakeDeviceBrowserTest() {
+    if (GetParam().use_video_capture_service) {
+      scoped_feature_list_.InitAndEnableFeature(
+          video_capture::kMojoVideoCapture);
+    }
+  }
+
   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 {
   static std::string config() {
     return media::FakeVideoCaptureDeviceFactory::
         kDeviceConfigForGetPhotoStateFails;
   }
 };
 
 using WebRtcImageCaptureGetPhotoStateFailsBrowserTest =
@@ skipping 70 matching lines @@
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureTakePhotoFailsBrowserTest, GrabFrame) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGrabFrameSucceeds()"));
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcImageCaptureTakePhotoFailsBrowserTest,
                         testing::ValuesIn(kTargetVideoCaptureStacks));
 
 }  // namespace content