components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc - Issue 2272323002: Allow Safe Browsing Saresource Filter to distinguish between different lists.

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

Issue 2272323002: Allow Safe Browsing Saresource Filter to distinguish between different lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix safe_browsing_service_browsertest Created 4 years, 4 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

« no previous file with comments | « components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h ('k') | components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc » ('j') | components/subresource_filter/core/browser/subresource_filter_features.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..7e3fd08806d2b3b093a98296ffa60ce13eb2638d 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,19 @@ 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 = false;

+ if (GetCurrentActivationList() ==

+ ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL) {

+ proceed = (threat_type_metadata ==

+ safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS);

+ } else if (GetCurrentActivationList() ==

+ ActivationList::PHISHING_INTERSTITIAL) {

+ proceed =

+ (threat_type == safe_browsing::SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL);

engedy 2016/08/26 17:37:17 Could you please double check with Noe if this sho

+ }

+ if (!proceed)

return;

AddHostOfURLToActivationSet(url);

for (const auto& url : redirect_urls)