Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/search_engines/edit_search_engine_controller.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/search_engines/edit_search_engine_controller.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/url_formatter/url_fixer.h"
-#include "content/public/browser/user_metrics.h"
 #include "url/gurl.h"
 
 using base::UserMetricsAction;
 
 EditSearchEngineController::EditSearchEngineController(
     TemplateURL* template_url,
     EditSearchEngineControllerDelegate* edit_keyword_delegate,
     Profile* profile)
     : template_url_(template_url),
       edit_keyword_delegate_(edit_keyword_delegate),
@@ skipping 74 matching lines @@
     return;
   }
 
   if (!edit_keyword_delegate_) {
     // Confiming an entry we got from JS. We have a template_url_, but it
     // hasn't yet been added to the model.
     DCHECK(template_url_);
     template_url_service->AddWithOverrides(base::WrapUnique(template_url_),
                                            title_input, keyword_input,
                                            url_string);
-    content::RecordAction(UserMetricsAction("KeywordEditor_AddKeywordJS"));
+    base::RecordAction(UserMetricsAction("KeywordEditor_AddKeywordJS"));
   } else {
     // Adding or modifying an entry via the Delegate.
     edit_keyword_delegate_->OnEditedKeyword(template_url_, title_input,
                                             keyword_input, url_string);
   }
 }
 
 void EditSearchEngineController::CleanUpCancelledAdd() {
   if (!edit_keyword_delegate_ && template_url_) {
     // When we have no Delegate, we know that the template_url_ hasn't yet been
@@ skipping 21 matching lines @@
   std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("x")),
       TemplateURLServiceFactory::GetForProfile(profile_)->search_terms_data()));
   url::Parsed parts;
   std::string scheme(url_formatter::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid())
     url.insert(0, scheme + "://");
 
   return url;
 }