[subresource_filter] Remove some state from the driver factory

components/subresource_filter/content/browser/activation_state_computing_navigation_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/activation_state_computing_navigation_throttle.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "components/subresource_filter/content/browser/async_document_subresource_filter.h"
+#include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 
 namespace subresource_filter {
 
 // static
 std::unique_ptr<ActivationStateComputingNavigationThrottle>
 ActivationStateComputingNavigationThrottle::CreateForMainFrame(
     content::NavigationHandle* navigation_handle) {
@@ skipping 25 matching lines @@
       parent_activation_state_(parent_activation_state),
       ruleset_handle_(ruleset_handle),
       weak_ptr_factory_(this) {}
 
 ActivationStateComputingNavigationThrottle::
     ~ActivationStateComputingNavigationThrottle() {}
 
 void ActivationStateComputingNavigationThrottle::
     NotifyPageActivationWithRuleset(
         VerifiedRuleset::Handle* ruleset_handle,
-        const ActivationState& page_activation_state) {
+        const ActivationState& page_activation_state,
+        ActivationDecision page_activation_decision) {
   DCHECK(navigation_handle()->IsInMainFrame());
   DCHECK(!parent_activation_state_);
   DCHECK(!ruleset_handle_);
-  // DISABLED implies null ruleset.
+  parent_activation_state_ = page_activation_state;
+  page_activation_decision_ = page_activation_decision;
+  ruleset_handle_ = ruleset_handle;
+
+  // Activated implies not disabled.
+  DCHECK(page_activation_decision != ActivationDecision::ACTIVATED ||
+         page_activation_state.activation_level != ActivationLevel::DISABLED);
+  // Disabled implies null ruleset.
   DCHECK(page_activation_state.activation_level != ActivationLevel::DISABLED ||
          !ruleset_handle);
-  parent_activation_state_ = page_activation_state;
-  ruleset_handle_ = ruleset_handle;
 }
 
 content::NavigationThrottle::ThrottleCheckResult
 ActivationStateComputingNavigationThrottle::WillProcessResponse() {
   // Main frame navigations with disabled page-level activation become
   // pass-through throttles.
   if (!parent_activation_state_ ||
       parent_activation_state_->activation_level == ActivationLevel::DISABLED) {
     DCHECK(navigation_handle()->IsInMainFrame());
     DCHECK(!ruleset_handle_);
@@ skipping 29 matching lines @@
   navigation_handle()->Resume();
 }
 
 // Ensure the caller cannot take ownership of a subresource filter for cases
 // when activation IPCs are not sent to the render process.
 std::unique_ptr<AsyncDocumentSubresourceFilter>
 ActivationStateComputingNavigationThrottle::ReleaseFilter() {
   return will_send_activation_to_renderer_ ? std::move(async_filter_) : nullptr;
 }
 
+ActivationDecision
+ActivationStateComputingNavigationThrottle::GetPageActivationDecision() {
+  DCHECK(navigation_handle()->IsInMainFrame());
+  return page_activation_decision_;
+}
+
 void ActivationStateComputingNavigationThrottle::
     WillSendActivationToRenderer() {
   DCHECK(async_filter_);
   will_send_activation_to_renderer_ = true;
 }
 
 }  // namespace subresource_filter