Add the SocEng as a type for checking in CheckUrlForSubresourceFilter.

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 "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
@@ skipping 30 matching lines @@
 const char kExampleUrlWithParams[] = "https://example.com/soceng?q=engsoc";
 const char kExampleUrl[] = "https://example.com";
 const char kExampleLoginUrl[] = "https://example.com/login";
 const char kUrlA[] = "https://example_a.com";
 const char kUrlB[] = "https://example_b.com";
 const char kUrlC[] = "https://example_c.com";
 const char kUrlD[] = "https://example_d.com";
 const char kSubframeName[] = "Child";
 const char kDisallowedUrl[] = "https://example.com/disallowed.html";
 
-const char kMatchesPatternHistogramName[] =
-    "SubresourceFilter.PageLoad.RedirectChainMatchPattern.";
+const char kMatchesHistogramName[] = "SubresourceFilter.PageLoad.Match.";

[engedy, 2017/04/20 11:16:11]

How about `SubresourecFilter.PageLoad.FinalURLMatch.`?

[melandory, 2017/04/25 13:48:13]

Done.

 const char kNavigationChainSize[] =
     "SubresourceFilter.PageLoad.RedirectChainLength.";
 
-// Human readable representation of expected redirect chain match patterns.
-// The explanations for the buckets given for the following redirect chain:
-// A->B->C->D, where A is initial URL and D is a final URL.
-enum RedirectChainMatchPattern {
-  EMPTY,             // No histograms were recorded.
-  F0M0L1,            // D is a Safe Browsing match.
-  F0M1L0,            // B or C, or both are Safe Browsing matches.
-  F0M1L1,            // B or C, or both and D are Safe Browsing matches.
-  F1M0L0,            // A is Safe Browsing match
-  F1M0L1,            // A and D are Safe Browsing matches.
-  F1M1L0,            // B and/or C and A are Safe Browsing matches.
-  F1M1L1,            // B and/or C and A and D are Safe Browsing matches.
-  NO_REDIRECTS_HIT,  // Redirect chain consists of single URL, aka no redirects
-                     // has happened, and this URL was a Safe Browsing hit.
-  NUM_HIT_PATTERNS,
+// Enum helps to setup test cases. In future, when checking first URL in the
+// redirect chain is implemented, the enum will be expanded.
+enum RecordHistograms {

[engedy, 2017/04/20 11:16:11]

naming nit: RecordedHistograms

[melandory, 2017/04/25 13:48:13]

Done.

+  EMPTY,
+  MATCH,
+  NUM_MATCH_PATTERNS,

[engedy, 2017/04/20 11:16:11]

nit: Never used.

[melandory, 2017/04/25 13:48:13]

Done.

 };
 
 std::string GetSuffixForList(const ActivationList& type) {
   switch (type) {
     case ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL:
       return "SocialEngineeringAdsInterstitial";
     case ActivationList::PHISHING_INTERSTITIAL:
       return "PhishingInterstital";
     case ActivationList::SUBRESOURCE_FILTER:
       return "SubresourceFilterOnly";
@@ skipping 63 matching lines @@
      safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
      safe_browsing::ThreatPatternType::NONE},
     {ActivationDecision::ACTIVATED,
      subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
      safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
      safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
     {ActivationDecision::ACTIVATED,
      subresource_filter::kActivationListPhishingInterstitial,
      safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
      safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
+    {ActivationDecision::ACTIVATED,

[engedy, 2017/04/20 11:16:11]

Could you please add corresponding NOT_MATCHED test cases for this activation
list as well?

+     subresource_filter::kActivationListSubresourceFilter,
+     safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER,
+     safe_browsing::ThreatPatternType::NONE},
 };
 
 struct ActivationScopeTestData {
   ActivationDecision expected_activation_decision;
   bool url_matches_activation_list;
   const char* const activation_scope;
 };
 
 const ActivationScopeTestData kActivationScopeTestData[] = {
     {ActivationDecision::ACTIVATED, false /* url_matches_activation_list */,
@@ skipping 118 matching lines @@
     render_process_host->sink().ClearMessages();
   }
 
   void BlacklistURLWithRedirectsNavigateAndCommit(
       const std::vector<bool>& blacklisted_urls,
       const std::vector<GURL>& navigation_chain,
       safe_browsing::SBThreatType threat_type,
       safe_browsing::ThreatPatternType threat_type_metadata,
       const content::Referrer& referrer,
       ui::PageTransition transition,
-      RedirectChainMatchPattern expected_pattern,
+      RecordHistograms expected_pattern,

[engedy, 2017/04/20 11:16:11]

nit: expected_histograms

[melandory, 2017/04/25 13:48:13]

Done.

       ActivationDecision expected_activation_decision) {
     const bool expected_activation =
         expected_activation_decision == ActivationDecision::ACTIVATED;
     base::HistogramTester tester;
     EXPECT_CALL(*client(), ToggleNotificationVisibility(false)).Times(1);
 
     std::unique_ptr<content::NavigationSimulator> navigation_simulator =
         content::NavigationSimulator::CreateRendererInitiated(
             navigation_chain.front(), main_rfh());
     navigation_simulator->SetReferrer(referrer);
@@ skipping 23 matching lines @@
 
     // Re-create a subframe now that the frame has navigated.
     content::RenderFrameHostTester* rfh_tester =
         content::RenderFrameHostTester::For(main_rfh());
     rfh_tester->AppendChild(kSubframeName);
     ActivationList activation_list =
         GetListForThreatTypeAndMetadata(threat_type, threat_type_metadata);
 
     const std::string suffix(GetSuffixForList(activation_list));
     size_t all_pattern =
-        tester.GetTotalCountsForPrefix(kMatchesPatternHistogramName).size();
+        tester.GetTotalCountsForPrefix(kMatchesHistogramName).size();
     size_t all_chain_size =
         tester.GetTotalCountsForPrefix(kNavigationChainSize).size();
     if (expected_pattern != EMPTY) {
-      EXPECT_THAT(tester.GetAllSamples(kMatchesPatternHistogramName + suffix),
-                  ::testing::ElementsAre(base::Bucket(expected_pattern, 1)));
-      EXPECT_THAT(
-          tester.GetAllSamples(kNavigationChainSize + suffix),
-          ::testing::ElementsAre(base::Bucket(navigation_chain.size(), 1)));
+      tester.ExpectTotalCount(kMatchesHistogramName + suffix, 1);

[engedy, 2017/04/20 11:16:11]

Let's also check that the correct value is recorded here!

[melandory, 2017/04/25 13:48:13]

Done.

+      tester.ExpectUniqueSample(kNavigationChainSize + suffix,
+                                navigation_chain.size(), 1);
       // Check that we recorded only what is needed.
       EXPECT_EQ(1u, all_pattern);
       EXPECT_EQ(1u, all_chain_size);
     } else {
       EXPECT_EQ(0u, all_pattern);
       EXPECT_EQ(0u, all_chain_size);
     }
   }
 
   void NavigateSubframeAndExpectCheckResult(const GURL& url,
@@ skipping 21 matching lines @@
     ::testing::Mock::VerifyAndClearExpectations(client());
   }
 
   void NavigateAndExpectActivation(
       const std::vector<bool>& blacklisted_urls,
       const std::vector<GURL>& navigation_chain,
       safe_browsing::SBThreatType threat_type,
       safe_browsing::ThreatPatternType threat_type_metadata,
       const content::Referrer& referrer,
       ui::PageTransition transition,
-      RedirectChainMatchPattern expected_pattern,
+      RecordHistograms expected_pattern,
       ActivationDecision expected_activation_decision) {
     const bool expected_activation =
         expected_activation_decision == ActivationDecision::ACTIVATED;
     BlacklistURLWithRedirectsNavigateAndCommit(
         blacklisted_urls, navigation_chain, threat_type, threat_type_metadata,
         referrer, transition, expected_pattern, expected_activation_decision);
 
     NavigateAndCommitSubframe(GURL(kExampleLoginUrl), expected_activation);
   }
 
   void NavigateAndExpectActivation(
       const std::vector<bool>& blacklisted_urls,
       const std::vector<GURL>& navigation_chain,
-      RedirectChainMatchPattern expected_pattern,
+      RecordHistograms expected_pattern,
       ActivationDecision expected_activation_decision) {
     NavigateAndExpectActivation(
         blacklisted_urls, navigation_chain,
         safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
         safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS,
         content::Referrer(), ui::PAGE_TRANSITION_LINK, expected_pattern,
         expected_activation_decision);
   }
 
   void EmulateFailedNavigationAndExpectNoActivation(const GURL& url) {
     EXPECT_CALL(*client(), ToggleNotificationVisibility(false)).Times(1);
 
     // With browser-side navigation enabled, ReadyToCommitNavigation is invoked
     // even for failed navigations. This is correctly simulated by
     // NavigationSimulator. Make sure no activation message is sent in this
     // case.
     content::NavigationSimulator::NavigateAndFailFromDocument(
         url, net::ERR_TIMED_OUT, main_rfh());
     ExpectActivationSignalForFrame(main_rfh(), false);
     ::testing::Mock::VerifyAndClearExpectations(client());
   }
 
   void EmulateInPageNavigation(
       const std::vector<bool>& blacklisted_urls,
-      RedirectChainMatchPattern expected_pattern,
+      RecordHistograms expected_pattern,
       ActivationDecision expected_activation_decision) {
     // This test examines the navigation with the following sequence of events:
     //   DidStartProvisional(main, "example.com")
     //   ReadyToCommitNavigation(“example.com”)
     //   DidCommitProvisional(main, "example.com")
     //   DidStartProvisional(sub, "example.com/login")
     //   DidCommitProvisional(sub, "example.com/login")
     //   DidCommitProvisional(main, "example.com#ref")
 
     NavigateAndExpectActivation(blacklisted_urls, {GURL(kExampleUrl)},
@@ skipping 79 matching lines @@
        ActivateForFrameHostDisabledFeature) {
   // Activation scope is set to NONE => no activation should happen even if URL
   // which is visited was a SB hit.
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_DISABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeAllSites,
       kActivationListSocialEngineeringAdsInterstitial);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
   const GURL url(kExampleUrlWithParams);
-  NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
+  NavigateAndExpectActivation({true}, {url}, MATCH,
                               ActivationDecision::ACTIVATION_DISABLED);
   factory()->AddHostOfURLToWhitelistSet(url);
-  NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
+  NavigateAndExpectActivation({true}, {url}, MATCH,
                               ActivationDecision::ACTIVATION_DISABLED);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest, NoActivationWhenNoMatch) {
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeActivationList,
       kActivationListSocialEngineeringAdsInterstitial);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
@@ skipping 14 matching lines @@
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest,
        SpecialCaseNavigationActivationListEnabled) {
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeActivationList,
       kActivationListSocialEngineeringAdsInterstitial);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
-  EmulateInPageNavigation({true}, NO_REDIRECTS_HIT,
-                          ActivationDecision::ACTIVATED);
+  EmulateInPageNavigation({true}, MATCH, ActivationDecision::ACTIVATED);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest,
        SpecialCaseNavigationActivationListEnabledWithPerformanceMeasurement) {
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeActivationList,
       kActivationListSocialEngineeringAdsInterstitial,
       "1" /* performance_measurement_rate */);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
-  EmulateInPageNavigation({true}, NO_REDIRECTS_HIT,
-                          ActivationDecision::ACTIVATED);
+  EmulateInPageNavigation({true}, MATCH, ActivationDecision::ACTIVATED);
 }
 
 TEST_F(ContentSubresourceFilterDriverFactoryTest, FailedNavigation) {
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeAllSites);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
   const GURL url(kExampleUrl);
   NavigateAndExpectActivation({false}, {url}, EMPTY,
                               ActivationDecision::ACTIVATED);
   EmulateFailedNavigationAndExpectNoActivation(url);
 }
 
 // TODO(melandory): refactor the test so it no longer require the current
 // activation list to be matching.
 TEST_F(ContentSubresourceFilterDriverFactoryTest, RedirectPatternTest) {
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeActivationList,
       kActivationListSocialEngineeringAdsInterstitial);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
