[cros] Move User class to user_manager component.

chrome/browser/chromeos/login/lock/screen_locker.cc

 // Copyright 2014 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/lock/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 111 matching lines @@
 ScreenLockObserver* g_screen_lock_observer = NULL;
 
 }  // namespace
 
 // static
 ScreenLocker* ScreenLocker::screen_locker_ = NULL;
 
 //////////////////////////////////////////////////////////////////////////////
 // ScreenLocker, public:
 
-ScreenLocker::ScreenLocker(const UserList& users)
+ScreenLocker::ScreenLocker(const user_manager::UserList& users)
     : users_(users),
       locked_(false),
       start_time_(base::Time::Now()),
       auth_status_consumer_(NULL),
       incorrect_passwords_count_(0),
       weak_factory_(this) {
   DCHECK(!screen_locker_);
   screen_locker_ = this;
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
@@ skipping 52 matching lines @@
   incorrect_passwords_count_ = 0;
   if (authentication_start_time_.is_null()) {
     if (!user_context.GetUserID().empty())
       LOG(ERROR) << "Start time is not set at authentication success";
   } else {
     base::TimeDelta delta = base::Time::Now() - authentication_start_time_;
     VLOG(1) << "Authentication success: " << delta.InSecondsF() << " second(s)";
     UMA_HISTOGRAM_TIMES("ScreenLocker.AuthenticationSuccessTime", delta);
   }
 
-  const User* user = UserManager::Get()->FindUser(user_context.GetUserID());
+  const user_manager::User* user =
+      UserManager::Get()->FindUser(user_context.GetUserID());
   if (user) {
     if (!user->is_active())
       UserManager::Get()->SwitchActiveUser(user_context.GetUserID());
   } else {
     NOTREACHED() << "Logged in user not found.";
   }
 
   authentication_capture_.reset(new AuthenticationParametersCapture());
   authentication_capture_->user_context = user_context;
 
@@ skipping 27 matching lines @@
 
 void ScreenLocker::Authenticate(const UserContext& user_context) {
   LOG_ASSERT(IsUserLoggedIn(user_context.GetUserID()))
       << "Invalid user trying to unlock.";
 
   authentication_start_time_ = base::Time::Now();
   delegate_->SetInputEnabled(false);
   delegate_->OnAuthenticate();
 
   // Special case: supervised users. Use special authenticator.
-  if (const User* user = FindUnlockUser(user_context.GetUserID())) {
+  if (const user_manager::User* user =
+          FindUnlockUser(user_context.GetUserID())) {
     if (user->GetType() == user_manager::USER_TYPE_SUPERVISED) {
       UserContext updated_context = UserManager::Get()
                                         ->GetSupervisedUserManager()
                                         ->GetAuthentication()
                                         ->TransformKey(user_context);
       // TODO(antrim) : replace empty closure with explicit method.
       // http://crbug.com/351268
       BrowserThread::PostTask(
           BrowserThread::UI,
           FROM_HERE,
           base::Bind(&ExtendedAuthenticator::AuthenticateToCheck,
                      extended_authenticator_.get(),
                      updated_context,
                      base::Closure()));
       return;
     }
   }
 
   // TODO(antrim) : migrate to new authenticator for all types of users.
   // http://crbug.com/351268
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&Authenticator::AuthenticateToUnlock,
                  authenticator_.get(),
                  user_context));
 }
 
-const User* ScreenLocker::FindUnlockUser(const std::string& user_id) {
-  const User* unlock_user = NULL;
-  for (UserList::const_iterator it = users_.begin(); it != users_.end(); ++it) {
+const user_manager::User* ScreenLocker::FindUnlockUser(
+    const std::string& user_id) {
+  const user_manager::User* unlock_user = NULL;
+  for (user_manager::UserList::const_iterator it = users_.begin();
+       it != users_.end();
+       ++it) {
     if ((*it)->email() == user_id) {
       unlock_user = *it;
       break;
     }
   }
   return unlock_user;
 }
 
 void ScreenLocker::ClearErrors() {
   delegate_->ClearErrors();
@@ skipping 183 matching lines @@
       content::Details<bool>(&state));
   VLOG(1) << "Calling session manager's HandleLockScreenShown D-Bus method";
   DBusThreadManager::Get()->GetSessionManagerClient()->NotifyLockScreenShown();
 }
 
 content::WebUI* ScreenLocker::GetAssociatedWebUI() {
   return delegate_->GetAssociatedWebUI();
 }
 
 bool ScreenLocker::IsUserLoggedIn(const std::string& username) {
-  for (UserList::const_iterator it = users_.begin(); it != users_.end(); ++it) {
+  for (user_manager::UserList::const_iterator it = users_.begin();
+       it != users_.end();
+       ++it) {
     if ((*it)->email() == username)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos