Add support for multiple simultaneous subresource_filter::Configurations.

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Index: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index fbd985f10c744e2e5567e9f26eae277a3522b0d2..4ee24074f8b90b7a98fa27120eda1adbb701cf90 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -908,10 +908,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, MainFrameHitWithReferrer) {
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SubresourceFilterEndToEndTest) {
   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));
+      scoped_configuration(subresource_filter::Configuration::
+                               MakePresetForLiveRunOnPhishingSites());

[Charlie Harrison, 2017/05/03 14:52:17]

Ahh, much better :D

[engedy, 2017/05/05 12:25:41]

:-)

 
   subresource_filter::testing::TestRulesetCreator ruleset_creator;
   subresource_filter::testing::TestRulesetPair test_ruleset_pair;
@@ -1984,10 +1982,8 @@ IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest, MainFrameHitWithReferrer) {
 IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest,
                        SubresourceFilterEndToEndTest) {
   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));
+      scoped_configuration(subresource_filter::Configuration::
+                               MakePresetForLiveRunOnPhishingSites());
 
   subresource_filter::testing::TestRulesetCreator ruleset_creator;
   subresource_filter::testing::TestRulesetPair test_ruleset_pair;