Allow Safe Browsing Saresource Filter to distinguish between different lists.

components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.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 "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
@@ skipping 80 matching lines @@
 
   MockSubresourceFilterClient* client() { return client_; }
   MockSubresourceFilterDriver* driver() { return driver_; }
 
   MockSubresourceFilterDriver* subframe_driver() { return subframe_driver_; }
   content::RenderFrameHost* subframe_rfh() { return subframe_rfh_; }
 
   void BlacklistURLWithRedirects(const GURL& url,
                                  const std::vector<GURL>& redirects) {
     factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
-        url, redirects,
+        url, redirects, safe_browsing::SB_THREAT_TYPE_URL_PHISHING,
         safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_ADS);
   }
 
   void ActivateAndExpectForFrameHostForUrl(MockSubresourceFilterDriver* driver,
                                            content::RenderFrameHost* rfh,
                                            const GURL& url,
                                            bool should_activate) {
     EXPECT_CALL(*driver, ActivateForProvisionalLoad(::testing::_))
         .Times(should_activate);
     factory()->ReadyToCommitMainFrameNavigation(rfh, url);
@@ skipping 124 matching lines @@
 }
 
 TEST_P(ContentSubresourceFilterDriverFactoryThreatTypeTest, NonSocEngHit) {
   std::vector<GURL> redirects;
   redirects.push_back(GURL("https://example1.com"));
   redirects.push_back(GURL("https://example2.com"));
   redirects.push_back(GURL("https://example3.com"));
 
   const GURL test_url("https://example.com/nonsoceng?q=engsocnon");
   factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
-      GURL(test_url), std::vector<GURL>(), GetParam());
+      GURL(test_url), std::vector<GURL>(),
+      safe_browsing::SB_THREAT_TYPE_URL_PHISHING, GetParam());
   EXPECT_EQ(0U, factory()->activation_set().size());
   EXPECT_FALSE(factory()->ShouldActivateForURL(GURL(test_url)));
   EXPECT_FALSE(
       factory()->ShouldActivateForURL(GURL(test_url.GetWithEmptyPath())));
   EXPECT_FALSE(factory()->ShouldActivateForURL(
       GURL("http://" + test_url.host() + "/path?q=q")));
   for (const auto& redirect : redirects) {
     EXPECT_FALSE(factory()->ShouldActivateForURL(redirect));
     EXPECT_FALSE(factory()->ShouldActivateForURL(redirect.GetWithEmptyPath()));
     EXPECT_FALSE(
@@ skipping 68 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     NoSonEngHit,
     ContentSubresourceFilterDriverFactoryThreatTypeTest,
     ::testing::Values(
         safe_browsing::ThreatPatternType::NONE,
         safe_browsing::ThreatPatternType::MALWARE_LANDING,
         safe_browsing::ThreatPatternType::MALWARE_DISTRIBUTION,
         safe_browsing::ThreatPatternType::SOCIAL_ENGINEERING_LANDING));
 
 }  // namespace subresource_filter