Add support for multiple simultaneous subresource_filter::Configurations.

components/subresource_filter/content/browser/content_subresource_filter_driver_factory_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 "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
 
 #include <set>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 221 matching lines @@
     rules.push_back(testing::CreateSuffixRule("disallowed.html"));
     ASSERT_NO_FATAL_FAILURE(test_ruleset_creator_.CreateRulesetWithRules(
         rules, &test_ruleset_pair_));
     ruleset_dealer_ = base::MakeUnique<VerifiedRulesetDealer::Handle>(
         base::MessageLoop::current()->task_runner());
     ruleset_dealer_->SetRulesetFile(
         testing::TestRuleset::Open(test_ruleset_pair_.indexed));
     client_ = new MockSubresourceFilterClient(ruleset_dealer_.get());
     ContentSubresourceFilterDriverFactory::CreateForWebContents(
         RenderViewHostTestHarness::web_contents(), base::WrapUnique(client()));
-    ResetConfigurationToEnableFilteringOnSocialEngineeringSites();
+    ResetConfigurationToEnableFilteringOnPhishingSites();
 
     // Add a subframe.
     content::RenderFrameHostTester* rfh_tester =
         content::RenderFrameHostTester::For(main_rfh());
     rfh_tester->InitializeRenderFrameIfNeeded();
     rfh_tester->AppendChild(kSubframeName);
 
     Observe(content::RenderViewHostTestHarness::web_contents());
   }
 
   void TearDown() override {
     ruleset_dealer_.reset();
     base::RunLoop().RunUntilIdle();
     RenderViewHostTestHarness::TearDown();
   }
 
   void ResetConfiguration(Configuration config) {
     scoped_configuration_.ResetConfiguration(std::move(config));
   }
 
   void ResetConfigurationToEnableFilteringOnAllSites() {
     ResetConfiguration(
         Configuration(ActivationLevel::ENABLED, ActivationScope::ALL_SITES));
   }
 
-  void ResetConfigurationToEnableFilteringOnSocialEngineeringSites() {
-    ResetConfiguration(Configuration(
-        ActivationLevel::ENABLED, ActivationScope::ACTIVATION_LIST,
-        ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL));
+  void ResetConfigurationToEnableFilteringOnPhishingSites() {
+    ResetConfiguration(Configuration::MakePresetForLiveRunOnPhishingSites());
+  }
+
+  Configuration GetExactlyOneEnabledConfig() {
+    const auto config_list = GetEnabledConfigurations();
+    EXPECT_EQ(1u, config_list->configs_by_decreasing_priority().size());
+    if (config_list->configs_by_decreasing_priority().empty())

[pkalinnikov, 2017/05/04 12:04:22]

Given that ParseEnabledConfigurations always pushes_back a default
Configuration, this shouldn't happen, right?

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

Yes, I made this cleaner.

[pkalinnikov, 2017/05/05 13:29:58]

Yup, looks better.

+      return Configuration();
+    return (config_list->configs_by_decreasing_priority().front());
   }
 
   ContentSubresourceFilterDriverFactory* factory() {
     return ContentSubresourceFilterDriverFactory::FromWebContents(
         RenderViewHostTestHarness::web_contents());
   }
 
   MockSubresourceFilterClient* client() { return client_; }
 
   content::RenderFrameHost* GetSubframeRFH() {
@@ skipping 191 matching lines @@
       return;
 
     std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
     factory()->throttle_manager()->MaybeAppendNavigationThrottles(
         navigation_handle, &throttles);
     for (auto& it : throttles)
       navigation_handle->RegisterThrottleForTesting(std::move(it));
   }
 
  private:
-  static bool expected_measure_performance() {
-    const double rate = GetActiveConfigurations()
-                            ->the_one_and_only()
-                            .performance_measurement_rate;
-    // Note: The case when 0 < rate < 1 is not deterministic, don't test it.
-    EXPECT_TRUE(rate == 0 || rate == 1);
-    return rate == 1;
-  }
-
   testing::ScopedSubresourceFilterConfigurator scoped_configuration_;
   testing::TestRulesetCreator test_ruleset_creator_;
   testing::TestRulesetPair test_ruleset_pair_;
 
   // Owned by the factory.
   MockSubresourceFilterClient* client_;
 
   std::unique_ptr<VerifiedRulesetDealer::Handle> ruleset_dealer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSubresourceFilterDriverFactoryTest);
