Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 14d63e797638d6dd962a8b62a478b0bf20bbc8fc..9224b144964cd29819a611289ffc5772aad4cb0f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -80,8 +80,8 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -140,6 +140,7 @@
 #endif
 
 using base::TimeDelta;
+using content::UserMetricsAction;
 using views::ColumnSet;
 using views::GridLayout;
 
@@ -2510,7 +2511,7 @@ void BrowserView::UpdateAcceleratorMetrics(
     const ui::Accelerator& accelerator, int command_id) {
   const ui::KeyboardCode key_code = accelerator.key_code();
   if (command_id == IDC_HELP_PAGE && key_code == ui::VKEY_F1)
-    UserMetrics::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
+    content::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
 
 #if defined(OS_CHROMEOS)
   // Collect information about the relative popularity of various accelerators
@@ -2518,50 +2519,50 @@ void BrowserView::UpdateAcceleratorMetrics(
   switch (command_id) {
     case IDC_BACK:
       if (key_code == ui::VKEY_BACK)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Back_Backspace"));
+        content::RecordAction(UserMetricsAction("Accel_Back_Backspace"));
       else if (key_code == ui::VKEY_F1)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Back_F1"));
+        content::RecordAction(UserMetricsAction("Accel_Back_F1"));
       else if (key_code == ui::VKEY_LEFT)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Back_Left"));
+        content::RecordAction(UserMetricsAction("Accel_Back_Left"));
       break;
     case IDC_FORWARD:
       if (key_code == ui::VKEY_BACK)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_Backspace"));
+        content::RecordAction(UserMetricsAction("Accel_Forward_Backspace"));
       else if (key_code == ui::VKEY_F2)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_F2"));
+        content::RecordAction(UserMetricsAction("Accel_Forward_F2"));
       else if (key_code == ui::VKEY_RIGHT)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Forward_Right"));
+        content::RecordAction(UserMetricsAction("Accel_Forward_Right"));
       break;
     case IDC_RELOAD:
     case IDC_RELOAD_IGNORING_CACHE:
       if (key_code == ui::VKEY_R)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Reload_R"));
+        content::RecordAction(UserMetricsAction("Accel_Reload_R"));
       else if (key_code == ui::VKEY_F3)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Reload_F3"));
+        content::RecordAction(UserMetricsAction("Accel_Reload_F3"));
       break;
     case IDC_FULLSCREEN:
       if (key_code == ui::VKEY_F4)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
+        content::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
       break;
     case IDC_NEW_TAB:
       if (key_code == ui::VKEY_T)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_NewTab_T"));
+        content::RecordAction(UserMetricsAction("Accel_NewTab_T"));
       break;
     case IDC_SEARCH:
       if (key_code == ui::VKEY_LWIN)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_Search_LWin"));
+        content::RecordAction(UserMetricsAction("Accel_Search_LWin"));
       break;
     case IDC_FOCUS_LOCATION:
       if (key_code == ui::VKEY_D)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));
+        content::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));
       else if (key_code == ui::VKEY_L)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusLocation_L"));
+        content::RecordAction(UserMetricsAction("Accel_FocusLocation_L"));
       break;
     case IDC_FOCUS_SEARCH:
       if (key_code == ui::VKEY_E)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusSearch_E"));
+        content::RecordAction(UserMetricsAction("Accel_FocusSearch_E"));
       else if (key_code == ui::VKEY_K)
-        UserMetrics::RecordAction(UserMetricsAction("Accel_FocusSearch_K"));
+        content::RecordAction(UserMetricsAction("Accel_FocusSearch_K"));
       break;
     default:
       // Do nothing.