Allow Safe Browsing Saresource Filter to distinguish between different lists.

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "url/gurl.h"
 
 namespace subresource_filter {
 
 // static
 const char ContentSubresourceFilterDriverFactory::kWebContentsUserDataKey[] =
     "web_contents_subresource_filter_driver_factory";
@@ skipping 57 matching lines @@
 
 bool ContentSubresourceFilterDriverFactory::ShouldActivateForURL(
     const GURL& url) const {
   return IsBlacklisted(url) && !IsWhitelisted(url);
 }
 
 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 this matrix of ActivationList x
(threat_type, meta).

[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)
     AddHostOfURLToActivationSet(url);
 }
 
 void ContentSubresourceFilterDriverFactory::AddHostOfURLToWhitelistSet(
     const GURL& url) {
   if (!url.host().empty() && url.SchemeIsHTTPOrHTTPS())
     whitelisted_hosts_.insert(url.host());
@@ skipping 85 matching lines @@
 
 void ContentSubresourceFilterDriverFactory::PromptUserIfNeeded(
     content::RenderFrameHost* render_frame_host) {
   if (render_frame_host->GetParent())
     return;  // Not a main frame, do nothing.
   client_->ToggleNotificationVisibility(activation_state() ==
                                         ActivationState::ENABLED);
 }
 
 }  // namespace subresource_filter