[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/bind.h"
 #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"
 #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/base/synchronization/one_writer_seqlock.h"
 #include "device/generic_sensor/public/cpp/platform_sensor_configuration.h"
 #include "device/generic_sensor/public/cpp/sensor_reading.h"
 #include "device/generic_sensor/public/interfaces/sensor.mojom.h"
 #include "device/generic_sensor/public/interfaces/sensor_provider.mojom.h"
 #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"
 
 namespace content {
 
 namespace {
 
 class FakeAmbientLightSensor : public device::mojom::Sensor {
  public:
   FakeAmbientLightSensor() {
@@ skipping 123 matching lines @@
   mojo::Binding<device::mojom::SensorProvider> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSensorProvider);
 };
 
 class GenericSensorBrowserTest : public ContentBrowserTest {
  public:
   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 {
     fake_sensor_provider_ = base::MakeUnique<FakeSensorProvider>();
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&GenericSensorBrowserTest::SetBinderOnIOThread,
                    base::Unretained(this)));
 
     io_loop_finished_event_.Wait();
   }
 
   void SetBinderOnIOThread() {
     // Because Device Service also runs in this process(browser process), here
     // we can directly set our binder to intercept interface requests against
     // it.
     service_manager::ServiceContext::SetGlobalBinderForTesting(
         device::mojom::kServiceName, device::mojom::SensorProvider::Name_,
         base::Bind(&FakeSensorProvider::Bind,
                    base::Unretained(fake_sensor_provider_.get())));
 
     io_loop_finished_event_.Signal();
   }
 
  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);
 };
 
 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