[subresource_filter] Refactor activation suppression

components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.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/content_subresource_filter_throttle_manager.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "components/subresource_filter/content/browser/activation_state_computing_navigation_throttle.h"
@@ skipping 33 matching lines @@
   }
 
  private:
   ContentSubresourceFilterThrottleManager::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ForwardingNavigationThrottle);
 };
 
 }  // namespace
 
-bool ContentSubresourceFilterThrottleManager::Delegate::
-    ShouldSuppressActivation(content::NavigationHandle* navigation_handle) {
-  return false;
-}
-
 ContentSubresourceFilterThrottleManager::
     ContentSubresourceFilterThrottleManager(
         Delegate* delegate,
         VerifiedRulesetDealer::Handle* dealer_handle,
         content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       dealer_handle_(dealer_handle),
       delegate_(delegate),
       weak_ptr_factory_(this) {}
 
 ContentSubresourceFilterThrottleManager::
     ~ContentSubresourceFilterThrottleManager() {}
 
 void ContentSubresourceFilterThrottleManager::NotifyPageActivationComputed(
     content::NavigationHandle* navigation_handle,
     const ActivationState& activation_state) {
   DCHECK(navigation_handle->IsInMainFrame());
   DCHECK(!navigation_handle->HasCommitted());
   auto it = ongoing_activation_throttles_.find(navigation_handle);
   if (it != ongoing_activation_throttles_.end()) {
     it->second->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),

[engedy, 2017/05/09 22:13:35]

Unrelated question: after https://codereview.chromium.org/2844063002/, this
might be called with activation_state == DISABLED. This is not going to break
things, right? (I haven't looked into it at all.)

[Charlie Harrison, 2017/05/09 22:27:17]

Ah, it isn't great. We don't want to call EnsureRulesetHandle() in that case,
just pass null if there is no activation. Other than that it should work.

[Charlie Harrison, 2017/05/09 22:33:58]

Will it actually be called like this actually? I see
DCHECK_NE(activation_options_.activation_level, ActivationLevel::DISABLED);
right before calling this method.

[engedy, 2017/05/09 22:55:48]

Ahh, that's right. Crisis averted! 

                                                 activation_state);
   }
 }
 
 void ContentSubresourceFilterThrottleManager::RenderFrameDeleted(
     content::RenderFrameHost* frame_host) {
   activated_frame_hosts_.erase(frame_host);
   DestroyRulesetHandleIfNoLongerUsed();
 }
 
 // Pull the AsyncDocumentSubresourceFilter and its associated ActivationState
 // out of the activation state computing throttle. Store it for later filtering
 // of subframe navigations.
 void ContentSubresourceFilterThrottleManager::ReadyToCommitNavigation(
     content::NavigationHandle* navigation_handle) {
   auto throttle = ongoing_activation_throttles_.find(navigation_handle);
   if (throttle == ongoing_activation_throttles_.end())
     return;
 
   // A filter with DISABLED activation indicates a corrupted ruleset.
   AsyncDocumentSubresourceFilter* filter = throttle->second->filter();
   if (!filter || navigation_handle->GetNetErrorCode() != net::OK ||
       filter->activation_state().activation_level ==
-          ActivationLevel::DISABLED ||
-      delegate_->ShouldSuppressActivation(navigation_handle)) {
+          ActivationLevel::DISABLED) {
     return;
   }
 
   throttle->second->WillSendActivationToRenderer();
 
   content::RenderFrameHost* frame_host =
       navigation_handle->GetRenderFrameHost();
   frame_host->Send(new SubresourceFilterMsg_ActivateForNextCommittedLoad(
       frame_host->GetRoutingID(), filter->activation_state()));
 }
@@ skipping 161 matching lines @@
   }
 }
 
 void ContentSubresourceFilterThrottleManager::OnDocumentLoadStatistics(
     const DocumentLoadStatistics& statistics) {
   if (statistics_)
     statistics_->OnDocumentLoadStatistics(statistics);
 }
 
 }  // namespace subresource_filter