-  struct RedirectRedirectChainMatchPatternTestData {
+  struct RedirectRecordHistogramsTestData {
     std::vector<bool> blacklisted_urls;
     std::vector<GURL> navigation_chain;
-    RedirectChainMatchPattern hit_expected_pattern;
+    RecordHistograms hit_expected_pattern;
     ActivationDecision expected_activation_decision;
-  } kRedirectRedirectChainMatchPatternTestData[] = {
+  } kRedirectRecordHistogramsTestData[] = {
       {{false},
        {GURL(kUrlA)},
        EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
-      {{true}, {GURL(kUrlA)}, NO_REDIRECTS_HIT, ActivationDecision::ACTIVATED},
+      {{true}, {GURL(kUrlA)}, MATCH, ActivationDecision::ACTIVATED},
       {{false, false},
        {GURL(kUrlA), GURL(kUrlB)},
        EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
       {{false, true},
        {GURL(kUrlA), GURL(kUrlB)},
-       F0M0L1,
+       MATCH,
        ActivationDecision::ACTIVATED},
       {{true, false},
        {GURL(kUrlA), GURL(kUrlB)},
-       F1M0L0,
+       EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
       {{true, true},
        {GURL(kUrlA), GURL(kUrlB)},
-       F1M0L1,
+       MATCH,
        ActivationDecision::ACTIVATED},
       {{false, false, false},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
        EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
       {{false, false, true},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F0M0L1,
+       MATCH,
        ActivationDecision::ACTIVATED},
       {{false, true, false},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F0M1L0,
+       EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
       {{false, true, true},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F0M1L1,
+       MATCH,
        ActivationDecision::ACTIVATED},
       {{true, false, false},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F1M0L0,
+       EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
       {{true, false, true},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F1M0L1,
+       MATCH,
        ActivationDecision::ACTIVATED},
       {{true, true, false},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F1M1L0,
+       EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
       {{true, true, true},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
-       F1M1L1,
+       MATCH,
        ActivationDecision::ACTIVATED},
       {{false, true, false, false},
        {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC), GURL(kUrlD)},
-       F0M1L0,
+       EMPTY,
        ActivationDecision::ACTIVATION_LIST_NOT_MATCHED},
   };
 
-  for (size_t i = 0U; i < arraysize(kRedirectRedirectChainMatchPatternTestData);
-       ++i) {
-    auto test_data = kRedirectRedirectChainMatchPatternTestData[i];
+  for (size_t i = 0U; i < arraysize(kRedirectRecordHistogramsTestData); ++i) {

[engedy, 2017/04/20 11:16:11]

nit: If you are already changing this line, could you make this a range-based
for loop?

+    auto test_data = kRedirectRecordHistogramsTestData[i];
     NavigateAndExpectActivation(
         test_data.blacklisted_urls, test_data.navigation_chain,
         safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
         safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS,
         content::Referrer(), ui::PAGE_TRANSITION_LINK,
         test_data.hit_expected_pattern, test_data.expected_activation_decision);
     NavigateAndExpectActivation(
         {false}, {GURL("https://dummy.com")}, EMPTY,
         ActivationDecision::ACTIVATION_LIST_NOT_MATCHED);
 #if defined(GOOGLE_CHROME_BUILD)

[engedy, 2017/04/20 11:16:11]

nit: Do we need this anymore?

[melandory, 2017/04/25 13:48:13]

ditto

     NavigateAndExpectActivation(
         test_data.blacklisted_urls, test_data.navigation_chain,
         safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER,
         safe_browsing::ThreatPatternType::NONE, content::Referrer(),
         ui::PAGE_TRANSITION_LINK, test_data.hit_expected_pattern,
         ActivationDecision::ACTIVATION_LIST_NOT_MATCHED);
 #endif
   }
 }
 
@@ skipping 81 matching lines @@
        ActivateForFrameState) {
   const ActivationLevelTestData& test_data = GetParam();
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, test_data.activation_level,
       kActivationScopeActivationList,
       kActivationListSocialEngineeringAdsInterstitial);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
 
   const GURL url(kExampleUrlWithParams);
-  NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
+  NavigateAndExpectActivation({true}, {url}, MATCH,
                               test_data.expected_activation_decision);
   factory()->AddHostOfURLToWhitelistSet(url);
   NavigateAndExpectActivation(
-      {true}, {GURL(kExampleUrlWithParams)}, NO_REDIRECTS_HIT,
+      {true}, {GURL(kExampleUrlWithParams)}, MATCH,
       GetActiveConfiguration().activation_level == ActivationLevel::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();
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       kActivationScopeActivationList, test_data.activation_list);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
 
   const GURL test_url("https://example.com/nonsoceng?q=engsocnon");
   std::vector<GURL> navigation_chain;
 
   ActivationList effective_list = GetListForThreatTypeAndMetadata(
       test_data.threat_type, test_data.threat_type_metadata);
   NavigateAndExpectActivation(
       {false, false, false, true},
       {GURL(kUrlA), GURL(kUrlB), GURL(kUrlC), test_url}, test_data.threat_type,
       test_data.threat_type_metadata, content::Referrer(),
       ui::PAGE_TRANSITION_LINK,
-      effective_list != ActivationList::NONE ? F0M0L1 : EMPTY,
+      effective_list != ActivationList::NONE ? MATCH : EMPTY,
       test_data.expected_activation_decision);
 };
 
 TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
        ActivateForScopeType) {
   const ActivationScopeTestData& test_data = GetParam();
   base::FieldTrialList field_trial_list(nullptr);
   testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
       base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
       test_data.activation_scope,
       kActivationListSocialEngineeringAdsInterstitial);
   factory()->set_configuration_for_testing(GetActiveConfiguration());
 
   const GURL test_url(kExampleUrlWithParams);
 
-  RedirectChainMatchPattern expected_pattern =
-      test_data.url_matches_activation_list ? NO_REDIRECTS_HIT : EMPTY;
+  RecordHistograms expected_pattern =
+      test_data.url_matches_activation_list ? MATCH : 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()->AddHostOfURLToWhitelistSet(test_url);
     NavigateAndExpectActivation(
         {test_data.url_matches_activation_list}, {GURL(kExampleUrlWithParams)},
         expected_pattern,
         GetActiveConfiguration().activation_scope == ActivationScope::NO_SITES
             ? ActivationDecision::ACTIVATION_DISABLED
@@ skipping 15 matching lines @@
 
   // 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);
-    RedirectChainMatchPattern expected_pattern = EMPTY;
+    RecordHistograms expected_pattern = EMPTY;
     NavigateAndExpectActivation(
         {test_data.url_matches_activation_list}, {GURL(url)}, expected_pattern,
         GetActiveConfiguration().activation_scope == ActivationScope::NO_SITES
             ? 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;
+    RecordHistograms expected_pattern =
+        test_data.url_matches_activation_list ? MATCH : 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