Allow Safe Browsing Saresource Filter to distinguish between different lists.

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h

 // 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.
 
 #ifndef COMPONENTS_SUBRESOURCE_FILTER_CONTENT_BROWSER_CONTENT_SUBRESOURCE_FILTER_DRIVER_FACTORY_H_
 #define COMPONENTS_SUBRESOURCE_FILTER_CONTENT_BROWSER_CONTENT_SUBRESOURCE_FILTER_DRIVER_FACTORY_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/supports_user_data.h"
+#include "components/safe_browsing_db/util.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
 namespace content {
 class WebContents;
 class RenderFrameHost;
 }  // namespace content
 
-namespace safe_browsing {
-enum class ThreatPatternType;
-}
-
 namespace subresource_filter {
 
 using HostSet = std::set<std::string>;
 
 class ContentSubresourceFilterDriver;
 class SubresourceFilterClient;
 enum class ActivationState;
 
 // Controls the activation of subresource filtering for each page load in a
 // WebContents and manufactures the per-frame ContentSubresourceFilterDrivers.
@@ skipping 33 matching lines @@
   // filtering for the lifetime of this WebContents.
   void AddHostOfURLToWhitelistSet(const GURL& url);
 
   // Called when Safe Browsing detects that the |url| corresponding to the load
   // of the main frame belongs to the blacklist with |threat_type|. If the
   // blacklist is the Safe Browsing Social Engineering ads landing, then |url|
   // and |redirects| are saved.
   void OnMainResourceMatchedSafeBrowsingBlacklist(
       const GURL& url,
       const std::vector<GURL>& redirect_urls,
-      safe_browsing::ThreatPatternType threat_type);
+      safe_browsing::SBThreatType threat_type,
+      safe_browsing::ThreatPatternType threat_type_metadata);
 
   // Reloads the page and inserts the url to the whitelist.
   void OnReloadRequested();
 
   // Checks if all preconditions are fulfilled and if so, activates filtering
   // for the given |render_frame_host|. |url| is used to check web site specific
   // preconditions and should be the web URL of the page where caller is
   // intended to activate the Safe Browsing Subresource Filter.
   // TODO(melandory) While due to crbug.com/621856 we cannot yet get rid of
   // SubresourceFilterNavigationThrottle, it would still make sense to change
@@ skipping 54 matching lines @@
   HostSet whitelisted_hosts_;
 
   ActivationState activation_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSubresourceFilterDriverFactory);
 };
 
 }  // namespace subresource_filter
 
 #endif  // COMPONENTS_SUBRESOURCE_FILTER_CONTENT_BROWSER_CONTENT_SUBRESOURCE_FILTER_DRIVER_FACTORY_H_