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

chrome/browser/content_settings/cookie_settings.cc

Index: chrome/browser/content_settings/cookie_settings.cc
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc
index 8ff471a450083d94a1d50631bdf3a8beaee2aad1..5d929ceea67b1e74d2a586aca9c67ad634b47c25 100644
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -16,15 +16,16 @@
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 
 using content::BrowserThread;
+using content::UserMetricsAction;
 
 namespace {
 
@@ -91,10 +92,10 @@ CookieSettings::CookieSettings(
       block_third_party_cookies_(
           prefs->GetBoolean(prefs::kBlockThirdPartyCookies)) {
   if (block_third_party_cookies_) {
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("ThirdPartyCookieBlockingEnabled"));
   } else {
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
   }