[subresource_filter] Remove some state from the driver factory

components/subresource_filter/content/browser/activation_state_computing_navigation_throttle_unittest.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 <memory>
 #include <utility>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "components/subresource_filter/content/browser/async_document_subresource_filter.h"
 #include "components/subresource_filter/content/browser/async_document_subresource_filter_test_utils.h"
 #include "components/subresource_filter/core/common/activation_level.h"
@@ skipping 107 matching lines @@
               navigation_simulator_->GetLastThrottleCheckResult());
   }
 
   void SimulateCommitAndExpectToProceed() {
     navigation_simulator_->Commit();
     EXPECT_EQ(content::NavigationThrottle::PROCEED,
               navigation_simulator_->GetLastThrottleCheckResult());
   }
 
   void NotifyPageActivation(ActivationState state) {
-    test_throttle_->NotifyPageActivationWithRuleset(
-        state.activation_level == ActivationLevel::DISABLED
-            ? nullptr
-            : ruleset_handle_.get(),
-        state);
+    if (state.activation_level == ActivationLevel::DISABLED) {
+      test_throttle_->NotifyPageActivationWithRuleset(
+          nullptr, state, ActivationDecision::ACTIVATION_DISABLED);
+    } else {
+      test_throttle_->NotifyPageActivationWithRuleset(
+          ruleset_handle_.get(), state, ActivationDecision::ACTIVATED);
+    }
   }
 
   ActivationState last_activation_state() {
     EXPECT_TRUE(last_activation_state_.has_value());
     return last_activation_state_.value_or(
         ActivationState(ActivationLevel::DISABLED));
   }
 
   content::RenderFrameHost* last_committed_frame_host() {
     return last_committed_frame_host_;
@@ skipping 256 matching lines @@
   SimulateStartAndExpectToProceed();
   SimulateCommitAndExpectToProceed();
 
   state = last_activation_state();
   EXPECT_EQ(ActivationLevel::ENABLED, state.activation_level);
   EXPECT_TRUE(state.filtering_disabled_for_document);
   EXPECT_TRUE(state.generic_blocking_rules_disabled);
 }
 
 }  // namespace subresource_filter