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

chrome/browser/ui/webui/options/browser_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/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.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 "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.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;
+
 BrowserOptionsHandler::BrowserOptionsHandler()
     : template_url_service_(NULL), startup_custom_pages_table_model_(NULL) {
 #if !defined(OS_MACOSX)
   default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
 #endif
 }
 
 BrowserOptionsHandler::~BrowserOptionsHandler() {
   if (default_browser_worker_.get())
     default_browser_worker_->ObserverDestroyed();
@@ skipping 127 matching lines @@
   default_browser_worker_->StartCheckIsDefault();
 #endif
 }
 
 void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {
   // If the default browser setting is managed then we should not be able to
   // call this function.
   if (default_browser_policy_.IsManaged())
     return;
 
-  UserMetrics::RecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"));
+  content::RecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"));
 #if defined(OS_MACOSX)
   if (ShellIntegration::SetAsDefaultBrowser())
     UpdateDefaultBrowserState();
 #else
   default_browser_worker_->StartSetAsDefault();
   // Callback takes care of updating UI.
 #endif
 
   // If the user attempted to make Chrome the default browser, then he/she
   // arguably wants to be notified when that changes.
@@ skipping 80 matching lines @@
     NOTREACHED();
     return;
   }
 
   std::vector<const TemplateURL*> model_urls =
       template_url_service_->GetTemplateURLs();
   if (selected_index >= 0 &&
       selected_index < static_cast<int>(model_urls.size()))
     template_url_service_->SetDefaultSearchProvider(model_urls[selected_index]);
 
-  UserMetrics::RecordAction(UserMetricsAction("Options_SearchEngineChanged"));
+  content::RecordAction(UserMetricsAction("Options_SearchEngineChanged"));
 }
 
 void BrowserOptionsHandler::UpdateSearchEngines() {
   template_url_service_ =
       TemplateURLServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_));
   if (template_url_service_) {
     template_url_service_->Load();
     template_url_service_->AddObserver(this);
     OnTemplateURLServiceChanged();
   }
@@ skipping 186 matching lines @@
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions.Append(entry);
   }
 
   web_ui_->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }