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

chrome/browser/subresource_filter/subresource_filter_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 <map>
 #include <memory>
 #include <sstream>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #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"
 #include "components/security_interstitials/content/unsafe_resource.h"
 #include "components/subresource_filter/content/browser/async_document_subresource_filter.h"
 #include "components/subresource_filter/content/browser/async_document_subresource_filter_test_utils.h"
 #include "components/subresource_filter/content/browser/content_ruleset_service.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
 #include "components/subresource_filter/core/browser/subresource_filter_constants.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
@@ skipping 144 matching lines @@
 // specified in the field trial configuration.
 IN_PROC_BROWSER_TEST_F(SubresourceFilterDisabledByDefaultBrowserTest,
                        RulesetServiceNotCreated) {
   EXPECT_FALSE(g_browser_process->subresource_filter_ruleset_service());
 }
 
 // SubresourceFilterBrowserTest -----------------------------------------------
 
 class SubresourceFilterBrowserTest : public InProcessBrowserTest {
  public:
-  SubresourceFilterBrowserTest() {}
+  SubresourceFilterBrowserTest() {
+    scoped_feature_list_.InitWithFeatures(
+        {kSafeBrowsingSubresourceFilter,
+         kSafeBrowsingSubresourceFilterExperimentalUI,
+         safe_browsing::kV4OnlyEnabled},
+        {});
+  }
+
   ~SubresourceFilterBrowserTest() override {}
 
  protected:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    base::JoinString(RequiredFeatures(), ","));
-  }
-
-  std::vector<base::StringPiece> RequiredFeatures() const {
-    return {kSafeBrowsingSubresourceFilter.name, "SafeBrowsingV4OnlyEnabled",
-            kSafeBrowsingSubresourceFilterExperimentalUI.name};
-  }
-
   void SetUp() override {
     sb_factory_ =
         base::MakeUnique<safe_browsing::TestSafeBrowsingServiceFactory>(
             safe_browsing::V4FeatureList::V4UsageStatus::V4_ONLY);
     sb_factory_->SetTestUIManager(new FakeSafeBrowsingUIManager());
     safe_browsing::SafeBrowsingService::RegisterFactory(sb_factory_.get());
 
     safe_browsing::V4Database::RegisterStoreFactoryForTest(
         base::WrapUnique(new safe_browsing::TestV4StoreFactory()));
 
@@ skipping 184 matching lines @@
 
   std::unique_ptr<safe_browsing::TestSafeBrowsingServiceFactory> sb_factory_;
   // Owned by the V4Database.
   safe_browsing::TestV4DatabaseFactory* v4_db_factory_;
   // Owned by the V4GetHashProtocolManager.
   safe_browsing::TestV4GetHashProtocolManagerFactory* v4_get_hash_factory_;
 
   // Owned by the profile.
   SubresourceFilterContentSettingsManager* settings_manager_;
 
+  base::test::ScopedFeatureList scoped_feature_list_;
+
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterBrowserTest);
 };
 
 enum WebSocketCreationPolicy {
   IN_MAIN_FRAME,
   IN_WORKER,
 };
 class SubresourceFilterWebSocketBrowserTest
     : public SubresourceFilterBrowserTest,
       public ::testing::WithParamInterface<WebSocketCreationPolicy> {
@@ skipping 34 matching lines @@
 
 enum class OffMainThreadFetchPolicy {
   kEnabled,
   kDisabled,
 };
 
 class SubresourceFilterWorkerFetchBrowserTest
     : public SubresourceFilterBrowserTest,
       public ::testing::WithParamInterface<OffMainThreadFetchPolicy> {
  public:
-  SubresourceFilterWorkerFetchBrowserTest() {}
+  SubresourceFilterWorkerFetchBrowserTest() {
+    if (GetParam() == OffMainThreadFetchPolicy::kEnabled) {
+      scoped_feature_list_.InitAndEnableFeature(features::kOffMainThreadFetch);
+    } else {
+      scoped_feature_list_.InitAndDisableFeature(features::kOffMainThreadFetch);
+    }
+  }
+
   ~SubresourceFilterWorkerFetchBrowserTest() override {}
 
  protected:
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    std::vector<base::StringPiece> features =
-        SubresourceFilterBrowserTest::RequiredFeatures();
-    if (GetParam() == OffMainThreadFetchPolicy::kEnabled) {
-      features.push_back(features::kOffMainThreadFetch.name);
-    } else {
-      command_line->AppendSwitchASCII(switches::kDisableFeatures,
-                                      features::kOffMainThreadFetch.name);
-    }
-    command_line->AppendSwitchASCII(switches::kEnableFeatures,
-                                    base::JoinString(features, ","));
-  }
-
   void ClearTitle() {
     ASSERT_TRUE(content::ExecuteScript(web_contents()->GetMainFrame(),
                                        "document.title = \"\";"));
   }
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterWorkerFetchBrowserTest);
 };
 
 // Tests -----------------------------------------------------------------------
 
 IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, MainFrameActivation) {
   content::ConsoleObserverDelegate console_observer(web_contents(),
                                                     kActivationConsoleMessage);
   web_contents()->SetDelegate(&console_observer);
   GURL url(GetTestUrl("subresource_filter/frame_with_included_script.html"));
@@ skipping 1303 matching lines @@
                                 std::string(kSubresourceFilterOnlySuffix),
                             false, 1);
 
   tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
                                 std::string(kPhishingInterstitialSuffix),
                             false, 1);
 }
 #endif
 
 }  // namespace subresource_filter