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

chrome/browser/chromeos/login/screen_locker.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/chromeos/login/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.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 "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 #if !defined(USE_AURA)
 #include "chrome/browser/chromeos/login/screen_locker_views.h"
 #endif
 
 using content::BrowserThread;
+using content::UserMetricsAction;
 
 namespace {
 
 // Observer to start ScreenLocker when the screen lock
 class ScreenLockObserver : public chromeos::ScreenLockLibrary::Observer,
                            public content::NotificationObserver {
  public:
   ScreenLockObserver() {
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
@@ skipping 143 matching lines @@
   if (UseWebUILockScreen())
     delegate_.reset(new WebUIScreenLocker(this));
   else
     delegate_.reset(new ScreenLockerViews(this));
 #endif
   delegate_->LockScreen(unlock_on_input_);
 }
 
 void ScreenLocker::OnLoginFailure(const LoginFailure& error) {
   DVLOG(1) << "OnLoginFailure";
-  UserMetrics::RecordAction(UserMetricsAction("ScreenLocker_OnLoginFailure"));
+  content::RecordAction(UserMetricsAction("ScreenLocker_OnLoginFailure"));
   if (authentication_start_time_.is_null()) {
     LOG(ERROR) << "authentication_start_time_ is not set";
   } else {
     base::TimeDelta delta = base::Time::Now() - authentication_start_time_;
     VLOG(1) << "Authentication failure time: " << delta.InSecondsF();
     UMA_HISTOGRAM_TIMES("ScreenLocker.AuthenticationFailureTime", delta);
   }
 
   EnableInput();
   // Don't enable signout button here as we're showing
@@ skipping 85 matching lines @@
 }
 
 void ScreenLocker::EnableInput() {
   delegate_->SetInputEnabled(true);
 }
 
 void ScreenLocker::Signout() {
   // TODO(flackr): For proper functionality, check if (error_info) is NULL
   // (crbug.com/105267).
   delegate_->ClearErrors();
-  UserMetrics::RecordAction(UserMetricsAction("ScreenLocker_Signout"));
+  content::RecordAction(UserMetricsAction("ScreenLocker_Signout"));
 #if defined(TOOLKIT_USES_GTK)
   WmIpc::instance()->NotifyAboutSignout();
 #endif
   DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
 
   // Don't hide yet the locker because the chrome screen may become visible
   // briefly.
 }
 
 void ScreenLocker::ShowErrorMessage(const string16& message,
                                     bool sign_out_only) {
   delegate_->SetInputEnabled(!sign_out_only);
   delegate_->SetSignoutEnabled(sign_out_only);
   delegate_->ShowErrorMessage(message, sign_out_only);
 }
 
 void ScreenLocker::SetLoginStatusConsumer(
     chromeos::LoginStatusConsumer* consumer) {
   login_status_consumer_ = consumer;
 }
 
 // static
 void ScreenLocker::Show() {
   DVLOG(1) << "In ScreenLocker::Show";
-  UserMetrics::RecordAction(UserMetricsAction("ScreenLocker_Show"));
+  content::RecordAction(UserMetricsAction("ScreenLocker_Show"));
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
 
   // Check whether the currently logged in user is a guest account and if so,
   // refuse to lock the screen (crosbug.com/23764).
   // TODO(flackr): We can allow lock screen for guest accounts when
   // unlock_on_input is supported by the WebUI screen locker.
   if (UserManager::Get()->logged_in_user().email().empty()) {
     DVLOG(1) << "Show: Refusing to lock screen for guest account.";
     return;
   }
@@ skipping 88 matching lines @@
 
   bool state = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
   CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
 }
 
 }  // namespace chromeos