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

chrome/browser/ui/search_engines/edit_search_engine_controller.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/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 
+using content::UserMetricsAction;
+
 EditSearchEngineController::EditSearchEngineController(
     const TemplateURL* template_url,
     EditSearchEngineControllerDelegate* edit_keyword_delegate,
     Profile* profile)
     : template_url_(template_url),
       edit_keyword_delegate_(edit_keyword_delegate),
       profile_(profile) {
   DCHECK(profile_);
 }
 
@@ skipping 70 matching lines @@
     DCHECK(template_url_);
     // const_cast is ugly, but this is the same thing the TemplateURLService
     // does in a similar situation (updating an existing TemplateURL with
     // data from a new one).
     TemplateURL* modifiable_url = const_cast<TemplateURL*>(template_url_);
     modifiable_url->set_short_name(title_input);
     modifiable_url->set_keyword(keyword_input);
     modifiable_url->SetURL(url_string, 0, 0);
     // TemplateURLService takes ownership of template_url_.
     template_url_service->Add(modifiable_url);
-    UserMetrics::RecordAction(UserMetricsAction("KeywordEditor_AddKeywordJS"));
+    content::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() {
@@ skipping 24 matching lines @@
   std::string scheme(
       URLFixerUpper::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid()) {
     scheme.append("://");
     url.insert(0, scheme);
   }
 
   return url;
 }