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

content/browser/generic_sensor_browsertest.cc

Index: content/browser/generic_sensor_browsertest.cc
diff --git a/content/browser/generic_sensor_browsertest.cc b/content/browser/generic_sensor_browsertest.cc
index 8b3b9ee647dffe5a5ec01321424cf37ebc8f6811..c285f434801a2697df4f920056c7a19840802f75 100644
--- a/content/browser/generic_sensor_browsertest.cc
+++ b/content/browser/generic_sensor_browsertest.cc
@@ -6,6 +6,7 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"
@@ -25,6 +26,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/buffer.h"
+#include "services/device/public/cpp/device_features.h"
 #include "services/device/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/service_context.h"
 
@@ -168,9 +170,11 @@ class GenericSensorBrowserTest : public ContentBrowserTest {
   GenericSensorBrowserTest()
       : io_loop_finished_event_(
             base::WaitableEvent::ResetPolicy::AUTOMATIC,
-            base::WaitableEvent::InitialState::NOT_SIGNALED) {
-    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-    cmd_line->AppendSwitchASCII(switches::kEnableFeatures, "GenericSensor");
+            base::WaitableEvent::InitialState::NOT_SIGNALED) {}
+
+  void SetUp() override {
+    scoped_feature_list_.InitAndEnableFeature(features::kGenericSensor);
+    ContentBrowserTest::SetUp();
   }
 
   void SetUpOnMainThread() override {
@@ -198,6 +202,7 @@ class GenericSensorBrowserTest : public ContentBrowserTest {
  private:
   base::WaitableEvent io_loop_finished_event_;
   std::unique_ptr<FakeSensorProvider> fake_sensor_provider_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(GenericSensorBrowserTest);
 };