Add the SocEng as a type for checking in CheckUrlForSubresourceFilter.

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 104 matching lines @@
 constexpr const char kEvaluationTotalCPUDurationForDocument[] =
     "SubresourceFilter.DocumentLoad.SubresourceEvaluation.TotalCPUDuration";
 constexpr const char kEvaluationWallDuration[] =
     "SubresourceFilter.SubresourceLoad.Evaluation.WallDuration";
 constexpr const char kEvaluationCPUDuration[] =
     "SubresourceFilter.SubresourceLoad.Evaluation.CPUDuration";
 
 #if defined(GOOGLE_CHROME_BUILD)
 // Names of navigation chain patterns histogram.
 const char kMatchesPatternHistogramName[] =
-    "SubresourceFilter.PageLoad.RedirectChainMatchPattern";
+    "SubresourceFilter.PageLoad.FinalURLMatch";
 const char kNavigationChainSize[] =
     "SubresourceFilter.PageLoad.RedirectChainLength";
 const char kSubresourceFilterOnlySuffix[] = ".SubresourceFilterOnly";
+const char kSocialEngineeringAdsInterstitialSuffix[] =
+    ".SocialEngineeringAdsInterstitial";
+const char kPhishingInterstitalSuffix[] = ".PhishingInterstital";
 #endif
 
 // Other histograms.
 const char kSubresourceFilterActionsHistogram[] = "SubresourceFilter.Actions";
 
-// 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,
-};
-
 // UI manager that never actually shows any interstitials, but emulates as if
 // the user chose to proceed through them.
 class FakeSafeBrowsingUIManager
     : public safe_browsing::TestSafeBrowsingUIManager {
  public:
   FakeSafeBrowsingUIManager() {}
 
  protected:
   ~FakeSafeBrowsingUIManager() override {}
 
@@ skipping 277 matching lines @@
         browser()->tab_strip_model()->GetActiveWebContents(),
         base::StringPrintf("connectWebSocket('%s');", url.spec().c_str()),
         &websocket_connection_succeeded));
     EXPECT_EQ(expect_connection_success, websocket_connection_succeeded);
   }
 
  private:
   std::unique_ptr<net::SpawnedTestServer> websocket_test_server_;
 };
 
-
 // Tests -----------------------------------------------------------------------
 
 IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, MainFrameActivation) {
   GURL url(GetTestUrl("subresource_filter/frame_with_included_script.html"));
   ConfigureAsPhishingURL(url);
   ASSERT_NO_FATAL_FAILURE(SetRulesetToDisallowURLsWithPathSuffix(
       "suffix-that-does-not-match-anything"));
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_TRUE(WasParsedScriptElementLoaded(web_contents()->GetMainFrame()));
 
@@ skipping 964 matching lines @@
     ExpectRedirectPatternHistogramsAreRecordedForSubresourceFilterOnlyMatch) {
   ASSERT_NO_FATAL_FAILURE(SetRulesetToDisallowURLsWithPathSuffix(
       "suffix-that-does-not-match-anything"));
 
   GURL url(GetTestUrl("subresource_filter/frame_with_included_script.html"));
   ConfigureAsSubresourceFilterOnlyURL(url);
 
   base::HistogramTester tester;
   ui_test_utils::NavigateToURL(browser(), url);
 
-  EXPECT_THAT(tester.GetAllSamples(std::string(kMatchesPatternHistogramName) +
-                                   std::string(kSubresourceFilterOnlySuffix)),
-              ::testing::ElementsAre(base::Bucket(NO_REDIRECTS_HIT, 1)));
+  tester.ExpectUniqueSample(
+      std::string(kMatchesPatternHistogramName) +
+          std::string(kSocialEngineeringAdsInterstitialSuffix),
+      false, 1);
+  tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
+                                std::string(kSubresourceFilterOnlySuffix),
+                            true, 1);
+
+  tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
+                                std::string(kPhishingInterstitalSuffix),
+                            false, 1);
   EXPECT_THAT(tester.GetAllSamples(std::string(kNavigationChainSize) +
                                    std::string(kSubresourceFilterOnlySuffix)),
               ::testing::ElementsAre(base::Bucket(1, 1)));
 }
 
 IN_PROC_BROWSER_TEST_F(
     SubresourceFilterBrowserTest,
     ExpectRedirectPatternHistogramsAreRecordedForSubresourceFilterOnlyRedirectMatch) {
   ASSERT_NO_FATAL_FAILURE(
       SetRulesetToDisallowURLsWithPathSuffix("included_script.js"));
   const std::string initial_host("a.com");
   const std::string redirected_host("b.com");
 
   GURL redirect_url(embedded_test_server()->GetURL(
       redirected_host, "/subresource_filter/frame_with_included_script.html"));
   GURL url(embedded_test_server()->GetURL(
       initial_host, "/server-redirect?" + redirect_url.spec()));
 
   ConfigureAsSubresourceFilterOnlyURL(url.GetOrigin());
   base::HistogramTester tester;
   ui_test_utils::NavigateToURL(browser(), url);
-  EXPECT_THAT(tester.GetAllSamples(std::string(kMatchesPatternHistogramName) +
-                                   std::string(kSubresourceFilterOnlySuffix)),
-              ::testing::IsEmpty());
+  tester.ExpectUniqueSample(
+      std::string(kMatchesPatternHistogramName) +
+          std::string(kSocialEngineeringAdsInterstitialSuffix),
+      false, 1);
+  tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
+                                std::string(kSubresourceFilterOnlySuffix),
+                            false, 1);
 
-  EXPECT_THAT(tester.GetAllSamples(std::string(kNavigationChainSize) +
-                                   std::string(kSubresourceFilterOnlySuffix)),
-              ::testing::IsEmpty());
+  tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
+                                std::string(kPhishingInterstitalSuffix),
+                            false, 1);
 }
 #endif
 
 }  // namespace subresource_filter