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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc

Issue 2703093002: Add metrics for tracking subresource filter activation suppression. (Closed)
Patch Set: address comments Created 3 years, 10 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
« components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h ('K') | « components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
index e0312a73b2a8e4a5d3f873cf59b12e1be6f0019f..c2a4e2cf9959d67d2723c305131876b393273e00 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
@@ -56,84 +56,102 @@ enum RedirectChainMatchPattern {
};
struct ActivationListTestData {
- bool expected_activation;
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision;
const char* const activation_list;
safe_browsing::SBThreatType threat_type;
safe_browsing::ThreatPatternType threat_type_metadata;
};
const ActivationListTestData kActivationListTestData[] = {
- {false, "", safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED, "",
+ safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::NONE},
- {false, subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::MALWARE_LANDING},
- {false, subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::MALWARE_DISTRIBUTION},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_API_ABUSE,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_BLACKLISTED_RESOURCE,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_BINARY_MALWARE_URL,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_UNWANTED,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_MALWARE,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {false, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_SAFE,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
- {true, subresource_filter::kActivationListPhishingInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATED,
+ subresource_filter::kActivationListPhishingInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::NONE},
- {true, subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
+ {ContentSubresourceFilterDriverFactory::ACTIVATED,
+ subresource_filter::kActivationListSocialEngineeringAdsInterstitial,
safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS},
};
struct ActivationScopeTestData {
- bool expected_activation;
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision;
bool url_matches_activation_list;
const char* const activation_scope;
};
const ActivationScopeTestData kActivationScopeTestData[] = {
- {true /* expected_activation */, false /* url_matches_activation_list */,
- kActivationScopeAllSites},
- {true /* expected_activation */, true /* url_matches_activation_list */,
- kActivationScopeAllSites},
- {false /* expected_activation */, true /* url_matches_activation_list */,
- kActivationScopeNoSites},
- {true /* expected_activation */, true /* url_matches_activation_list */,
- kActivationScopeActivationList},
- {false /* expected_activation */, false /* url_matches_activation_list */,
- kActivationScopeActivationList},
+ {ContentSubresourceFilterDriverFactory::ACTIVATED,
+ false /* url_matches_activation_list */, kActivationScopeAllSites},
+ {ContentSubresourceFilterDriverFactory::ACTIVATED,
+ true /* url_matches_activation_list */, kActivationScopeAllSites},
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED,
+ true /* url_matches_activation_list */, kActivationScopeNoSites},
+ {ContentSubresourceFilterDriverFactory::ACTIVATED,
+ true /* url_matches_activation_list */, kActivationScopeActivationList},
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED,
+ false /* url_matches_activation_list */, kActivationScopeActivationList},
};
struct ActivationLevelTestData {
- bool expected_activation;
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision;
const char* const activation_level;
};
const ActivationLevelTestData kActivationLevelTestData[] = {
- {true /* expected_activation */, kActivationLevelDryRun},
- {true /* expected_activation */, kActivationLevelEnabled},
- {false /* expected_activation */, kActivationLevelDisabled},
+ {ContentSubresourceFilterDriverFactory::ACTIVATED, kActivationLevelDryRun},
+ {ContentSubresourceFilterDriverFactory::ACTIVATED, kActivationLevelEnabled},
+ {ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED,
+ kActivationLevelDisabled},
};
class MockSubresourceFilterClient : public SubresourceFilterClient {
@@ -202,8 +220,8 @@ class ContentSubresourceFilterDriverFactoryTest
// TODO(crbug.com/688393): Once WCO::ReadyToCommitNavigation is invoked
// consistently for tests in PlzNavigate and non-PlzNavigate, remove this.
if (!content::IsBrowserSideNavigationEnabled()) {
- factory()->ReadyToCommitNavigationInternal(rfh, url, referrer, transition,
- false /* failed_navigation */);
+ factory()->ReadyToCommitNavigationInternal(rfh, url, referrer,
+ transition);
}
content::RenderFrameHostTester::For(rfh)->SimulateNavigationCommit(url);
}
@@ -216,7 +234,11 @@ class ContentSubresourceFilterDriverFactoryTest
const content::Referrer& referrer,
ui::PageTransition transition,
RedirectChainMatchPattern expected_pattern,
- bool expected_activation) {
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision) {
+ const bool expected_activation =
+ expected_activation_decision ==
+ ContentSubresourceFilterDriverFactory::ACTIVATED;
base::HistogramTester tester;
EXPECT_CALL(*client(), ToggleNotificationVisibility(false)).Times(1);
content::RenderFrameHostTester* rfh_tester =
@@ -242,6 +264,8 @@ class ContentSubresourceFilterDriverFactoryTest
SimulateNavigationCommit(main_rfh(), navigation_chain.back(), referrer,
transition);
ExpectActivationSignalForFrame(main_rfh(), expected_activation);
+ EXPECT_EQ(expected_activation_decision,
+ factory()->GetActivationDecisionForLastCommittedPageLoad());
if (expected_pattern != EMPTY) {
EXPECT_THAT(tester.GetAllSamples(kMatchesPatternHistogramName),
@@ -277,24 +301,30 @@ class ContentSubresourceFilterDriverFactoryTest
const content::Referrer& referrer,
ui::PageTransition transition,
RedirectChainMatchPattern expected_pattern,
- bool expected_activation) {
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision) {
+ const bool expected_activation =
+ expected_activation_decision ==
+ ContentSubresourceFilterDriverFactory::ACTIVATED;
BlacklistURLWithRedirectsNavigateAndCommit(
blacklisted_urls, navigation_chain, threat_type, threat_type_metadata,
- referrer, transition, expected_pattern, expected_activation);
+ 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,
- bool expected_activation) {
+ void NavigateAndExpectActivation(
+ const std::vector<bool>& blacklisted_urls,
+ const std::vector<GURL>& navigation_chain,
+ RedirectChainMatchPattern expected_pattern,
+ ContentSubresourceFilterDriverFactory::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);
+ expected_activation_decision);
}
void EmulateDidDisallowFirstSubresourceMessage() {
@@ -319,9 +349,11 @@ class ContentSubresourceFilterDriverFactoryTest
::testing::Mock::VerifyAndClearExpectations(client());
}
- void EmulateInPageNavigation(const std::vector<bool>& blacklisted_urls,
- RedirectChainMatchPattern expected_pattern,
- bool expected_activation) {
+ void EmulateInPageNavigation(
+ const std::vector<bool>& blacklisted_urls,
+ RedirectChainMatchPattern expected_pattern,
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision) {
// This test examines the navigation with the following sequence of events:
// DidStartProvisional(main, "example.com")
// ReadyToCommitNavigation(“example.com”)
@@ -331,7 +363,7 @@ class ContentSubresourceFilterDriverFactoryTest
// DidCommitProvisional(main, "example.com#ref")
NavigateAndExpectActivation(blacklisted_urls, {GURL(kExampleUrl)},
- expected_pattern, expected_activation);
+ expected_pattern, expected_activation_decision);
EXPECT_CALL(*client(), ToggleNotificationVisibility(::testing::_)).Times(0);
content::RenderFrameHostTester::For(main_rfh())
->SimulateNavigationCommit(GURL(kExampleUrl));
@@ -400,11 +432,13 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest,
kActivationScopeAllSites,
kActivationListSocialEngineeringAdsInterstitial);
const GURL url(kExampleUrlWithParams);
- NavigateAndExpectActivation({true}, {url}, EMPTY,
- false /* expected_activation */);
+ NavigateAndExpectActivation(
+ {true}, {url}, EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED);
factory()->AddHostOfURLToWhitelistSet(url);
- NavigateAndExpectActivation({true}, {url}, EMPTY,
- false /* expected_activation */);
+ NavigateAndExpectActivation(
+ {true}, {url}, EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED);
}
TEST_F(ContentSubresourceFilterDriverFactoryTest, NoActivationWhenNoMatch) {
@@ -413,8 +447,9 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, NoActivationWhenNoMatch) {
base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
kActivationScopeActivationList,
kActivationListSocialEngineeringAdsInterstitial);
- NavigateAndExpectActivation({false}, {GURL(kExampleUrl)}, EMPTY,
- false /* should_prompt */);
+ NavigateAndExpectActivation(
+ {false}, {GURL(kExampleUrl)}, EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED);
}
TEST_F(ContentSubresourceFilterDriverFactoryTest,
@@ -425,7 +460,8 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest,
testing::ScopedSubresourceFilterFeatureToggle scoped_feature_toggle(
base::FeatureList::OVERRIDE_ENABLE_FEATURE, kActivationLevelEnabled,
kActivationScopeAllSites);
- EmulateInPageNavigation({false}, EMPTY, true /* expected_activation */);
+ EmulateInPageNavigation({false}, EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATED);
}
TEST_F(ContentSubresourceFilterDriverFactoryTest,
@@ -436,7 +472,7 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest,
kActivationScopeActivationList,
kActivationListSocialEngineeringAdsInterstitial);
EmulateInPageNavigation({true}, NO_REDIRECTS_HIT,
- true /* expected_activation */);
+ ContentSubresourceFilterDriverFactory::ACTIVATED);
}
TEST_F(ContentSubresourceFilterDriverFactoryTest,
@@ -448,7 +484,7 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest,
kActivationListSocialEngineeringAdsInterstitial,
"1" /* performance_measurement_rate */);
EmulateInPageNavigation({true}, NO_REDIRECTS_HIT,
- true /* expected_activation */);
+ ContentSubresourceFilterDriverFactory::ACTIVATED);
}
TEST_F(ContentSubresourceFilterDriverFactoryTest, FailedNavigation) {
@@ -458,7 +494,7 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, FailedNavigation) {
kActivationScopeAllSites);
const GURL url(kExampleUrl);
NavigateAndExpectActivation({false}, {url}, EMPTY,
- true /* expected_activation */);
+ ContentSubresourceFilterDriverFactory::ACTIVATED);
EmulateFailedNavigationAndExpectNoActivation(url);
}
@@ -472,51 +508,70 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, RedirectPatternTest) {
std::vector<bool> blacklisted_urls;
std::vector<GURL> navigation_chain;
RedirectChainMatchPattern hit_expected_pattern;
- bool expected_activation;
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision;
} kRedirectRedirectChainMatchPatternTestData[] = {
- {{false}, {GURL(kUrlA)}, EMPTY, false},
- {{true}, {GURL(kUrlA)}, NO_REDIRECTS_HIT, true},
- {{false, false}, {GURL(kUrlA), GURL(kUrlB)}, EMPTY, false},
- {{false, true}, {GURL(kUrlA), GURL(kUrlB)}, F0M0L1, true},
- {{true, false}, {GURL(kUrlA), GURL(kUrlB)}, F1M0L0, false},
- {{true, true}, {GURL(kUrlA), GURL(kUrlB)}, F1M0L1, true},
+ {{false},
+ {GURL(kUrlA)},
+ EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
+ {{true},
+ {GURL(kUrlA)},
+ NO_REDIRECTS_HIT,
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
+ {{false, false},
+ {GURL(kUrlA), GURL(kUrlB)},
+ EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
+ {{false, true},
+ {GURL(kUrlA), GURL(kUrlB)},
+ F0M0L1,
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
+ {{true, false},
+ {GURL(kUrlA), GURL(kUrlB)},
+ F1M0L0,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
+ {{true, true},
+ {GURL(kUrlA), GURL(kUrlB)},
+ F1M0L1,
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{{false, false, false},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
EMPTY,
- false},
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
{{false, false, true},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F0M0L1,
- true},
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{{false, true, false},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F0M1L0,
- false},
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
{{false, true, true},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F0M1L1,
- true},
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{{true, false, false},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F1M0L0,
- false},
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
{{true, false, true},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F1M0L1,
- true},
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{{true, true, false},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F1M1L0,
- false},
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
{{true, true, true},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC)},
F1M1L1,
- true},
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{{false, true, false, false},
{GURL(kUrlA), GURL(kUrlB), GURL(kUrlC), GURL(kUrlD)},
F0M1L0,
- false},
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED},
};
for (size_t i = 0U; i < arraysize(kRedirectRedirectChainMatchPatternTestData);
@@ -527,9 +582,10 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, RedirectPatternTest) {
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);
- NavigateAndExpectActivation({false}, {GURL("https://dummy.com")}, EMPTY,
- false);
+ test_data.hit_expected_pattern, test_data.expected_activation_decision);
+ NavigateAndExpectActivation(
+ {false}, {GURL("https://dummy.com")}, EMPTY,
+ ContentSubresourceFilterDriverFactory::ACTIVATION_LIST_NOT_MATCHED);
}
}
@@ -540,7 +596,7 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, NotificationVisibility) {
kActivationScopeAllSites);
NavigateAndExpectActivation({false}, {GURL(kExampleUrl)}, EMPTY,
- true /* expected_activation */);
+ ContentSubresourceFilterDriverFactory::ACTIVATED);
EXPECT_CALL(*client(), ToggleNotificationVisibility(true)).Times(1);
EmulateDidDisallowFirstSubresourceMessage();
}
@@ -555,7 +611,7 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest,
"true" /* suppress_notifications */);
NavigateAndExpectActivation({false}, {GURL(kExampleUrl)}, EMPTY,
- true /* expected_activation */);
+ ContentSubresourceFilterDriverFactory::ACTIVATED);
EXPECT_CALL(*client(), ToggleNotificationVisibility(::testing::_)).Times(0);
EmulateDidDisallowFirstSubresourceMessage();
}
@@ -570,14 +626,19 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, WhitelistSiteOnReload) {
const struct {
content::Referrer referrer;
ui::PageTransition transition;
- bool expect_activation;
+ ContentSubresourceFilterDriverFactory::ActivationDecision
+ expected_activation_decision;
} kTestCases[] = {
- {content::Referrer(), ui::PAGE_TRANSITION_LINK, true},
+ {content::Referrer(), ui::PAGE_TRANSITION_LINK,
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{content::Referrer(GURL(kUrlA), blink::WebReferrerPolicyDefault),
- ui::PAGE_TRANSITION_LINK, true},
+ ui::PAGE_TRANSITION_LINK,
+ ContentSubresourceFilterDriverFactory::ACTIVATED},
{content::Referrer(GURL(kExampleUrl), blink::WebReferrerPolicyDefault),
- ui::PAGE_TRANSITION_LINK, false},
- {content::Referrer(), ui::PAGE_TRANSITION_RELOAD, false}};
+ ui::PAGE_TRANSITION_LINK,
+ ContentSubresourceFilterDriverFactory::URL_WHITELISTED},
+ {content::Referrer(), ui::PAGE_TRANSITION_RELOAD,
+ ContentSubresourceFilterDriverFactory::URL_WHITELISTED}};
for (const auto& test_case : kTestCases) {
SCOPED_TRACE(::testing::Message("referrer = \"")
@@ -596,11 +657,11 @@ TEST_F(ContentSubresourceFilterDriverFactoryTest, WhitelistSiteOnReload) {
safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS,
test_case.referrer, test_case.transition, EMPTY,
- test_case.expect_activation);
+ 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.expect_activation);
+ test_case.expected_activation_decision);
}
}
@@ -615,11 +676,13 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationLevelTest,
const GURL url(kExampleUrlWithParams);
NavigateAndExpectActivation({true}, {url}, NO_REDIRECTS_HIT,
- test_data.expected_activation);
+ test_data.expected_activation_decision);
factory()->AddHostOfURLToWhitelistSet(url);
- NavigateAndExpectActivation({true}, {GURL(kExampleUrlWithParams)},
- NO_REDIRECTS_HIT,
- false /* expected_activation */);
+ NavigateAndExpectActivation(
+ {true}, {GURL(kExampleUrlWithParams)}, NO_REDIRECTS_HIT,
+ GetMaximumActivationLevel() == ActivationLevel::DISABLED
+ ? ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED
+ : ContentSubresourceFilterDriverFactory::URL_WHITELISTED);
}
TEST_P(ContentSubresourceFilterDriverFactoryThreatTypeTest,
@@ -635,12 +698,15 @@ TEST_P(ContentSubresourceFilterDriverFactoryThreatTypeTest,
const GURL test_url("https://example.com/nonsoceng?q=engsocnon");
std::vector<GURL> navigation_chain;
+ const bool expected_activation =
+ test_data.expected_activation_decision ==
+ ContentSubresourceFilterDriverFactory::ACTIVATED;
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, test_data.expected_activation ? F0M0L1 : EMPTY,
- test_data.expected_activation);
+ ui::PAGE_TRANSITION_LINK, expected_activation ? F0M0L1 : EMPTY,
+ test_data.expected_activation_decision);
};
TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
@@ -658,12 +724,15 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
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);
+ 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,
- false /* expected_activation */);
+ NavigateAndExpectActivation(
+ {test_data.url_matches_activation_list}, {GURL(kExampleUrlWithParams)},
+ expected_pattern,
+ GetCurrentActivationScope() == ActivationScope::NO_SITES
+ ? ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED
+ : ContentSubresourceFilterDriverFactory::URL_WHITELISTED);
}
};
@@ -686,9 +755,11 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
for (const auto url : unsupported_urls) {
SCOPED_TRACE(url);
RedirectChainMatchPattern expected_pattern = EMPTY;
- NavigateAndExpectActivation({test_data.url_matches_activation_list},
- {GURL(url)}, expected_pattern,
- false /* expected_activation */);
+ NavigateAndExpectActivation(
+ {test_data.url_matches_activation_list}, {GURL(url)}, expected_pattern,
+ GetCurrentActivationScope() == ActivationScope::NO_SITES
+ ? ContentSubresourceFilterDriverFactory::ACTIVATION_DISABLED
+ : ContentSubresourceFilterDriverFactory::UNSUPPORTED_SCHEME);
}
for (const auto url : supported_urls) {
SCOPED_TRACE(url);
@@ -696,7 +767,7 @@ TEST_P(ContentSubresourceFilterDriverFactoryActivationScopeTest,
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);
+ test_data.expected_activation_decision);
}
};
« components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h ('K') | « components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | tools/metrics/histograms/histograms.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698