[subresource_filter] Refactor activation suppression

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/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
@@ skipping 108 matching lines @@
                          url, config.activation_conditions);
                    });
 
   if (highest_priority_activated_config ==
       config_list->configs_by_decreasing_priority().end()) {
     activation_decision_ = ActivationDecision::ACTIVATION_CONDITIONS_NOT_MET;
     activation_options_ = Configuration::ActivationOptions();
     return;
   }
 
-  // TODO(csharrison): The throttle manager also performs this check. Remove
-  // this one when the activation decision is sent directly to the throttle
-  // manager.
   if (client_->ShouldSuppressActivation(navigation_handle)) {
     activation_decision_ = ActivationDecision::URL_WHITELISTED;
     activation_options_ = Configuration::ActivationOptions();
     return;
   }
 
   activation_options_ = highest_priority_activated_config->activation_options;
   activation_decision_ =
       activation_options_.activation_level == ActivationLevel::DISABLED
           ? ActivationDecision::ACTIVATION_DISABLED
@@ skipping 78 matching lines @@
   throttle_manager_->NotifyPageActivationComputed(navigation_handle, state);
 }
 
 void ContentSubresourceFilterDriverFactory::OnFirstSubresourceLoadDisallowed() {
   if (activation_options_.should_suppress_notifications)
     return;
   client_->ToggleNotificationVisibility(activation_options_.activation_level ==
                                         ActivationLevel::ENABLED);
 }
 
-bool ContentSubresourceFilterDriverFactory::ShouldSuppressActivation(
-    content::NavigationHandle* navigation_handle) {
-  return client_->ShouldSuppressActivation(navigation_handle);
-}
-
 void ContentSubresourceFilterDriverFactory::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   if (navigation_handle->IsInMainFrame() &&
       !navigation_handle->IsSameDocument()) {
     activation_decision_ = ActivationDecision::UNKNOWN;
     activation_list_matches_.clear();
     navigation_chain_ = {navigation_handle->GetURL()};
     client_->ToggleNotificationVisibility(false);
   }
 }
@@ skipping 91 matching lines @@
       REPORT_REDIRECT_PATTERN_FOR_SUFFIX("SubresourceFilterOnly", hits_pattern,
                                          chain_size);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace subresource_filter