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

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.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_service.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #endif
 
 using content::BrowserThread;
+using content::UserMetricsAction;
 
 namespace {
 
 // Profiles that should be deleted on shutdown.
 std::vector<FilePath>& ProfilesToDelete() {
   CR_DEFINE_STATIC_LOCAL(std::vector<FilePath>, profiles_to_delete, ());
   return profiles_to_delete;
 }
 
 // Checks if any user prefs for |profile| have default values.
@@ skipping 341 matching lines @@
 // static
 void ProfileManager::NewWindowWithProfile(
     Profile* profile,
     BrowserInit::IsProcessStartup process_startup,
     BrowserInit::IsFirstRun is_first_run) {
   DCHECK(profile);
   Browser* browser = BrowserList::FindTabbedBrowser(profile, false);
   if (browser) {
     browser->window()->Activate();
   } else {
-    UserMetrics::RecordAction(UserMetricsAction("NewWindow"));
+    content::RecordAction(UserMetricsAction("NewWindow"));
     CommandLine command_line(CommandLine::NO_PROGRAM);
     int return_code;
     BrowserInit browser_init;
     browser_init.LaunchBrowser(command_line, profile, FilePath(),
                                process_startup, is_first_run, &return_code);
   }
 }
 
 void ProfileManager::Observe(
     int type,
@@ skipping 331 matching lines @@
   profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
 }
 #endif
 
 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks,
                                   Profile* profile,
                                   Profile::CreateStatus status) {
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run(profile, status);
 }