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

chrome/browser/subresource_filter/subresource_filter_browsertest.cc

Index: chrome/browser/subresource_filter/subresource_filter_browsertest.cc
diff --git a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
index 0e3c700168664279697e75ba5fbb7ee6064f28d1..1685724e21049e7ea4743bfcdee3fb5265a5e57f 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
@@ -46,6 +46,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
+#include "components/safe_browsing/features.h"
 #include "components/safe_browsing_db/test_database_manager.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/safe_browsing_db/v4_database.h"
@@ -210,20 +211,17 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterDisabledByDefaultBrowserTest,
 
 class SubresourceFilterBrowserTest : public InProcessBrowserTest {
  public:
-  SubresourceFilterBrowserTest() {}
-  ~SubresourceFilterBrowserTest() override {}
-
- protected:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    base::JoinString(RequiredFeatures(), ","));
+  SubresourceFilterBrowserTest() {
+    scoped_feature_list_.InitWithFeatures(
+        {kSafeBrowsingSubresourceFilter,
+         kSafeBrowsingSubresourceFilterExperimentalUI,
+         safe_browsing::kV4OnlyEnabled},
+        {});
   }
 
-  std::vector<base::StringPiece> RequiredFeatures() const {
-    return {kSafeBrowsingSubresourceFilter.name, "SafeBrowsingV4OnlyEnabled",
-            kSafeBrowsingSubresourceFilterExperimentalUI.name};
-  }
+  ~SubresourceFilterBrowserTest() override {}
 
+ protected:
   void SetUp() override {
     sb_factory_ =
         base::MakeUnique<safe_browsing::TestSafeBrowsingServiceFactory>(
@@ -428,6 +426,8 @@ class SubresourceFilterBrowserTest : public InProcessBrowserTest {
   // Owned by the profile.
   SubresourceFilterContentSettingsManager* settings_manager_;
 
+  base::test::ScopedFeatureList scoped_feature_list_;
+
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterBrowserTest);
 };
 
@@ -482,29 +482,24 @@ class SubresourceFilterWorkerFetchBrowserTest
     : public SubresourceFilterBrowserTest,
       public ::testing::WithParamInterface<OffMainThreadFetchPolicy> {
  public:
-  SubresourceFilterWorkerFetchBrowserTest() {}
-  ~SubresourceFilterWorkerFetchBrowserTest() override {}
-
- protected:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    std::vector<base::StringPiece> features =
-        SubresourceFilterBrowserTest::RequiredFeatures();
+  SubresourceFilterWorkerFetchBrowserTest() {
     if (GetParam() == OffMainThreadFetchPolicy::kEnabled) {
-      features.push_back(features::kOffMainThreadFetch.name);
+      scoped_feature_list_.InitAndEnableFeature(features::kOffMainThreadFetch);
     } else {
-      command_line->AppendSwitchASCII(switches::kDisableFeatures,
-                                      features::kOffMainThreadFetch.name);
+      scoped_feature_list_.InitAndDisableFeature(features::kOffMainThreadFetch);
     }
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    base::JoinString(features, ","));
   }
 
+  ~SubresourceFilterWorkerFetchBrowserTest() override {}
+
+ protected:
   void ClearTitle() {
     ASSERT_TRUE(content::ExecuteScript(web_contents()->GetMainFrame(),
                                        "document.title = \"\";"));
   }
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterWorkerFetchBrowserTest);
 };