Add support for multiple simultaneous subresource_filter::Configurations.

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 <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 345 matching lines @@
         test_ruleset_publisher_.SetRuleset(test_ruleset_pair.unindexed));
   }
 
   void ResetConfiguration(Configuration config) {
     scoped_configuration_.ResetConfiguration(std::move(config));
   }
 
   void ResetConfigurationToEnableOnPhishingSites(
       bool measure_performance = false,
       bool whitelist_site_on_reload = false) {
-    Configuration config(
-        subresource_filter::ActivationLevel::ENABLED,
-        subresource_filter::ActivationScope::ACTIVATION_LIST,
-        subresource_filter::ActivationList::PHISHING_INTERSTITIAL);
-    config.performance_measurement_rate = measure_performance ? 1.0 : 0.0;
-    config.should_whitelist_site_on_reload = whitelist_site_on_reload;
+    Configuration config = Configuration::MakePresetForLiveRunOnPhishingSites();
+    config.activation_options.performance_measurement_rate =
+        measure_performance ? 1.0 : 0.0;
+    config.activation_options.should_whitelist_site_on_reload =
+        whitelist_site_on_reload;
     ResetConfiguration(std::move(config));
   }
 
  private:
   TestRulesetCreator ruleset_creator_;
   ScopedSubresourceFilterConfigurator scoped_configuration_;
   TestRulesetPublisher test_ruleset_publisher_;
 
   std::unique_ptr<safe_browsing::TestSafeBrowsingServiceFactory> sb_factory_;
   // Owned by the V4Database.
@@ skipping 991 matching lines @@
                                    std::string(kSubresourceFilterOnlySuffix)),
               ::testing::IsEmpty());
 
   EXPECT_THAT(tester.GetAllSamples(std::string(kNavigationChainSize) +
                                    std::string(kSubresourceFilterOnlySuffix)),
               ::testing::IsEmpty());
 }
 #endif
 
 }  // namespace subresource_filter