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

chrome/browser/content_settings/cookie_settings.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/cookie_settings.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #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 {
 
 bool IsValidSetting(ContentSetting setting) {
   return (setting == CONTENT_SETTING_ALLOW ||
           setting == CONTENT_SETTING_SESSION_ONLY ||
           setting == CONTENT_SETTING_BLOCK);
 }
 
 bool IsAllowed(ContentSetting setting) {
@@ skipping 46 matching lines @@
   return new CookieSettingsWrapper(cookie_settings);
 }
 
 CookieSettings::CookieSettings(
     HostContentSettingsMap* host_content_settings_map,
     PrefService* prefs)
     : host_content_settings_map_(host_content_settings_map),
       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"));
   }
 
   pref_change_registrar_.Init(prefs);
   pref_change_registrar_.Add(prefs::kBlockThirdPartyCookies, this);
 }
 
 CookieSettings::~CookieSettings() {
 }
 
@@ skipping 136 matching lines @@
 void CookieSettings::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies,
                              false,
                              PrefService::SYNCABLE_PREF);
 }
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }