Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/browser_command_controller.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/browser_command_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/debug/debugging_flags.h"
 #include "base/debug/profiler.h"
 #include "base/feature_list.h"
 #include "base/macros.h"
+#include "base/metrics/user_metrics.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 16 matching lines @@
 #include "chrome/common/profiling.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "components/prefs/pref_service.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "content/public/browser/native_web_keyboard_event.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 "content/public/browser/web_contents_observer.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_system.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "printing/features/features.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ skipping 265 matching lines @@
       break;
 
      // Window management commands
     case IDC_NEW_WINDOW:
       NewWindow(browser_);
       break;
     case IDC_NEW_INCOGNITO_WINDOW:
       NewIncognitoWindow(browser_);
       break;
     case IDC_CLOSE_WINDOW:
-      content::RecordAction(base::UserMetricsAction("CloseWindowByKey"));
+      base::RecordAction(base::UserMetricsAction("CloseWindowByKey"));
       CloseWindow(browser_);
       break;
     case IDC_NEW_TAB:
       NewTab(browser_);
       break;
     case IDC_CLOSE_TAB:
-      content::RecordAction(base::UserMetricsAction("CloseTabByKey"));
+      base::RecordAction(base::UserMetricsAction("CloseTabByKey"));
       CloseTab(browser_);
       break;
     case IDC_SELECT_NEXT_TAB:
-      content::RecordAction(base::UserMetricsAction("Accel_SelectNextTab"));
+      base::RecordAction(base::UserMetricsAction("Accel_SelectNextTab"));
       SelectNextTab(browser_);
       break;
     case IDC_SELECT_PREVIOUS_TAB:
-      content::RecordAction(
-          base::UserMetricsAction("Accel_SelectPreviousTab"));
+      base::RecordAction(base::UserMetricsAction("Accel_SelectPreviousTab"));
       SelectPreviousTab(browser_);
       break;
     case IDC_MOVE_TAB_NEXT:
       MoveTabNext(browser_);
       break;
     case IDC_MOVE_TAB_PREVIOUS:
       MoveTabPrevious(browser_);
       break;
     case IDC_SELECT_TAB_0:
     case IDC_SELECT_TAB_1:
     case IDC_SELECT_TAB_2:
     case IDC_SELECT_TAB_3:
     case IDC_SELECT_TAB_4:
     case IDC_SELECT_TAB_5:
     case IDC_SELECT_TAB_6:
     case IDC_SELECT_TAB_7:
-      content::RecordAction(base::UserMetricsAction("Accel_SelectNumberedTab"));
+      base::RecordAction(base::UserMetricsAction("Accel_SelectNumberedTab"));
       SelectNumberedTab(browser_, id - IDC_SELECT_TAB_0);
       break;
     case IDC_SELECT_LAST_TAB:
-      content::RecordAction(base::UserMetricsAction("Accel_SelectNumberedTab"));
+      base::RecordAction(base::UserMetricsAction("Accel_SelectNumberedTab"));
       SelectLastTab(browser_);
       break;
     case IDC_DUPLICATE_TAB:
       DuplicateTab(browser_);
       break;
     case IDC_RESTORE_TAB:
       RestoreTab(browser_);
       break;
     case IDC_SHOW_AS_TAB:
       ConvertPopupToTabbedBrowser(browser_);
@@ skipping 42 matching lines @@
       break;
     case IDC_EMAIL_PAGE_LOCATION:
       EmailPageLocation(browser_);
       break;
     case IDC_PRINT:
       Print(browser_);
       break;
 
 #if BUILDFLAG(ENABLE_BASIC_PRINTING)
     case IDC_BASIC_PRINT:
-      content::RecordAction(base::UserMetricsAction("Accel_Advanced_Print"));
+      base::RecordAction(base::UserMetricsAction("Accel_Advanced_Print"));
       BasicPrint(browser_);
       break;
 #endif  // ENABLE_BASIC_PRINTING
 
     case IDC_SAVE_CREDIT_CARD_FOR_PAGE:
       SaveCreditCard(browser_);
       break;
     case IDC_TRANSLATE_PAGE:
       Translate(browser_);
       break;
@@ skipping 25 matching lines @@
       break;
     case IDC_ZOOM_NORMAL:
       Zoom(browser_, content::PAGE_ZOOM_RESET);
       break;
     case IDC_ZOOM_MINUS:
       Zoom(browser_, content::PAGE_ZOOM_OUT);
       break;
 
     // Focus various bits of UI
     case IDC_FOCUS_TOOLBAR:
-      content::RecordAction(base::UserMetricsAction("Accel_Focus_Toolbar"));
+      base::RecordAction(base::UserMetricsAction("Accel_Focus_Toolbar"));
       FocusToolbar(browser_);
       break;
     case IDC_FOCUS_LOCATION:
-      content::RecordAction(base::UserMetricsAction("Accel_Focus_Location"));
+      base::RecordAction(base::UserMetricsAction("Accel_Focus_Location"));
       FocusLocationBar(browser_);
       break;
     case IDC_FOCUS_SEARCH:
-      content::RecordAction(base::UserMetricsAction("Accel_Focus_Search"));
+      base::RecordAction(base::UserMetricsAction("Accel_Focus_Search"));
       FocusSearch(browser_);
       break;
     case IDC_FOCUS_MENU_BAR:
       FocusAppMenu(browser_);
       break;
     case IDC_FOCUS_BOOKMARKS:
-      content::RecordAction(
-          base::UserMetricsAction("Accel_Focus_Bookmarks"));
+      base::RecordAction(base::UserMetricsAction("Accel_Focus_Bookmarks"));
       FocusBookmarksToolbar(browser_);
       break;
     case IDC_FOCUS_INFOBARS:
       FocusInfobars(browser_);
       break;
     case IDC_FOCUS_NEXT_PANE:
       FocusNextPane(browser_);
       break;
     case IDC_FOCUS_PREVIOUS_PANE:
       FocusPreviousPane(browser_);
@@ skipping 41 matching lines @@
       ToggleBookmarkBar(browser_);
       break;
     case IDC_PROFILING_ENABLED:
       Profiling::Toggle();
       break;
 
     case IDC_SHOW_BOOKMARK_MANAGER:
       ShowBookmarkManager(browser_);
       break;
     case IDC_SHOW_APP_MENU:
-      content::RecordAction(base::UserMetricsAction("Accel_Show_App_Menu"));
+      base::RecordAction(base::UserMetricsAction("Accel_Show_App_Menu"));
       ShowAppMenu(browser_);
       break;
     case IDC_SHOW_AVATAR_MENU:
       ShowAvatarMenu(browser_);
       break;
     case IDC_SHOW_HISTORY:
       ShowHistory(browser_);
       break;
     case IDC_SHOW_DOWNLOADS:
       ShowDownloads(browser_);
@@ skipping 571 matching lines @@
 
 BrowserWindow* BrowserCommandController::window() {
   return browser_->window();
 }
 
 Profile* BrowserCommandController::profile() {
   return browser_->profile();
 }
 
 }  // namespace chrome