Make ChromeSubresourceFilterClient a WebContentsUserData

components/subresource_filter/content/browser/content_subresource_filter_driver_factory_unittest.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 <set>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 218 matching lines @@
     RenderViewHostTestHarness::SetUp();
 
     std::vector<proto::UrlRule> rules;
     rules.push_back(testing::CreateSuffixRule("disallowed.html"));
     ASSERT_NO_FATAL_FAILURE(test_ruleset_creator_.CreateRulesetWithRules(
         rules, &test_ruleset_pair_));
     ruleset_dealer_ = base::MakeUnique<VerifiedRulesetDealer::Handle>(
         base::MessageLoop::current()->task_runner());
     ruleset_dealer_->SetRulesetFile(
         testing::TestRuleset::Open(test_ruleset_pair_.indexed));
-    client_ = new MockSubresourceFilterClient(ruleset_dealer_.get());
+    client_ =
+        base::MakeUnique<MockSubresourceFilterClient>(ruleset_dealer_.get());
     ContentSubresourceFilterDriverFactory::CreateForWebContents(
-        RenderViewHostTestHarness::web_contents(), base::WrapUnique(client()));
+        RenderViewHostTestHarness::web_contents(), client());
     ResetConfigurationToEnableFilteringOnSocialEngineeringSites();
 
     // Add a subframe.
     content::RenderFrameHostTester* rfh_tester =
         content::RenderFrameHostTester::For(main_rfh());
     rfh_tester->InitializeRenderFrameIfNeeded();
     rfh_tester->AppendChild(kSubframeName);
 
     Observe(content::RenderViewHostTestHarness::web_contents());
   }
@@ skipping 17 matching lines @@
     ResetConfiguration(Configuration(
         ActivationLevel::ENABLED, ActivationScope::ACTIVATION_LIST,
         ActivationList::SOCIAL_ENG_ADS_INTERSTITIAL));
   }
 
   ContentSubresourceFilterDriverFactory* factory() {
     return ContentSubresourceFilterDriverFactory::FromWebContents(
         RenderViewHostTestHarness::web_contents());
   }
 
-  MockSubresourceFilterClient* client() { return client_; }
+  MockSubresourceFilterClient* client() { return client_.get(); }
 
   content::RenderFrameHost* GetSubframeRFH() {
     for (content::RenderFrameHost* rfh :
          RenderViewHostTestHarness::web_contents()->GetAllFrames()) {
       if (rfh->GetFrameName() == kSubframeName)
         return rfh;
     }
     return nullptr;
   }
 
@@ skipping 196 matching lines @@
                             .performance_measurement_rate;
     // Note: The case when 0 < rate < 1 is not deterministic, don't test it.
     EXPECT_TRUE(rate == 0 || rate == 1);
     return rate == 1;
   }
 
   testing::ScopedSubresourceFilterConfigurator scoped_configuration_;
   testing::TestRulesetCreator test_ruleset_creator_;
   testing::TestRulesetPair test_ruleset_pair_;
 
-  // Owned by the factory.
-  MockSubresourceFilterClient* client_;
-
+  std::unique_ptr<MockSubresourceFilterClient> client_;
   std::unique_ptr<VerifiedRulesetDealer::Handle> ruleset_dealer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSubresourceFilterDriverFactoryTest);
 };
 
 class ContentSubresourceFilterDriverFactoryThreatTypeTest
     : public ContentSubresourceFilterDriverFactoryTest,
       public ::testing::WithParamInterface<ActivationListTestData> {
  public:
   ContentSubresourceFilterDriverFactoryThreatTypeTest() {}
@@ skipping 353 matching lines @@
     ActivationScopeTest,
     ContentSubresourceFilterDriverFactoryActivationScopeTest,
     ::testing::ValuesIn(kActivationScopeTestData));
 
 INSTANTIATE_TEST_CASE_P(
     ActivationLevelTest,
     ContentSubresourceFilterDriverFactoryActivationLevelTest,
     ::testing::ValuesIn(kActivationLevelTestData));
 
 }  // namespace subresource_filter