Split the ScopedSubresourceFilterFeatureToggle into two helper classes.

components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc

 // Copyright 2017 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 "components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
@@ skipping 91 matching lines @@
 class SubresourceFilterSafeBrowsingActivationThrottleTest
     : public content::RenderViewHostTestHarness,
       public content::WebContentsObserver {
  public:
   SubresourceFilterSafeBrowsingActivationThrottleTest()
       : field_trial_list_(nullptr) {}
   ~SubresourceFilterSafeBrowsingActivationThrottleTest() override {}
 
   void SetUp() override {
     content::RenderViewHostTestHarness::SetUp();
-    scoped_feature_toggle_.reset(
-        new testing::ScopedSubresourceFilterFeatureToggle(
-            base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
-            kActivationScopeActivationList, kActivationListSubresourceFilter));
+    scoped_configuration_.ResetConfiguration(Configuration(
+        ActivationLevel::ENABLED, ActivationScope::ACTIVATION_LIST,

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

#include activation_list, activation_scope, and activation_level.

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

Done.

+        ActivationList::SUBRESOURCE_FILTER));
     // Note: Using NiceMock to allow uninteresting calls and suppress warnings.
     auto client =
         base::MakeUnique<::testing::NiceMock<MockSubresourceFilterClient>>();
     ContentSubresourceFilterDriverFactory::CreateForWebContents(
         RenderViewHostTestHarness::web_contents(), std::move(client));
     fake_safe_browsing_database_ = new FakeSafeBrowsingDatabaseManager();
     NavigateAndCommit(GURL("https://test.com"));
     Observe(RenderViewHostTestHarness::web_contents());
   }
 
@@ skipping 42 matching lines @@
     fake_safe_browsing_database_->AddBlacklistedUrl(
         url, safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER);
   }
 
   void SimulateTimeout() { fake_safe_browsing_database_->SimulateTimeout(); }
 
   const base::HistogramTester& tester() const { return tester_; }
 
  private:
   base::FieldTrialList field_trial_list_;
-  std::unique_ptr<testing::ScopedSubresourceFilterFeatureToggle>
-      scoped_feature_toggle_;
+  testing::ScopedSubresourceFilterConfigurator scoped_configuration_;
   std::unique_ptr<content::NavigationSimulator> navigation_simulator_;
   scoped_refptr<FakeSafeBrowsingDatabaseManager> fake_safe_browsing_database_;
   base::HistogramTester tester_;
   content::NavigationHandle* navigation_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterSafeBrowsingActivationThrottleTest);
 };
 
 TEST_F(SubresourceFilterSafeBrowsingActivationThrottleTest,
        ListNotMatched_NoActivation) {
@@ skipping 71 matching lines @@
                             0);
   tester().ExpectTotalCount(kNavigationChainSizeSubresourceFilterSuffix, 0);
 }
 
 // TODO(melandory): Once non-defering check in WillStart is implemented add one
 // more test that destroys the Navigation along with corresponding throttles
 // while the SB check is pending? (To be run by ASAN bots to ensure
 // no use-after-free.)
 
 }  // namespace subresource_filter