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

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

Issue 2889913002: [subresource_filter] Remove Forwarding NavigationThrottles (Closed)
Patch Set: Remove silly forwarding throttles 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: 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 3d3c81e350227ba2d366bf7d3be7a973695dcbe7..0d9dd50c68c423fdb94153f5c4ee944e5b3bf61f 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
@@ -313,20 +313,18 @@ class ContentSubresourceFilterDriverFactoryTest
navigation_simulator->SetTransition(transition);
navigation_simulator->Start();
- if (blacklisted_urls.front()) {
- factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
- navigation_chain.front(), threat_type, threat_type_metadata);
- }
::testing::Mock::VerifyAndClearExpectations(client());
+ for (size_t i = 1; i < navigation_chain.size(); ++i)
+ navigation_simulator->Redirect(navigation_chain[i]);
- for (size_t i = 1; i < navigation_chain.size(); ++i) {
- const GURL url = navigation_chain[i];
- if (i < blacklisted_urls.size() && blacklisted_urls[i]) {
- factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
- url, threat_type, threat_type_metadata);
- }
- navigation_simulator->Redirect(url);
+ if (blacklisted_urls.size() != navigation_chain.size() ||
+ !blacklisted_urls.back()) {
+ threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_SAFE;
+ threat_type_metadata = safe_browsing::ThreatPatternType::NONE;
}
+ factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
+ navigation_simulator->GetNavigationHandle(), threat_type,
+ threat_type_metadata);
std::string suffix;
ActivationList activation_list =
GetListForThreatTypeAndMetadata(threat_type, threat_type_metadata);

Powered by Google App Engine
This is Rietveld 408576698