Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: chrome/browser/subresource_filter/subresource_filter_browsertest.cc

Issue 2814733002: Add the SocEng as a type for checking in CheckUrlForSubresourceFilter. (Closed)
Patch Set: . Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/subresource_filter/subresource_filter_browsertest.cc
diff --git a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
index 0d3ea6570cf2f40d415e82ca1dbb6957d9dbde31..f18c0dd9341e4e068f1fdd7c26a0a8c4c1cfe0a3 100644
--- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
@@ -122,32 +122,18 @@ constexpr const char kEvaluationCPUDuration[] =
#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
@@ -445,7 +431,6 @@ class SubresourceFilterWebSocketBrowserTest
std::unique_ptr<net::SpawnedTestServer> websocket_test_server_;
};
-
// Tests -----------------------------------------------------------------------
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, MainFrameActivation) {
@@ -1430,9 +1415,17 @@ IN_PROC_BROWSER_TEST_F(
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)));
@@ -1454,13 +1447,17 @@ IN_PROC_BROWSER_TEST_F(
ConfigureAsSubresourceFilterOnlyURL(url.GetOrigin());
base::HistogramTester tester;
ui_test_utils::NavigateToURL(browser(), url);
- EXPECT_THAT(tester.GetAllSamples(std::string(kMatchesPatternHistogramName) +
- std::string(kSubresourceFilterOnlySuffix)),
- ::testing::IsEmpty());
-
- EXPECT_THAT(tester.GetAllSamples(std::string(kNavigationChainSize) +
- 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);
+
+ tester.ExpectUniqueSample(std::string(kMatchesPatternHistogramName) +
+ std::string(kPhishingInterstitalSuffix),
+ false, 1);
}
#endif
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc ('k') | components/safe_browsing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698