Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/views/conflicting_module_view_win.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/conflicting_module_view_win.h"
 
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/user_metrics.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using base::UserMetricsAction;
@@ skipping 73 matching lines @@
 
   IntegerPrefMember bubble_shown;
   bubble_shown.Init(
       prefs::kModuleConflictBubbleShown,
       browser_->profile()->GetPrefs());
   bubble_shown.SetValue(bubble_shown.GetValue() + 1);
 }
 
 void ConflictingModuleView::OnWidgetClosing(views::Widget* widget) {
   views::BubbleDialogDelegateView::OnWidgetClosing(widget);
-  content::RecordAction(
+  base::RecordAction(
       UserMetricsAction("ConflictingModuleNotificationDismissed"));
 }
 
 bool ConflictingModuleView::Accept() {
   browser_->OpenURL(
       content::OpenURLParams(help_center_url_, content::Referrer(),
                              WindowOpenDisposition::NEW_FOREGROUND_TAB,
                              ui::PAGE_TRANSITION_LINK, false));
   EnumerateModulesModel::GetInstance()->AcknowledgeConflictNotification();
   return true;
@@ skipping 19 matching lines @@
 
   views::Label* explanation = new views::Label();
   explanation->SetMultiLine(true);
   explanation->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   explanation->SetText(
       l10n_util::GetStringUTF16(IDS_OPTIONS_CONFLICTING_MODULE));
   explanation->SizeToFit(views::Widget::GetLocalizedContentsWidth(
       IDS_CONFLICTING_MODULE_BUBBLE_WIDTH_CHARS));
   AddChildView(explanation);
 
-  content::RecordAction(
-      UserMetricsAction("ConflictingModuleNotificationShown"));
+  base::RecordAction(UserMetricsAction("ConflictingModuleNotificationShown"));
 
   UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection",
       EnumerateModulesModel::ACTION_BUBBLE_SHOWN,
       EnumerateModulesModel::ACTION_BOUNDARY);
 }
 
 void ConflictingModuleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_ALERT_DIALOG;
 }
 
 void ConflictingModuleView::OnConflictsAcknowledged() {
   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
   if (!model->ShouldShowConflictWarning())
     GetWidget()->Close();
 }