Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/webui/options/search_engine_manager_handler.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/search_engine_manager_handler.h"
 
 #include "base/bind.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 enum EngineInfoIndexes {
   ENGINE_NAME,
   ENGINE_KEYWORD,
@@ skipping 188 matching lines @@
   int index;
   if (!ExtractIntegerValue(args, &index)) {
     NOTREACHED();
     return;
   }
   if (index < 0 || index >= list_controller_->table_model()->RowCount())
     return;
 
   list_controller_->MakeDefaultTemplateURL(index);
 
-  content::RecordAction(
-      base::UserMetricsAction("Options_SearchEngineSetDefault"));
+  base::RecordAction(base::UserMetricsAction("Options_SearchEngineSetDefault"));
 }
 
 void SearchEngineManagerHandler::RemoveSearchEngine(
     const base::ListValue* args) {
   int index;
   if (!ExtractIntegerValue(args, &index)) {
     NOTREACHED();
     return;
   }
   if (index < 0 || index >= list_controller_->table_model()->RowCount())
     return;
 
   if (list_controller_->CanRemove(list_controller_->GetTemplateURL(index))) {
     list_controller_->RemoveTemplateURL(index);
-    content::RecordAction(
-        base::UserMetricsAction("Options_SearchEngineRemoved"));
+    base::RecordAction(base::UserMetricsAction("Options_SearchEngineRemoved"));
   }
 }
 
 void SearchEngineManagerHandler::EditSearchEngine(const base::ListValue* args) {
   int index;
   if (!ExtractIntegerValue(args, &index)) {
     NOTREACHED();
     return;
   }
 
@@ skipping 66 matching lines @@
 
   // Recheck validity.  It's possible to get here with invalid input if e.g. the
   // user calls the right JS functions directly from the web inspector.
   if (edit_controller_->IsTitleValid(name) &&
       edit_controller_->IsKeywordValid(keyword) &&
       edit_controller_->IsURLValid(url))
     edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
 
 }  // namespace options