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

chrome/browser/ui/webui/options/language_options_handler.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.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.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 "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;
+
 LanguageOptionsHandler::LanguageOptionsHandler() {
 }
 
 LanguageOptionsHandler::~LanguageOptionsHandler() {
 }
 
 void LanguageOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   LanguageOptionsHandlerCommon::GetLocalizedValues(localized_strings);
 
@@ skipping 66 matching lines @@
   return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 }
 
 void LanguageOptionsHandler::SetApplicationLocale(
     const std::string& language_code) {
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetString(prefs::kApplicationLocale, language_code);
 }
 
 void LanguageOptionsHandler::RestartCallback(const ListValue* args) {
-  UserMetrics::RecordAction(UserMetricsAction("LanguageOptions_Restart"));
+  content::RecordAction(UserMetricsAction("LanguageOptions_Restart"));
   BrowserList::AttemptRestart();
 }