Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc |
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc |
index 82b89278968377fdc768f2350c8bcc3671b60927..3f45ce49c9fec896f2b6da2390638425500faeec 100644 |
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc |
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc |
@@ -5,11 +5,11 @@ |
#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h" |
#include "base/metrics/histogram_macros.h" |
-#include "components/safe_browsing_db/util.h" |
#include "components/subresource_filter/content/browser/content_subresource_filter_driver.h" |
#include "components/subresource_filter/content/common/subresource_filter_messages.h" |
#include "components/subresource_filter/core/browser/subresource_filter_client.h" |
#include "components/subresource_filter/core/browser/subresource_filter_features.h" |
+#include "components/subresource_filter/core/common/activation_list.h" |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/web_contents.h" |
#include "ipc/ipc_message_macros.h" |
@@ -87,8 +87,14 @@ void ContentSubresourceFilterDriverFactory:: |
OnMainResourceMatchedSafeBrowsingBlacklist( |
const GURL& url, |
const std::vector<GURL>& redirect_urls, |
- safe_browsing::ThreatPatternType threat_type) { |
- if (threat_type != safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS) |
+ safe_browsing::SBThreatType threat_type, |
+ safe_browsing::ThreatPatternType threat_type_metadata) { |
+ bool proceed = |
engedy
2016/08/25 21:32:54
We should have at least one test that verifies thi
melandory
2016/08/25 23:38:27
Yes, I'm trying to add at least some basic tests.
|
+ GetCurrentActivationList() == ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL |
+ ? (threat_type_metadata == |
+ safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS) |
+ : threat_type == safe_browsing::SB_THREAT_TYPE_URL_PHISHING; |
+ if (!proceed) |
return; |
AddHostOfURLToActivationSet(url); |
for (const auto& url : redirect_urls) |