@@ skipping 32 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(
       ContentSubresourceFilterDriverFactoryActivationLevelTest);
 };
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest,
        NoActivationWhenActivationLevelIsDisabled) {
   Configuration config(ActivationLevel::DISABLED,
                        ActivationScope::ACTIVATION_LIST,
                        ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL);
-  config.activation_level = ActivationLevel::DISABLED;
+  config.activation_options.activation_level = ActivationLevel::DISABLED;
   ResetConfiguration(std::move(config));
 
   const GURL url(kExampleUrlWithParams);
   NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
                               ActivationDecision::ACTIVATION_DISABLED);
   factory()->client()->WhitelistInCurrentWebContents(url);
   NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
                               ActivationDecision::ACTIVATION_DISABLED);
 }
 
@@ skipping 14 matching lines @@
        SpecialCaseNavigationActivationListEnabled) {
   EmulateInPageNavigation({true}, NO_REDIRECTS_HIT,
                           ActivationDecision::ACTIVATED);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest,
        SpecialCaseNavigationActivationListEnabledWithPerformanceMeasurement) {
   Configuration config(ActivationLevel::ENABLED,
                        ActivationScope::ACTIVATION_LIST,
                        ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL);
-  config.performance_measurement_rate = 1.0;
+  config.activation_options.performance_measurement_rate = 1.0;
   ResetConfiguration(std::move(config));
 
   EmulateInPageNavigation({true}, NO_REDIRECTS_HIT,
                           ActivationDecision::ACTIVATED);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest, FailedNavigation) {
   const GURL url(kExampleUrl);
   ResetConfigurationToEnableFilteringOnAllSites();
   NavigateAndExpectActivation({false}, {url}, EMPTY,
@@ skipping 97 matching lines @@
   NavigateAndExpectActivation({false}, {GURL(kExampleUrl)}, EMPTY,
                               ActivationDecision::ACTIVATED);
   EXPECT_CALL(*client(), ToggleNotificationVisibility(true)).Times(1);
   NavigateSubframeAndExpectCheckResult(GURL(kDisallowedUrl),
                                        true /* expect_cancelled */);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest,
        SuppressNotificationVisibility) {
   Configuration config(ActivationLevel::ENABLED, ActivationScope::ALL_SITES);
-  config.should_suppress_notifications = true;
+  config.activation_options.should_suppress_notifications = true;
   ResetConfiguration(std::move(config));
   NavigateAndExpectActivation({false}, {GURL(kExampleUrl)}, EMPTY,
                               ActivationDecision::ACTIVATED);
   EXPECT_CALL(*client(), ToggleNotificationVisibility(::testing::_)).Times(0);
   NavigateSubframeAndExpectCheckResult(GURL(kDisallowedUrl),
                                        true /* expect_cancelled */);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest,
        InactiveMainFrame_SubframeNotFiltered) {
@@ skipping 19 matching lines @@
        ui::PAGE_TRANSITION_LINK, ActivationDecision::URL_WHITELISTED},
       {content::Referrer(), ui::PAGE_TRANSITION_RELOAD,
        ActivationDecision::URL_WHITELISTED}};
 
   for (const auto& test_case : kTestCases) {
     SCOPED_TRACE(::testing::Message("referrer = \"")
                  << test_case.referrer.url << "\""
                  << " transition = \"" << test_case.transition << "\"");
 
     Configuration config(ActivationLevel::ENABLED, ActivationScope::ALL_SITES);
-    config.should_whitelist_site_on_reload = true;
+    config.activation_options.should_whitelist_site_on_reload = true;
     ResetConfiguration(std::move(config));
 
     NavigateAndExpectActivation(
         {false}, {GURL(kExampleUrl)},
         safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
         safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS,
         test_case.referrer, test_case.transition, EMPTY,
         test_case.expected_activation_decision);
     // Verify that if the first URL failed to activate, subsequent same-origin
     // navigations also fail to activate.
     NavigateAndExpectActivation({false}, {GURL(kExampleUrlWithParams)}, EMPTY,
                                 test_case.expected_activation_decision);
   }
 }
 
 TEST_P(ContentSubresourceFilterDriverFactoryActivationLevelTest,
        ActivateForFrameState) {
   const ActivationLevelTestData& test_data = GetParam();
   ResetConfiguration(Configuration(
       test_data.activation_level, ActivationScope::ACTIVATION_LIST,
       ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL));
 
   const GURL url(kExampleUrlWithParams);
   NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
                               test_data.expected_activation_decision);
   factory()->client()->WhitelistInCurrentWebContents(url);
