Remove DEFINE_WEB_CONTENTS_USER_DATA_KEY in //components.

It is no longer to invoke the DEFINE_WEB_CONTENTS_USER_DATA_KEY macro to define a global variable from which the key of a WebContentsUserData is derived. The key is now derived from a static local variable. This CL was uploaded by git cl split. R=sdefresne@chromium.org Bug: 589840 Change-Id: I7c899d2cfdb3a5c38f6d9a136b474c19f6370c71 Reviewed-on: https://chromium-review.googlesource.com/1150287Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> Commit-Queue: François Doray <fdoray@chromium.org> Cr-Commit-Position: refs/heads/master@{#578310}

Remove DEFINE_WEB_CONTENTS_USER_DATA_KEY in //components.
It is no longer to invoke the DEFINE_WEB_CONTENTS_USER_DATA_KEY macro to define a global variable from which the key of a WebContentsUserData is derived. The key is now derived from a static local variable. This CL was uploaded by git cl split. R=sdefresne@chromium.org Bug: 589840 Change-Id: I7c899d2cfdb3a5c38f6d9a136b474c19f6370c71 Reviewed-on: https://chromium-review.googlesource.com/1150287Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> Commit-Queue: François Doray <fdoray@chromium.org> Cr-Commit-Position: refs/heads/master@{#578310}
b3fc6e74 · Francois Doray · Commit Bot · d5217e9e · b3fc6e74 · b3fc6e74
Commit b3fc6e74 authored Jul 26, 2018 by Francois Doray Committed by Commit Bot Jul 26, 2018
18 changed files
--- a/components/dom_distiller/content/browser/distillability_driver.cc
+++ b/components/dom_distiller/content/browser/distillability_driver.cc
@@ -13,9 +13,6 @@
 #include "content/public/browser/web_contents_user_data.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(
