Split the ScopedSubresourceFilterFeatureToggle into two helper classes.

chrome/browser/component_updater/subresource_filter_component_installer_unittest.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 "chrome/browser/component_updater/subresource_filter_component_installer.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 67 matching lines @@
   ~SubresourceFilterMockComponentUpdateService() override {}
 
   scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner() override {
     return base::ThreadTaskRunnerHandle::Get();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterMockComponentUpdateService);
 };
 
+subresource_filter::Configuration CreateConfigUsingRulesetFlavor(
+    const char* ruleset_flavor) {
+  subresource_filter::Configuration config;
+  config.ruleset_flavor = ruleset_flavor;
+  return config;
+}
+
 }  //  namespace
 
 namespace component_updater {
 
 class SubresourceFilterComponentInstallerTest : public PlatformTest {
  public:
   SubresourceFilterComponentInstallerTest() {}
 
   void SetUp() override {
     PlatformTest::SetUp();
@@ skipping 61 matching lines @@
                             std::move(manifest));
     base::RunLoop().RunUntilIdle();
   }
 
   update_client::InstallerAttributes GetInstallerAttributes() {
     return traits_->GetInstallerAttributes();
   }
 
   void ExpectInstallerTag(const char* expected_tag,
                           const char* ruleset_flavor) {
-    base::FieldTrialList field_trial_list(nullptr /* entropy_provider */);
-    subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-        scoped_feature_toggle(base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-                              {{subresource_filter::kRulesetFlavorParameterName,
-                                ruleset_flavor}});
+    subresource_filter::testing::ScopedSubresourceFilterConfigurator
+        scoped_configuration(CreateConfigUsingRulesetFlavor(ruleset_flavor));
     EXPECT_EQ(expected_tag,
               SubresourceFilterComponentInstallerTraits::GetInstallerTag());
   }
 
  private:
   base::ScopedTempDir component_install_dir_;
   base::ScopedTempDir ruleset_service_dir_;
 
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<SubresourceFilterComponentInstallerTraits> traits_;
   TestingPrefServiceSimple pref_service_;
 
   TestRulesetService* test_ruleset_service_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterComponentInstallerTest);
 };
 
 TEST_F(SubresourceFilterComponentInstallerTest,
        TestComponentRegistrationWhenFeatureDisabled) {
-  base::FieldTrialList field_trial_list(nullptr);
   subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(base::FeatureList::OVERRIDE_DISABLE_FEATURE,
-                            subresource_filter::kActivationLevelEnabled,
-                            subresource_filter::kActivationScopeNoSites);
+      scoped_feature(base::FeatureList::OVERRIDE_DISABLE_FEATURE);
   std::unique_ptr<SubresourceFilterMockComponentUpdateService>
       component_updater(new SubresourceFilterMockComponentUpdateService());
   EXPECT_CALL(*component_updater, RegisterComponent(testing::_)).Times(0);
   RegisterSubresourceFilterComponent(component_updater.get());
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(SubresourceFilterComponentInstallerTest,
        TestComponentRegistrationWhenFeatureEnabled) {
-  base::FieldTrialList field_trial_list(nullptr);
   subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-                            subresource_filter::kActivationLevelDisabled,
-                            subresource_filter::kActivationScopeNoSites);
+      scoped_feature(base::FeatureList::OVERRIDE_ENABLE_FEATURE);
   std::unique_ptr<SubresourceFilterMockComponentUpdateService>
       component_updater(new SubresourceFilterMockComponentUpdateService());
   EXPECT_CALL(*component_updater, RegisterComponent(testing::_))
       .Times(1)
       .WillOnce(testing::Return(true));
   RegisterSubresourceFilterComponent(component_updater.get());
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(SubresourceFilterComponentInstallerTest, LoadEmptyRuleset) {
@@ skipping 45 matching lines @@
   ExpectInstallerTag("", "");
   ExpectInstallerTag("a", "a");
   ExpectInstallerTag("b", "b");
   ExpectInstallerTag("c", "c");
   ExpectInstallerTag("d", "d");
   ExpectInstallerTag("invalid", "e");
   ExpectInstallerTag("invalid", "foo");
 }
 
 TEST_F(SubresourceFilterComponentInstallerTest, InstallerAttributesDefault) {
-  base::FieldTrialList field_trial_list(nullptr /* entropy_provider */);
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-                            std::map<std::string, std::string>());
+  subresource_filter::testing::ScopedSubresourceFilterConfigurator
+      scoped_configuration((subresource_filter::Configuration()));
   EXPECT_EQ(update_client::InstallerAttributes(), GetInstallerAttributes());
 }
 
 TEST_F(SubresourceFilterComponentInstallerTest, InstallerAttributesCustomTag) {
   constexpr char kTagKey[] = "tag";
   constexpr char kTagValue[] = "a";
 
-  base::FieldTrialList field_trial_list(nullptr /* entropy_provider */);
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          {{subresource_filter::kRulesetFlavorParameterName, kTagValue}});
+  subresource_filter::testing::ScopedSubresourceFilterConfigurator
+      scoped_configuration(CreateConfigUsingRulesetFlavor(kTagValue));
   EXPECT_EQ(update_client::InstallerAttributes({{kTagKey, kTagValue}}),
             GetInstallerAttributes());
 }
 
-TEST_F(SubresourceFilterComponentInstallerTest,
-       InstallerAttributesFeatureDisabled) {
-  constexpr char kTagValue[] = "test_value";
-
-  base::FieldTrialList field_trial_list(nullptr /* entropy_provider */);
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_USE_DEFAULT,
-          {{subresource_filter::kRulesetFlavorParameterName, kTagValue}});
-  EXPECT_EQ(update_client::InstallerAttributes(), GetInstallerAttributes());
-}
-
 }  // namespace component_updater