Index: content/browser/generic_sensor_browsertest.cc |
diff --git a/content/browser/generic_sensor_browsertest.cc b/content/browser/generic_sensor_browsertest.cc |
index 66375fe3fa4eb304a5034a85a3cc9dff9199d0c2..daaf42a6c34bab01057271ec43bfe109890333dd 100644 |
--- a/content/browser/generic_sensor_browsertest.cc |
+++ b/content/browser/generic_sensor_browsertest.cc |
@@ -6,6 +6,7 @@ |
#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" |
@@ -20,6 +21,7 @@ |
#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 { |
@@ -93,10 +95,11 @@ class GenericSensorBrowserTest : public ContentBrowserTest { |
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 { |
@@ -117,8 +120,8 @@ class GenericSensorBrowserTest : public ContentBrowserTest { |
device::PlatformSensorProvider::SetProviderForTesting(nullptr); |
} |
- public: |
base::WaitableEvent io_loop_finished_event_; |
+ base::test::ScopedFeatureList scoped_feature_list_; |
}; |
IN_PROC_BROWSER_TEST_F(GenericSensorBrowserTest, AmbientLightSensorTest) { |