-    dom_distiller::DistillabilityDriver);
-
 namespace dom_distiller {

 // Implementation of the Mojo DistillabilityService. This is called by the

--- a/components/dom_distiller/content/browser/web_contents_main_frame_observer.cc
+++ b/components/dom_distiller/content/browser/web_contents_main_frame_observer.cc
@@ -10,8 +10,6 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(dom_distiller::WebContentsMainFrameObserver);
-
 namespace dom_distiller {

 WebContentsMainFrameObserver::WebContentsMainFrameObserver(

--- a/components/download/content/public/download_navigation_observer.cc
+++ b/components/download/content/public/download_navigation_observer.cc
@@ -6,8 +6,6 @@

 #include <memory>

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(download::DownloadNavigationObserver);
-
 namespace download {

 // static

--- a/components/favicon/content/content_favicon_driver.cc
+++ b/components/favicon/content/content_favicon_driver.cc
@@ -20,8 +20,6 @@
 #include "third_party/blink/public/common/manifest/manifest.h"
 #include "ui/gfx/image/image.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(favicon::ContentFaviconDriver);
-
 namespace favicon {
 namespace {


--- a/components/history/content/browser/history_context_helper.cc
+++ b/components/history/content/browser/history_context_helper.cc
@@ -33,5 +33,3 @@ ContextID ContextIDForWebContents(content::WebContents* web_contents) {
 }

 }  // namespace history
-
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(WebContentsContext);
--- a/components/history/content/browser/web_contents_top_sites_observer.cc
+++ b/components/history/content/browser/web_contents_top_sites_observer.cc
@@ -10,8 +10,6 @@
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(history::WebContentsTopSitesObserver);
-
 namespace history {

 // static

--- a/components/payments/content/payment_request_web_contents_manager.cc
+++ b/components/payments/content/payment_request_web_contents_manager.cc
@@ -13,8 +13,6 @@
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(payments::PaymentRequestWebContentsManager);
-
 namespace payments {

 PaymentRequestWebContentsManager::~PaymentRequestWebContentsManager() {}

--- a/components/pdf/browser/pdf_web_contents_helper.cc
+++ b/components/pdf/browser/pdf_web_contents_helper.cc
@@ -15,8 +15,6 @@
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/strings/grit/ui_strings.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(pdf::PDFWebContentsHelper);
-
 namespace pdf {

 // static

--- a/components/printing/browser/print_composite_client.cc
+++ b/components/printing/browser/print_composite_client.cc
@@ -19,8 +19,6 @@
 #include "printing/printing_utils.h"
 #include "services/service_manager/public/cpp/connector.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(printing::PrintCompositeClient);
-
 namespace {

 uint64_t GenerateFrameGuid(int process_id, int frame_id) {

--- a/components/safe_browsing/triggers/ad_sampler_trigger.cc
+++ b/components/safe_browsing/triggers/ad_sampler_trigger.cc
@@ -24,8 +24,6 @@
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/simple_url_loader.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(safe_browsing::AdSamplerTrigger);
-
 namespace safe_browsing {

 // Param name of the denominator for controlling sampling frequency.

--- a/components/safe_browsing/triggers/suspicious_site_trigger.cc
+++ b/components/safe_browsing/triggers/suspicious_site_trigger.cc
@@ -18,8 +18,6 @@
 #include "content/public/browser/web_contents.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(safe_browsing::SuspiciousSiteTrigger);
-
 namespace safe_browsing {

 namespace {

--- a/components/safe_browsing/triggers/trigger_manager.cc
+++ b/components/safe_browsing/triggers/trigger_manager.cc
@@ -15,9 +15,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(
-    safe_browsing::TriggerManagerWebContentsHelper);
-
 namespace safe_browsing {

 namespace {

--- a/components/security_interstitials/content/security_interstitial_tab_helper.cc
+++ b/components/security_interstitials/content/security_interstitial_tab_helper.cc
@@ -8,9 +8,6 @@
 #include "components/security_interstitials/core/controller_client.h"
 #include "content/public/browser/navigation_handle.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(
-    security_interstitials::SecurityInterstitialTabHelper);
-
 namespace security_interstitials {

 SecurityInterstitialTabHelper::~SecurityInterstitialTabHelper() {}

--- a/components/subresource_filter/content/browser/navigation_console_logger.cc
+++ b/components/subresource_filter/content/browser/navigation_console_logger.cc
@@ -7,8 +7,6 @@
 #include "base/memory/ptr_util.h"
 #include "content/public/browser/navigation_handle.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(subresource_filter::NavigationConsoleLogger);
-
 namespace subresource_filter {

 // static

--- a/components/subresource_filter/content/browser/subresource_filter_observer_manager.cc
+++ b/components/subresource_filter/content/browser/subresource_filter_observer_manager.cc
@@ -6,9 +6,6 @@

 #include "components/subresource_filter/core/common/activation_state.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(
-    subresource_filter::SubresourceFilterObserverManager);
-
 namespace subresource_filter {

 SubresourceFilterObserverManager::SubresourceFilterObserverManager(

--- a/components/ukm/content/source_url_recorder.cc
+++ b/components/ukm/content/source_url_recorder.cc
@@ -232,6 +232,3 @@ SourceId GetSourceIdForWebContentsDocument(
 }

 }  // namespace ukm
-
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(
-    ukm::internal::SourceUrlRecorderWebContentsObserver);
--- a/components/web_modal/web_contents_modal_dialog_manager.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager.cc
@@ -17,8 +17,6 @@

 using content::WebContents;

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(web_modal::WebContentsModalDialogManager);
-
 namespace web_modal {

 WebContentsModalDialogManager::~WebContentsModalDialogManager() {

--- a/components/zoom/zoom_controller.cc
+++ b/components/zoom/zoom_controller.cc
@@ -19,8 +19,6 @@
 #include "content/public/common/page_zoom.h"
 #include "net/base/url_util.h"

-DEFINE_WEB_CONTENTS_USER_DATA_KEY(zoom::ZoomController);
-
 using content::BrowserThread;

 namespace zoom {