Make ChromeSubresourceFilterClient a WebContentsUserData

chrome/browser/subresource_filter/subresource_filter_unittest.cc

Index: chrome/browser/subresource_filter/subresource_filter_unittest.cc
diff --git a/chrome/browser/subresource_filter/subresource_filter_unittest.cc b/chrome/browser/subresource_filter/subresource_filter_unittest.cc
index c16b3d4e31a30e19fcb231dd5b77200eeb084f04..448c6097ff124c4d0a22dba4e7044be7871b8eb1 100644
--- a/chrome/browser/subresource_filter/subresource_filter_unittest.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_unittest.cc
@@ -100,13 +100,8 @@ class SubresourceFilterTest : public ChromeRenderViewHostTestHarness {
     // Set up the tab helpers.
     InfoBarService::CreateForWebContents(web_contents());
     TabSpecificContentSettings::CreateForWebContents(web_contents());
+    ChromeSubresourceFilterClient::CreateForWebContents(web_contents());
 
-    std::unique_ptr<ChromeSubresourceFilterClient> subresource_filter_client(
-        new ChromeSubresourceFilterClient(web_contents()));
-    client_ = subresource_filter_client.get();
-    subresource_filter::ContentSubresourceFilterDriverFactory::
-        CreateForWebContents(web_contents(),
-                             std::move(subresource_filter_client));
     base::RunLoop().RunUntilIdle();
   }
 
@@ -151,7 +146,9 @@ class SubresourceFilterTest : public ChromeRenderViewHostTestHarness {
         url, safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER);
   }
 
-  ChromeSubresourceFilterClient* client() { return client_; }
+  ChromeSubresourceFilterClient* client() {
+    return ChromeSubresourceFilterClient::FromWebContents(web_contents());
+  }
 
  private:
   base::ScopedTempDir ruleset_service_dir_;
@@ -164,8 +161,6 @@ class SubresourceFilterTest : public ChromeRenderViewHostTestHarness {
 
   scoped_refptr<FakeSafeBrowsingDatabaseManager> fake_safe_browsing_database_;
 
-  ChromeSubresourceFilterClient* client_ = nullptr;
-
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilterTest);
 };