Make ChromeSubresourceFilterClient a WebContentsUserData

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..e12a3dd8527e1521508d4f0a28078df1231619af 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
@@ -240,9 +240,10 @@ class ContentSubresourceFilterDriverFactoryTest
         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());
 
     // Add a subframe.
     content::RenderFrameHostTester* rfh_tester =
@@ -264,7 +265,7 @@ class ContentSubresourceFilterDriverFactoryTest
         RenderViewHostTestHarness::web_contents());
   }
 
-  MockSubresourceFilterClient* client() { return client_; }
+  MockSubresourceFilterClient* client() { return client_.get(); }
 
   content::RenderFrameHost* GetSubframeRFH() {
     for (content::RenderFrameHost* rfh :
@@ -480,9 +481,7 @@ class ContentSubresourceFilterDriverFactoryTest
   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);