Remove the wrapper functions content::RecordAction et al

chrome/browser/notifications/platform_notification_service_impl.cc

 // Copyright 2014 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 "chrome/browser/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_result.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "extensions/features/features.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/url_constants.h"
@@ skipping 78 matching lines @@
     int action_index,
     const base::NullableString16& reply) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   blink::mojom::PermissionStatus permission_status =
       CheckPermissionOnUIThread(browser_context, origin,
                                 kInvalidRenderProcessId);
 
   // TODO(peter): Change this to a CHECK() when Issue 555572 is resolved.
   // Also change this method to be const again.
   if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
-    content::RecordAction(base::UserMetricsAction(
+    base::RecordAction(base::UserMetricsAction(
         "Notifications.Persistent.ClickedWithoutPermission"));
     return;
   }
 
   if (action_index == -1) {
-    content::RecordAction(base::UserMetricsAction(
-        "Notifications.Persistent.Clicked"));
+    base::RecordAction(
+        base::UserMetricsAction("Notifications.Persistent.Clicked"));
   } else {
-    content::RecordAction(base::UserMetricsAction(
+    base::RecordAction(base::UserMetricsAction(
         "Notifications.Persistent.ClickedActionButton"));
   }
 
 #if BUILDFLAG(ENABLE_BACKGROUND)
   // Ensure the browser stays alive while the event is processed.
   if (pending_click_dispatch_events_++ == 0) {
     click_dispatch_keep_alive_.reset(
         new ScopedKeepAlive(KeepAliveOrigin::PENDING_NOTIFICATION_CLICK_EVENT,
                             KeepAliveRestartOption::DISABLED));
   }
@@ skipping 13 matching lines @@
     const std::string& notification_id,
     const GURL& origin,
     bool by_user) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If we programatically closed this notification, don't dispatch any event.
   if (closed_notifications_.erase(notification_id) != 0)
     return;
 
   if (by_user) {
-    content::RecordAction(base::UserMetricsAction(
-        "Notifications.Persistent.ClosedByUser"));
+    base::RecordAction(
+        base::UserMetricsAction("Notifications.Persistent.ClosedByUser"));
   } else {
-    content::RecordAction(base::UserMetricsAction(
+    base::RecordAction(base::UserMetricsAction(
         "Notifications.Persistent.ClosedProgrammatically"));
   }
   content::NotificationEventDispatcher::GetInstance()
       ->DispatchNotificationCloseEvent(
           browser_context, notification_id, origin, by_user,
           base::Bind(
               &PlatformNotificationServiceImpl::OnCloseEventDispatchComplete,
               base::Unretained(this)));
 }
 
@@ skipping 162 matching lines @@
   int settings_button_index = notification_data.actions.size();
   PersistentNotificationDelegate* delegate = new PersistentNotificationDelegate(
       browser_context, notification_id, origin, settings_button_index);
 
   Notification notification = CreateNotificationFromData(
       profile, service_worker_scope, origin, notification_data,
       notification_resources, delegate);
 
   GetNotificationDisplayService(profile)->Display(
       NotificationCommon::PERSISTENT, notification_id, notification);
-  content::RecordAction(
-      base::UserMetricsAction("Notifications.Persistent.Shown"));
+  base::RecordAction(base::UserMetricsAction("Notifications.Persistent.Shown"));
 }
 
 void PlatformNotificationServiceImpl::ClosePersistentNotification(
     BrowserContext* browser_context,
     const std::string& notification_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   DCHECK(profile);
 
@@ skipping 158 matching lines @@
 
 void PlatformNotificationServiceImpl::RecordSiteEngagement(
     BrowserContext* browser_context,
     const GURL& origin) {
   // TODO(dominickn, peter): This would be better if the site engagement service
   // could directly observe each notification.
   SiteEngagementService* engagement_service =
       SiteEngagementService::Get(Profile::FromBrowserContext(browser_context));
   engagement_service->HandleNotificationInteraction(origin);
 }