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

chrome/browser/ui/webui/options/core_options_handler.cc

Index: chrome/browser/ui/webui/options/core_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index dcdcc04293cab8867deb21d8a21bd36a8904a88e..c3ff60712955db540ef2d967009b76f7f8cae130 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -19,9 +19,9 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -29,6 +29,8 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::UserMetricsAction;
+
 CoreOptionsHandler::CoreOptionsHandler()
     : handlers_host_(NULL) {
 }
@@ -218,7 +220,7 @@ void CoreOptionsHandler::ClearPref(const std::string& pref_name,
   pref_service->ScheduleSavePersistentPrefs();
 
   if (!metric.empty())
-    UserMetrics::RecordComputedAction(metric);
+    content::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::ProcessUserMetric(const base::Value* value,
@@ -233,7 +235,7 @@ void CoreOptionsHandler::ProcessUserMetric(const base::Value* value,
     metric_string += bool_value ? "_Enable" : "_Disable";
   }
 
-  UserMetrics::RecordComputedAction(metric_string);
+  content::RecordComputedAction(metric_string);
 }
 
 void CoreOptionsHandler::NotifyPrefChanged(
@@ -452,7 +454,7 @@ void CoreOptionsHandler::HandleClearPref(const ListValue* args) {
 void CoreOptionsHandler::HandleUserMetricsAction(const ListValue* args) {
   std::string metric = UTF16ToUTF8(ExtractStringValue(args));
   if (!metric.empty())
-    UserMetrics::RecordComputedAction(metric);
+    content::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::UpdateClearPluginLSOData() {