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

chrome/browser/first_run/first_run.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/first_run/first_run.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN)
 // TODO(port): move more code in back from the first_run_win.cc module.
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #endif
 
+using content::UserMetricsAction;
+
 namespace {
 
 // The kSentinelFile file absence will tell us it is a first run.
 const char kSentinelFile[] = "First Run";
 
 FilePath GetDefaultPrefFilePath(bool create_profile_dir,
                                 const FilePath& user_data_dir) {
   FilePath default_pref_dir =
       ProfileManager::GetDefaultProfileDir(user_data_dir);
   if (create_profile_dir) {
@@ skipping 558 matching lines @@
     SetImportItem(user_prefs,
                   prefs::kImportBookmarks,
                   import_items,
                   dont_import_items,
                   importer::FAVORITES,
                   items);
 
     ImportSettings(profile, importer_host, importer_list, items);
   }
 
-  UserMetrics::RecordAction(UserMetricsAction("FirstRunDef_Accept"));
+  content::RecordAction(UserMetricsAction("FirstRunDef_Accept"));
 
   // Launch the search engine dialog only for certain builds, and only if the
   // user has not already set preferences.
   if (IsOrganicFirstRun() && !local_state_file_exists) {
     // The home page string may be set in the preferences, but the user should
     // initially use Chrome with the NTP as home page in organic builds.
     profile->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
     first_run::ShowFirstRunDialog(profile, randomize_search_engine_experiment);
   }
 
@@ skipping 96 matching lines @@
   if (!observer->ended()) {
     observer->set_should_quit_message_loop();
     MessageLoop::current()->Run();
   }
 
   // Unfortunately there's no success/fail signal in ImporterHost.
   return true;
 }
 
 #endif  // OS_POSIX