Split the ScopedSubresourceFilterFeatureToggle into two helper classes.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

 // Copyright (c) 2012 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.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
@@ skipping 886 matching lines @@
 
   EXPECT_TRUE(ShowingInterstitialPage());
   EXPECT_TRUE(got_hit_report());
   EXPECT_EQ(bad_url, hit_report().malicious_url);
   EXPECT_EQ(bad_url, hit_report().page_url);
   EXPECT_EQ(first_url, hit_report().referrer_url);
   EXPECT_FALSE(hit_report().is_subresource);
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SubresourceFilterEndToEndTest) {
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          subresource_filter::kActivationLevelEnabled,
-          subresource_filter::kActivationScopeActivationList,
-          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
+  subresource_filter::testing::ScopedSubresourceFilterConfigurator
+      scoped_configuration(subresource_filter::Configuration(
+          subresource_filter::ActivationLevel::ENABLED,

[Charlie Harrison, 2017/04/25 19:36:21]

#include activation_{scope,level,list}

[engedy, 2017/04/25 20:13:24]

Done.

+          subresource_filter::ActivationScope::ACTIVATION_LIST,
+          subresource_filter::ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL));
 
   subresource_filter::testing::TestRulesetCreator ruleset_creator;
   subresource_filter::testing::TestRulesetPair test_ruleset_pair;
   ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
       "included_script.js", &test_ruleset_pair);
   subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
   ASSERT_NO_FATAL_FAILURE(
       test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
 
   GURL phishing_url = embedded_test_server()->GetURL(
@@ skipping 1047 matching lines @@
   EXPECT_TRUE(ShowingInterstitialPage());
   EXPECT_TRUE(got_hit_report());
   EXPECT_EQ(bad_url, hit_report().malicious_url);
   EXPECT_EQ(bad_url, hit_report().page_url);
   EXPECT_EQ(first_url, hit_report().referrer_url);
   EXPECT_FALSE(hit_report().is_subresource);
 }
 
 IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
                        SubresourceFilterEndToEndTest) {
-  subresource_filter::testing::ScopedSubresourceFilterFeatureToggle
-      scoped_feature_toggle(
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE,
-          subresource_filter::kActivationLevelEnabled,
-          subresource_filter::kActivationScopeActivationList,
-          subresource_filter::kActivationListSocialEngineeringAdsInterstitial);
+  subresource_filter::testing::ScopedSubresourceFilterConfigurator
+      scoped_configuration(subresource_filter::Configuration(
+          subresource_filter::ActivationLevel::ENABLED,
+          subresource_filter::ActivationScope::ACTIVATION_LIST,
+          subresource_filter::ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL));
 
   subresource_filter::testing::TestRulesetCreator ruleset_creator;
   subresource_filter::testing::TestRulesetPair test_ruleset_pair;
   ruleset_creator.CreateRulesetToDisallowURLsWithPathSuffix(
       "included_script.js", &test_ruleset_pair);
   subresource_filter::testing::TestRulesetPublisher test_ruleset_publisher;
   ASSERT_NO_FATAL_FAILURE(
       test_ruleset_publisher.SetRuleset(test_ruleset_pair.unindexed));
 
   GURL phishing_url = embedded_test_server()->GetURL(
@@ skipping 493 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     MaybeSetMetadata,
     V4SafeBrowsingServiceMetadataTest,
     testing::Values(ThreatPatternType::NONE,
                     ThreatPatternType::MALWARE_LANDING,
                     ThreatPatternType::MALWARE_DISTRIBUTION));
 
 }  // namespace safe_browsing