+  bool expect_activation_is_disabled =
+      GetExactlyOneEnabledConfig().activation_options.activation_level ==
+      ActivationLevel::DISABLED;
   NavigateAndExpectActivation(
       {true}, {GURL(kExampleUrlWithParams)}, NO_REDIRECTS_HIT,
-      GetActiveConfigurations()->the_one_and_only().activation_level ==
-              ActivationLevel::DISABLED
-          ? ActivationDecision::ACTIVATION_DISABLED
-          : ActivationDecision::URL_WHITELISTED);
+      expect_activation_is_disabled ? ActivationDecision::ACTIVATION_DISABLED
+                                    : ActivationDecision::URL_WHITELISTED);
 }
 
 TEST_P(ContentSubresourceFilterDriverFactoryThreatTypeTest,
        ActivateForTheListType) {
   // Sets up the experiment in a way that the activation decision depends on the
   // list for which the Safe Browsing hit has happened.
   const ActivationListTestData& test_data = GetParam();
   ResetConfiguration(Configuration(ActivationLevel::ENABLED,
                                    ActivationScope::ACTIVATION_LIST,
                                    test_data.activation_list));
@@ skipping 21 matching lines @@
 
   const GURL test_url(kExampleUrlWithParams);
 
   RedirectChainMatchPattern expected_pattern =
       test_data.url_matches_activation_list ? NO_REDIRECTS_HIT : EMPTY;
   NavigateAndExpectActivation({test_data.url_matches_activation_list},
                               {test_url}, expected_pattern,
                               test_data.expected_activation_decision);
   if (test_data.url_matches_activation_list) {
     factory()->client()->WhitelistInCurrentWebContents(test_url);
-    NavigateAndExpectActivation(
-        {test_data.url_matches_activation_list}, {GURL(kExampleUrlWithParams)},
-        expected_pattern,
-        GetActiveConfigurations()->the_one_and_only().activation_scope ==
-                ActivationScope::NO_SITES
-            ? ActivationDecision::ACTIVATION_DISABLED
-            : ActivationDecision::URL_WHITELISTED);
+    bool expect_activation_is_disabled =
+        GetExactlyOneEnabledConfig().activation_conditions.activation_scope ==
+        ActivationScope::NO_SITES;
+    NavigateAndExpectActivation({test_data.url_matches_activation_list},
+                                {GURL(kExampleUrlWithParams)}, expected_pattern,
+                                expect_activation_is_disabled
+                                    ? ActivationDecision::ACTIVATION_DISABLED
+                                    : ActivationDecision::URL_WHITELISTED);
   }
 };
 
 // Only main frames with http/https schemes should activate, unless the
 // activation scope is for all sites.
 TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
        ActivateForSupportedUrlScheme) {
   const ActivationScopeTestData& test_data = GetParam();
   ResetConfiguration(
       Configuration(ActivationLevel::ENABLED, test_data.activation_scope,
                     ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL));
 
   // data URLs are also not supported, but not listed here, as it's not possible
   // for a page to redirect to them after https://crbug.com/594215 is fixed.
   const char* unsupported_urls[] = {"ftp://example.com/", "chrome://settings",
                                     "chrome-extension://some-extension",
                                     "file:///var/www/index.html"};
   const char* supported_urls[] = {"http://example.test",
                                   "https://example.test"};
   for (auto* url : unsupported_urls) {
     SCOPED_TRACE(url);
+    bool expect_activation_is_disabled =
+        GetExactlyOneEnabledConfig().activation_conditions.activation_scope ==
+        ActivationScope::NO_SITES;
     RedirectChainMatchPattern expected_pattern = EMPTY;
     NavigateAndExpectActivation(
         {test_data.url_matches_activation_list}, {GURL(url)}, expected_pattern,
-        GetActiveConfigurations()->the_one_and_only().activation_scope ==
-                ActivationScope::NO_SITES
-            ? ActivationDecision::ACTIVATION_DISABLED
-            : ActivationDecision::UNSUPPORTED_SCHEME);
+        expect_activation_is_disabled ? ActivationDecision::ACTIVATION_DISABLED
+                                      : ActivationDecision::UNSUPPORTED_SCHEME);
   }
   for (auto* url : supported_urls) {
     SCOPED_TRACE(url);
     RedirectChainMatchPattern expected_pattern =
         test_data.url_matches_activation_list ? NO_REDIRECTS_HIT : EMPTY;
     NavigateAndExpectActivation({test_data.url_matches_activation_list},
                                 {GURL(url)}, expected_pattern,
                                 test_data.expected_activation_decision);
   }
 };
 
 INSTANTIATE_TEST_CASE_P(NoSocEngHit,
                         ContentSubresourceFilterDriverFactoryThreatTypeTest,
                         ::testing::ValuesIn(kActivationListTestData));
 
 INSTANTIATE_TEST_CASE_P(
     ActivationScopeTest,
     ContentSubresourceFilterDriverFactoryActivationScopeTest,
     ::testing::ValuesIn(kActivationScopeTestData));
 
 INSTANTIATE_TEST_CASE_P(
     ActivationLevelTest,
     ContentSubresourceFilterDriverFactoryActivationLevelTest,
     ::testing::ValuesIn(kActivationLevelTestData));
 
 }  // namespace subresource_filter