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

chrome/browser/ui/webui/conflicts_ui.cc

Index: chrome/browser/ui/webui/conflicts_ui.cc
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc
index 979ae3ba90481a531d9568bca0bc95478ecf4e82..142bbcf07337d6d1ca027121925008d9a85e761e 100644
--- a/chrome/browser/ui/webui/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts_ui.cc
@@ -20,10 +20,10 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -32,6 +32,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::UserMetricsAction;
+
 namespace {
 
 ChromeWebUIDataSource* CreateConflictsUIHTMLSource() {
@@ -155,7 +157,7 @@ void ConflictsDOMHandler::Observe(int type,
 ///////////////////////////////////////////////////////////////////////////////
 
 ConflictsUI::ConflictsUI(TabContents* contents) : ChromeWebUI(contents) {
-  UserMetrics::RecordAction(UserMetricsAction("ViewAboutConflicts"));
+  content::RecordAction(UserMetricsAction("ViewAboutConflicts"));
   AddMessageHandler((new ConflictsDOMHandler())->Attach(this));
 
   // Set up the about:conflicts source.