[subresource_filter] Reland: Remove Forwarding NavigationThrottles

components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle.cc

 // Copyright 2017 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/subresource_filter_safe_browsing_activation_throttle.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 64 matching lines @@
 }
 
 content::NavigationThrottle::ThrottleCheckResult
 SubresourceFilterSafeBrowsingActivationThrottle::WillRedirectRequest() {
   CheckCurrentUrl();
   return content::NavigationThrottle::ThrottleCheckResult::PROCEED;
 }
 
 content::NavigationThrottle::ThrottleCheckResult
 SubresourceFilterSafeBrowsingActivationThrottle::WillProcessResponse() {
-  if (!database_client_)
-    return content::NavigationThrottle::PROCEED;
-
   // No need to defer the navigation if the check already happened.
-  if (check_results_.back().finished) {
+  if (!database_client_ || check_results_.back().finished) {
     NotifyResult();
     return content::NavigationThrottle::ThrottleCheckResult::PROCEED;
   }
   defer_time_ = base::TimeTicks::Now();
   return content::NavigationThrottle::ThrottleCheckResult::DEFER;
 }
 
 const char*
 SubresourceFilterSafeBrowsingActivationThrottle::GetNameForLogging() {
   return "SubresourceFilterSafeBrowsingActivationThrottle";
@@ skipping 25 matching lines @@
                             navigation_handle()->GetURL(), id));
 }
 
 void SubresourceFilterSafeBrowsingActivationThrottle::NotifyResult() {
   content::WebContents* web_contents = navigation_handle()->GetWebContents();
   if (!web_contents)
     return;
 
   using subresource_filter::ContentSubresourceFilterDriverFactory;
 
-  const SubresourceFilterSafeBrowsingClient::CheckResult& result =
-      check_results_.back();
   ContentSubresourceFilterDriverFactory* driver_factory =
       ContentSubresourceFilterDriverFactory::FromWebContents(web_contents);
   DCHECK(driver_factory);
 
-  driver_factory->OnMainResourceMatchedSafeBrowsingBlacklist(
-      navigation_handle()->GetURL(), result.threat_type, result.pattern_type);
+  auto threat_type = safe_browsing::SBThreatType::SB_THREAT_TYPE_SAFE;
+  auto pattern_type = safe_browsing::ThreatPatternType::NONE;
+  if (database_client_) {
+    DCHECK(!check_results_.empty());
+    DCHECK(check_results_.back().finished);
+    threat_type = check_results_.back().threat_type;
+    pattern_type = check_results_.back().pattern_type;
+  }
+  driver_factory->OnSafeBrowsingMatchComputed(navigation_handle(), threat_type,
+                                              pattern_type);
 
   base::TimeDelta delay = defer_time_.is_null()
                               ? base::TimeDelta::FromMilliseconds(0)
                               : base::TimeTicks::Now() - defer_time_;
   UMA_HISTOGRAM_TIMES("SubresourceFilter.PageLoad.SafeBrowsingDelay", delay);
 
   // Log a histogram for the delay we would have introduced if the throttle only
   // speculatively checks URLs on WillStartRequest. This is only different from
   // the actual delay if there was at least one redirect.
   base::TimeDelta no_redirect_speculation_delay =
-      check_results_.size() > 1 ? result.check_time : delay;
+      check_results_.size() > 1 ? check_results_.back().check_time : delay;
   UMA_HISTOGRAM_TIMES(
       "SubresourceFilter.PageLoad.SafeBrowsingDelay.NoRedirectSpeculation",
       no_redirect_speculation_delay);
 }
 
 void SubresourceFilterSafeBrowsingActivationThrottle::
     RecordRedirectChainMatchPatternForList(ActivationList activation_list) {
   DCHECK(check_results_.back().finished);
   ActivationList matched_list = GetListForThreatTypeAndMetadata(
       check_results_.back().threat_type, check_results_.back().pattern_type);
@@ skipping 12 matching lines @@
       REPORT_REDIRECT_PATTERN_FOR_SUFFIX("SubresourceFilterOnly", is_matched,
                                          chain_size);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  //  namespace subresource_filter