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

content/browser/generic_sensor_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/macros.h"
 #include "base/memory/singleton.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"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 #include "device/generic_sensor/platform_sensor.h"
 #include "device/generic_sensor/platform_sensor_provider.h"
 #include "device/generic_sensor/sensor_provider_impl.h"
+#include "services/device/public/cpp/device_features.h"
 
 namespace content {
 
 namespace {
 
 class FakeAmbientLightSensor : public device::PlatformSensor {
  public:
   FakeAmbientLightSensor(mojo::ScopedSharedBufferMapping mapping,
                          device::PlatformSensorProvider* provider)
       : PlatformSensor(device::mojom::SensorType::AMBIENT_LIGHT,
@@ skipping 53 matching lines @@
         callback.Run(nullptr);
     }
   }
 };
 
 class GenericSensorBrowserTest : public ContentBrowserTest {
  public:
   GenericSensorBrowserTest()
       : io_loop_finished_event_(
             base::WaitableEvent::ResetPolicy::AUTOMATIC,
-            base::WaitableEvent::InitialState::NOT_SIGNALED) {
+            base::WaitableEvent::InitialState::NOT_SIGNALED) {}
+
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     // TODO(darktears): remove when the GenericSensor feature goes stable.
-    base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-    cmd_line->AppendSwitchASCII(switches::kEnableFeatures, "GenericSensor");
+    scoped_feature_list_.InitAndEnableFeature(features::kGenericSensor);
   }
 
   void SetUpOnMainThread() override {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&GenericSensorBrowserTest::SetUpOnIOThread,
                    base::Unretained(this)));
     io_loop_finished_event_.Wait();
   }
 
   void SetUpOnIOThread() {
     device::PlatformSensorProvider::SetProviderForTesting(
         FakeSensorProvider::GetInstance());
     io_loop_finished_event_.Signal();
   }
 
   void TearDown() override {
     device::PlatformSensorProvider::SetProviderForTesting(nullptr);
   }
 
- public:
   base::WaitableEvent io_loop_finished_event_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(GenericSensorBrowserTest, AmbientLightSensorTest) {
   // The test page will create an AmbientLightSensor object in Javascript,
   // expects to get events with fake values then navigates to #pass.
   GURL test_url =
       GetTestUrl("generic_sensor", "ambient_light_sensor_test.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 2);
   EXPECT_EQ("pass", shell()->web_contents()->GetLastCommittedURL().ref());
 }
 
 }  //  namespace
 
 }  //  namespace content