Make ChromeSubresourceFilterClient a WebContentsUserData

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.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 "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "components/subresource_filter/content/browser/content_activation_list_utils.h"
 #include "components/subresource_filter/content/browser/subresource_filter_client.h"
 #include "components/subresource_filter/core/browser/subresource_filter_features.h"
 #include "components/subresource_filter/core/common/activation_list.h"
 #include "components/subresource_filter/core/common/activation_state.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/web_contents.h"
 #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();
 }
 
 // Returns true with a probability given by |performance_measurement_rate| if
 // ThreadTicks is supported, otherwise returns false.
 bool ShouldMeasurePerformanceForPageLoad(double performance_measurement_rate) {
   if (!base::ThreadTicks::IsSupported())
     return false;
   return performance_measurement_rate == 1 ||
@@ skipping 10 matching lines @@
         hits_pattern, 0x10);                                                   \
     UMA_HISTOGRAM_COUNTS(                                                      \
         "SubresourceFilter.PageLoad.RedirectChainLength." suffix, chain_size); \
   } while (0)
 
 }  // namespace
 
 // 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)));
+      UserDataKey(), base::MakeUnique<ContentSubresourceFilterDriverFactory>(
+                         web_contents, client));
 }
 
 // static
-ContentSubresourceFilterDriverFactory*
-ContentSubresourceFilterDriverFactory::FromWebContents(
-    content::WebContents* web_contents) {
-  return static_cast<ContentSubresourceFilterDriverFactory*>(
-      web_contents->GetUserData(kWebContentsUserDataKey));
-}
-
-// static
 bool ContentSubresourceFilterDriverFactory::NavigationIsPageReload(
     const GURL& url,
     const content::Referrer& referrer,
     ui::PageTransition transition) {
   return ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) ||
          // Some pages 'reload' from JavaScript by navigating to themselves.
          url == referrer.url;
 }
 
 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,
               client_->GetRulesetDealer(),
               web_contents)),
       activation_level_(ActivationLevel::DISABLED),
       activation_decision_(ActivationDecision::UNKNOWN),
       measure_performance_(false) {}
 
 ContentSubresourceFilterDriverFactory::
@@ skipping 228 matching lines @@
       REPORT_REDIRECT_PATTERN_FOR_SUFFIX("SubresourceFilterOnly", hits_pattern,
                                          chain_size);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace subresource_filter