Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/views/outdated_upgrade_bubble_view.cc

 // Copyright (c) 2013 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/ui/views/outdated_upgrade_bubble_view.h"
 
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/task_scheduler/post_task.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/elevation_icon_setter.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/page_navigator.h"
-#include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/google_update_util.h"
 #endif
@@ skipping 27 matching lines @@
 
 // static
 void OutdatedUpgradeBubbleView::ShowBubble(views::View* anchor_view,
                                            content::PageNavigator* navigator,
                                            bool auto_update_enabled) {
   if (g_upgrade_bubble)
     return;
   g_upgrade_bubble = new OutdatedUpgradeBubbleView(anchor_view, navigator,
                                                    auto_update_enabled);
   views::BubbleDialogDelegateView::CreateBubble(g_upgrade_bubble)->Show();
-  content::RecordAction(auto_update_enabled ?
-      base::UserMetricsAction("OutdatedUpgradeBubble.Show") :
-      base::UserMetricsAction("OutdatedUpgradeBubble.ShowNoAU"));
+  base::RecordAction(
+      auto_update_enabled
+          ? base::UserMetricsAction("OutdatedUpgradeBubble.Show")
+          : base::UserMetricsAction("OutdatedUpgradeBubble.ShowNoAU"));
 }
 
 bool OutdatedUpgradeBubbleView::IsAvailable() {
 // This should only work on non-Chrome OS desktop platforms.
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   return true;
 #else
   return false;
 #endif
@@ skipping 12 matching lines @@
   // would attempt to show a bubble that is closing.
   DCHECK_EQ(g_upgrade_bubble, this);
   g_upgrade_bubble = nullptr;
 }
 
 base::string16 OutdatedUpgradeBubbleView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_TITLE);
 }
 
 bool OutdatedUpgradeBubbleView::Cancel() {
-  content::RecordAction(base::UserMetricsAction("OutdatedUpgradeBubble.Later"));
+  base::RecordAction(base::UserMetricsAction("OutdatedUpgradeBubble.Later"));
   return true;
 }
 
 bool OutdatedUpgradeBubbleView::Accept() {
   // Offset the +1 in the dtor.
   --g_num_ignored_bubbles;
 
   if (auto_update_enabled_) {
     DCHECK(UpgradeDetector::GetInstance()->is_outdated_install());
     UMA_HISTOGRAM_CUSTOM_COUNTS("OutdatedUpgradeBubble.NumLaterPerReinstall",
                                 g_num_ignored_bubbles, 1, kMaxIgnored,
                                 kNumIgnoredBuckets);
-    content::RecordAction(
+    base::RecordAction(
         base::UserMetricsAction("OutdatedUpgradeBubble.Reinstall"));
     navigator_->OpenURL(
         content::OpenURLParams(GURL(kDownloadChromeUrl), content::Referrer(),
                                WindowOpenDisposition::NEW_FOREGROUND_TAB,
                                ui::PAGE_TRANSITION_LINK, false));
 #if defined(OS_WIN)
   } else {
     DCHECK(UpgradeDetector::GetInstance()->is_outdated_install_no_au());
     UMA_HISTOGRAM_CUSTOM_COUNTS("OutdatedUpgradeBubble.NumLaterPerEnableAU",
                                 g_num_ignored_bubbles, 1, kMaxIgnored,
                                 kNumIgnoredBuckets);
-    content::RecordAction(
+    base::RecordAction(
         base::UserMetricsAction("OutdatedUpgradeBubble.EnableAU"));
     // Record that the autoupdate flavour of the dialog has been shown.
     if (g_browser_process->local_state()) {
       g_browser_process->local_state()->SetBoolean(
           prefs::kAttemptedToEnableAutoupdate, true);
     }
 
     // Re-enable updates by shelling out to setup.exe asynchronously.
     base::PostTaskWithTraits(
         FROM_HERE,
@@ skipping 41 matching lines @@
     views::View* anchor_view,
     content::PageNavigator* navigator,
     bool auto_update_enabled)
     : BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       auto_update_enabled_(auto_update_enabled),
       navigator_(navigator) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 }