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

content/browser/user_metrics_impl.cc

Index: content/browser/user_metrics_impl.cc
diff --git a/content/browser/user_metrics.cc b/content/browser/user_metrics_impl.cc
similarity index 66%
rename from content/browser/user_metrics.cc
rename to content/browser/user_metrics_impl.cc
index b3596543154ca076b686a1093775c84493cf709d..11266aa6f1aaaae9e4a300b45a5241f960892996 100644
--- a/content/browser/user_metrics.cc
+++ b/content/browser/user_metrics_impl.cc
@@ -2,27 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 
 #include "base/bind.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/user_metrics.h"
+
+namespace {
 
 using content::BrowserThread;
 
-void UserMetrics::RecordAction(const UserMetricsAction& action) {
-  Record(action.str_);
-}
+// Forward declare because of circular dependency.
+void CallRecordOnUI(const std::string& action);
 
-void UserMetrics::RecordComputedAction(const std::string& action) {
-  Record(action.c_str());
-}
-
-void UserMetrics::Record(const char *action) {
+void Record(const char *action) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                            base::Bind(&UserMetrics::CallRecordOnUI, action));
+    BrowserThread::PostTask(
+        BrowserThread::UI,
+        FROM_HERE,
+        base::Bind(&CallRecordOnUI, action));
     return;
   }
 
@@ -32,6 +32,16 @@ void UserMetrics::Record(const char *action) {
       content::Details<const char*>(&action));
 }
 
-void UserMetrics::CallRecordOnUI(const std::string& action) {
+void CallRecordOnUI(const std::string& action) {
+  Record(action.c_str());
+}
+
+}  // namespace
+
+void UserMetrics::RecordAction(const UserMetricsAction& action) {
+  Record(action.str_);
+}
+
+void UserMetrics::RecordComputedAction(const std::string& action) {
   Record(action.c_str());
 }