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

chrome/browser/ui/webui/options/language_options_handler_common.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/ui/webui/options/language_options_handler_common.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_common.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using content::UserMetricsAction;
+
 LanguageOptionsHandlerCommon::LanguageOptionsHandlerCommon() {
 }
 
 LanguageOptionsHandlerCommon::~LanguageOptionsHandlerCommon() {
 }
 
 void LanguageOptionsHandlerCommon::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   string16 product_name = GetProductName();
@@ skipping 96 matching lines @@
   std::vector<std::string> spell_check_languages;
   SpellCheckCommon::SpellCheckLanguages(&spell_check_languages);
   for (size_t i = 0; i < spell_check_languages.size(); ++i) {
     dictionary->SetBoolean(spell_check_languages[i], true);
   }
   return dictionary;
 }
 
 void LanguageOptionsHandlerCommon::LanguageOptionsOpenCallback(
     const ListValue* args) {
-  UserMetrics::RecordAction(UserMetricsAction("LanguageOptions_Open"));
+  content::RecordAction(UserMetricsAction("LanguageOptions_Open"));
 }
 
 void LanguageOptionsHandlerCommon::UiLanguageChangeCallback(
     const ListValue* args) {
   const std::string language_code = UTF16ToASCII(ExtractStringValue(args));
   CHECK(!language_code.empty());
   const std::string action = base::StringPrintf(
       "LanguageOptions_UiLanguageChange_%s", language_code.c_str());
-  UserMetrics::RecordComputedAction(action);
+  content::RecordComputedAction(action);
   SetApplicationLocale(language_code);
     web_ui_->CallJavascriptFunction("options.LanguageOptions.uiLanguageSaved");
 }
 
 void LanguageOptionsHandlerCommon::SpellCheckLanguageChangeCallback(
     const ListValue* args) {
   const std::string language_code = UTF16ToASCII(ExtractStringValue(args));
   CHECK(!language_code.empty());
   const std::string action = base::StringPrintf(
       "LanguageOptions_SpellCheckLanguageChange_%s", language_code.c_str());
-  UserMetrics::RecordComputedAction(action);
+  content::RecordComputedAction(action);
 }