Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/webui/options/language_options_handler_common.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/spellcheck/common/spellcheck_common.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_prefs.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::UserMetricsAction;
 
 namespace options {
 
 LanguageOptionsHandlerCommon::LanguageOptionsHandlerCommon() {
 }
 
@@ skipping 150 matching lines @@
   std::vector<std::string> spell_check_languages;
   spellcheck::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 base::ListValue* args) {
-  content::RecordAction(UserMetricsAction("LanguageOptions_Open"));
+  base::RecordAction(UserMetricsAction("LanguageOptions_Open"));
   SpellcheckService* service = GetSpellcheckService();
   if (!service)
     return;
 
   for (const auto& dictionary : service->GetHunspellDictionaries()) {
     dictionary->RemoveObserver(this);
     dictionary->AddObserver(this);
 
     if (dictionary->IsDownloadInProgress())
       OnHunspellDictionaryDownloadBegin(dictionary->GetLanguage());
     else if (dictionary->IsDownloadFailure())
       OnHunspellDictionaryDownloadFailure(dictionary->GetLanguage());
     else
       OnHunspellDictionaryDownloadSuccess(dictionary->GetLanguage());
   }
 }
 
 void LanguageOptionsHandlerCommon::UiLanguageChangeCallback(
     const base::ListValue* args) {
   const std::string language_code =
       base::UTF16ToASCII(ExtractStringValue(args));
   CHECK(!language_code.empty());
   const std::string action = base::StringPrintf(
       "LanguageOptions_UiLanguageChange_%s", language_code.c_str());
-  content::RecordComputedAction(action);
+  base::RecordComputedAction(action);
   SetApplicationLocale(language_code);
   base::Value language_value(language_code);
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.LanguageOptions.uiLanguageSaved", language_value);
 }
 
 void LanguageOptionsHandlerCommon::SpellCheckLanguageChangeCallback(
     const base::ListValue* args) {
   const std::string language_code =
       base::UTF16ToASCII(ExtractStringValue(args));
   const std::string action = base::StringPrintf(
       "LanguageOptions_SpellCheckLanguageChange_%s", language_code.c_str());
-  content::RecordComputedAction(action);
+  base::RecordComputedAction(action);
 
   SpellcheckService* service = GetSpellcheckService();
   if (!service)
     return;
 
   for (const auto& dictionary : service->GetHunspellDictionaries()) {
     dictionary->RemoveObserver(this);
     dictionary->AddObserver(this);
   }
 }
@@ skipping 33 matching lines @@
       return;
     }
   }
 }
 
 SpellcheckService* LanguageOptionsHandlerCommon::GetSpellcheckService() {
   return SpellcheckServiceFactory::GetForContext(Profile::FromWebUI(web_ui()));
 }
 
 }  // namespace options