Make ChromeSubresourceFilterClient a WebContentsUserData

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc

Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
index e11a7e4d1a45764eb969df59768ff30f121ae72d..4ade5b930005f6f2513fc8a72e62c3a4bffa1faa 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.cc
@@ -20,13 +20,13 @@
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(
+    subresource_filter::ContentSubresourceFilterDriverFactory);
+
 namespace subresource_filter {
 
 namespace {
 
-const char kWebContentsUserDataKey[] =
-    "web_contents_subresource_filter_driver_factory";
-
 std::string DistillURLToHostAndPath(const GURL& url) {
   return url.host() + url.path();
 }
@@ -57,21 +57,12 @@ bool ShouldMeasurePerformanceForPageLoad(double performance_measurement_rate) {
 // static
 void ContentSubresourceFilterDriverFactory::CreateForWebContents(
     content::WebContents* web_contents,
-    std::unique_ptr<SubresourceFilterClient> client) {
+    SubresourceFilterClient* client) {
   if (FromWebContents(web_contents))
     return;
   web_contents->SetUserData(
-      kWebContentsUserDataKey,
-      base::MakeUnique<ContentSubresourceFilterDriverFactory>(
-          web_contents, std::move(client)));
-}
-
-// static
-ContentSubresourceFilterDriverFactory*
-ContentSubresourceFilterDriverFactory::FromWebContents(
-    content::WebContents* web_contents) {
-  return static_cast<ContentSubresourceFilterDriverFactory*>(
-      web_contents->GetUserData(kWebContentsUserDataKey));
+      UserDataKey(), base::MakeUnique<ContentSubresourceFilterDriverFactory>(
+                         web_contents, client));
 }
 
 // static
@@ -86,9 +77,9 @@ bool ContentSubresourceFilterDriverFactory::NavigationIsPageReload(
 
 ContentSubresourceFilterDriverFactory::ContentSubresourceFilterDriverFactory(
     content::WebContents* web_contents,
-    std::unique_ptr<SubresourceFilterClient> client)
+    SubresourceFilterClient* client)
     : content::WebContentsObserver(web_contents),
-      client_(std::move(client)),
+      client_(client),
       throttle_manager_(
           base::MakeUnique<ContentSubresourceFilterThrottleManager>(
               this,