Make ChromeSubresourceFilterClient a WebContentsUserData

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h

Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
index b7969d7705d01efbf024f6f77a7e6f18659a16fc..254716d6f17612f64049e5bf98bb7881426053a4 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
@@ -72,9 +72,8 @@ class ContentSubresourceFilterDriverFactory
     ACTIVATION_DECISION_MAX
   };
 
-  static void CreateForWebContents(
-      content::WebContents* web_contents,
-      std::unique_ptr<SubresourceFilterClient> client);
+  static void CreateForWebContents(content::WebContents* web_contents,
+                                   SubresourceFilterClient* client);
   static ContentSubresourceFilterDriverFactory* FromWebContents(
       content::WebContents* web_contents);
 
@@ -86,7 +85,7 @@ class ContentSubresourceFilterDriverFactory
 
   explicit ContentSubresourceFilterDriverFactory(
       content::WebContents* web_contents,
-      std::unique_ptr<SubresourceFilterClient> client);
+      SubresourceFilterClient* client);
   ~ContentSubresourceFilterDriverFactory() override;
 
   // Called when Safe Browsing detects that the |url| corresponding to the load
@@ -119,7 +118,7 @@ class ContentSubresourceFilterDriverFactory
     return throttle_manager_.get();
   }
 
-  SubresourceFilterClient* client() { return client_.get(); }
+  SubresourceFilterClient* client() { return client_; }
 
  private:
   friend class ContentSubresourceFilterDriverFactoryTest;
@@ -149,7 +148,8 @@ class ContentSubresourceFilterDriverFactory
   void RecordRedirectChainMatchPatternForList(
       ActivationList activation_list) const;
 
-  std::unique_ptr<SubresourceFilterClient> client_;
+  // Must outlive this class.
+  SubresourceFilterClient* client_;
 
   std::unique_ptr<ContentSubresourceFilterThrottleManager> throttle_manager_;