Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/toolbar/back_forward_menu_model.cc

 // Copyright (c) 2012 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/toolbar/back_forward_menu_model.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/text_elider.h"
 
 using base::UserMetricsAction;
 using content::NavigationController;
 using content::NavigationEntry;
@@ skipping 133 matching lines @@
 
 void BackForwardMenuModel::ActivatedAt(int index) {
   ActivatedAt(index, 0);
 }
 
 void BackForwardMenuModel::ActivatedAt(int index, int event_flags) {
   DCHECK(!IsSeparator(index));
 
   // Execute the command for the last item: "Show Full History".
   if (index == GetItemCount() - 1) {
-    content::RecordComputedAction(BuildActionName("ShowFullHistory", -1));
+    base::RecordComputedAction(BuildActionName("ShowFullHistory", -1));
     chrome::ShowSingletonTabOverwritingNTP(browser_,
         chrome::GetSingletonTabNavigateParams(
             browser_, GURL(chrome::kChromeUIHistoryURL)));
     return;
   }
 
   // Log whether it was a history or chapter click.
   if (index < GetHistoryItemCount()) {
-    content::RecordComputedAction(
-        BuildActionName("HistoryClick", index));
+    base::RecordComputedAction(BuildActionName("HistoryClick", index));
   } else {
-    content::RecordComputedAction(
+    base::RecordComputedAction(
         BuildActionName("ChapterClick", index - GetHistoryItemCount() - 1));
   }
 
   int controller_index = MenuIndexToNavEntryIndex(index);
   WindowOpenDisposition disposition =
       ui::DispositionFromEventFlags(event_flags);
   if (!chrome::NavigateToIndexWithDisposition(browser_,
                                               controller_index,
                                               disposition)) {
     NOTREACHED();
   }
 }
 
 void BackForwardMenuModel::MenuWillShow() {
-  content::RecordComputedAction(BuildActionName("Popup", -1));
+  base::RecordComputedAction(BuildActionName("Popup", -1));
   requested_favicons_.clear();
   cancelable_task_tracker_.TryCancelAll();
 }
 
 bool BackForwardMenuModel::IsSeparator(int index) const {
   int history_items = GetHistoryItemCount();
   // If the index is past the number of history items + separator,
   // we then consider if it is a chapter-stop entry.
   if (index > history_items) {
     // We either are in ChapterStop area, or at the end of the list (the "Show
@@ skipping 252 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }