[subresource_filter] Reland: Remove Forwarding NavigationThrottles

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 "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h"
 
 #include <set>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 293 matching lines @@
     base::HistogramTester tester;
     EXPECT_CALL(*client(), ToggleNotificationVisibility(false)).Times(1);
 
     std::unique_ptr<content::NavigationSimulator> navigation_simulator =
         content::NavigationSimulator::CreateRendererInitiated(
             navigation_chain.front(), main_rfh());
     navigation_simulator->SetReferrer(referrer);
     navigation_simulator->SetTransition(transition);
     navigation_simulator->Start();
 
-    if (blacklisted_urls.front()) {
-      factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
-          navigation_chain.front(), threat_type, threat_type_metadata);
+    ::testing::Mock::VerifyAndClearExpectations(client());
+    for (size_t i = 1; i < navigation_chain.size(); ++i)
+      navigation_simulator->Redirect(navigation_chain[i]);
+
+    if (blacklisted_urls.size() != navigation_chain.size() ||
+        !blacklisted_urls.back()) {
+      threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_SAFE;
+      threat_type_metadata = safe_browsing::ThreatPatternType::NONE;
     }
-    ::testing::Mock::VerifyAndClearExpectations(client());
-
-    for (size_t i = 1; i < navigation_chain.size(); ++i) {
-      const GURL url = navigation_chain[i];
-      if (i < blacklisted_urls.size() && blacklisted_urls[i]) {
-        factory()->OnMainResourceMatchedSafeBrowsingBlacklist(
-            url, threat_type, threat_type_metadata);
-      }
-      navigation_simulator->Redirect(url);
-    }
+    factory()->OnSafeBrowsingMatchComputed(
+        navigation_simulator->GetNavigationHandle(), threat_type,
+        threat_type_metadata);
     std::string suffix;
     ActivationList activation_list =
         GetListForThreatTypeAndMetadata(threat_type, threat_type_metadata);
     suffix = blacklisted_urls.back() ? GetSuffixForList(activation_list)
                                      : std::string();
 
     navigation_simulator->Commit();
     ExpectActivationSignalForFrame(main_rfh(), expected_activation);
     EXPECT_EQ(expected_activation_decision,
               factory()->GetActivationDecisionForLastCommittedPageLoad());
@@ skipping 418 matching lines @@
     ActivationScopeTest,
     ContentSubresourceFilterDriverFactoryActivationScopeTest,
     ::testing::ValuesIn(kActivationScopeTestData));
 
 INSTANTIATE_TEST_CASE_P(
     ActivationLevelTest,
     ContentSubresourceFilterDriverFactoryActivationLevelTest,
     ::testing::ValuesIn(kActivationLevelTestData));
 
 }  // namespace subresource_filter