[subresource_filter] Remove some state from the driver factory

components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc

Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
index 592d21f5d4c49963d34c9d1c7816778e3d8c9630..226d3a5f6fbbafac0bb9a7a740f8673256aaad46 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.cc
@@ -6,6 +6,8 @@
 
 #include <set>
 #include <string>
+#include <tuple>
+#include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ -14,10 +16,12 @@
 #include "base/test/histogram_tester.h"
 #include "components/safe_browsing_db/util.h"
 #include "components/subresource_filter/content/browser/content_activation_list_utils.h"
+#include "components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h"
 #include "components/subresource_filter/content/browser/subresource_filter_client.h"
 #include "components/subresource_filter/content/common/subresource_filter_messages.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features_test_support.h"
+#include "components/subresource_filter/core/common/activation_decision.h"
 #include "components/subresource_filter/core/common/activation_list.h"
 #include "components/subresource_filter/core/common/test_ruleset_creator.h"
 #include "components/subresource_filter/core/common/test_ruleset_utils.h"
@@ -36,9 +40,6 @@
 
 namespace subresource_filter {
 
-using ActivationDecision =
-    ContentSubresourceFilterDriverFactory::ActivationDecision;
-
 namespace {
 
 const char kExampleUrlWithParams[] = "https://example.com/soceng?q=engsoc";
@@ -188,7 +189,8 @@ const ActivationLevelTestData kActivationLevelTestData[] = {
 
 class MockSubresourceFilterClient : public SubresourceFilterClient {
  public:
-  MockSubresourceFilterClient(VerifiedRulesetDealer::Handle* ruleset_dealer)
+  explicit MockSubresourceFilterClient(
+      VerifiedRulesetDealer::Handle* ruleset_dealer)
       : ruleset_dealer_(ruleset_dealer) {}
 
   ~MockSubresourceFilterClient() override = default;
@@ -332,7 +334,9 @@ class ContentSubresourceFilterDriverFactoryTest
     navigation_simulator->Commit();
     ExpectActivationSignalForFrame(main_rfh(), expected_activation);
     EXPECT_EQ(expected_activation_decision,
-              factory()->GetActivationDecisionForLastCommittedPageLoad());
+              factory()
+                  ->throttle_manager()
+                  ->GetActivationDecisionForLastCommittedPageLoad());
 
     // Re-create a subframe now that the frame has navigated.
     content::RenderFrameHostTester* rfh_tester =