[cros] user_manager component - move UserManagerBase and UserManager

components/user_manager/user_manager_base.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/users/user_manager_base.h"
+#include "components/user_manager/user_manager_base.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/login/users/remove_user_delegate.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/login/user_names.h"
 #include "components/session_manager/core/session_manager.h"
+#include "components/user_manager/remove_user_delegate.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
-namespace chromeos {
+namespace user_manager {
 namespace {
 
 // A vector pref of the the regular users known on this device, arranged in LRU
 // order.
 const char kRegularUsers[] = "LoggedInUsers";
 
 // A dictionary that maps user IDs to the displayed name.
 const char kUserDisplayName[] = "UserDisplayName";
 
 // A dictionary that maps user IDs to the user's given name.
@@ skipping 60 matching lines @@
     : active_user_(NULL),
       primary_user_(NULL),
       user_loading_stage_(STAGE_NOT_LOADED),
       session_started_(false),
       is_current_user_owner_(false),
       is_current_user_new_(false),
       is_current_user_ephemeral_regular_user_(false),
       ephemeral_users_enabled_(false),
       manager_creation_time_(base::TimeTicks::Now()),
       weak_factory_(this) {
-  // UserManager instance should be used only on UI thread.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

[Dmitry Polukhin, 2014/08/12 09:03:13]

Why did you remove it?

[Nikita (slow), 2014/08/12 09:34:42]

unit_tests now use this class through

FakeUserManager|MockUserManager > ChromeUserManager > UserManagerBase >
UserManager

instead of previous

FakeUserManager|MockUserManager > UserManager.

unit_tests don't have browser threads creating so this check fails. We do have
these checks in ChromeUserManager methods though.

   UpdateLoginState();
 }
 
 UserManagerBase::~UserManagerBase() {
   // Can't use STLDeleteElements because of the private destructor of User.
-  for (user_manager::UserList::iterator it = users_.begin(); it != users_.end();
+  for (UserList::iterator it = users_.begin(); it != users_.end();
        it = users_.erase(it)) {
     DeleteUser(*it);
   }
   // These are pointers to the same User instances that were in users_ list.
   logged_in_users_.clear();
   lru_logged_in_users_.clear();
 
   DeleteUser(active_user_);
 }
 
 void UserManagerBase::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
-const user_manager::UserList& UserManagerBase::GetUsers() const {
+const UserList& UserManagerBase::GetUsers() const {
   const_cast<UserManagerBase*>(this)->EnsureUsersLoaded();
   return users_;
 }
 
-const user_manager::UserList& UserManagerBase::GetLoggedInUsers() const {
+const UserList& UserManagerBase::GetLoggedInUsers() const {
   return logged_in_users_;
 }
 
-const user_manager::UserList& UserManagerBase::GetLRULoggedInUsers() const {
+const UserList& UserManagerBase::GetLRULoggedInUsers() const {
   return lru_logged_in_users_;
 }
 
 const std::string& UserManagerBase::GetOwnerEmail() const {
   return owner_email_;
 }
 
 void UserManagerBase::UserLoggedIn(const std::string& user_id,
                                    const std::string& username_hash,
                                    bool browser_restart) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  user_manager::User* user = FindUserInListAndModify(user_id);
+  User* user = FindUserInListAndModify(user_id);
   if (active_user_ && user) {
     user->set_is_logged_in(true);
     user->set_username_hash(username_hash);
     logged_in_users_.push_back(user);
     lru_logged_in_users_.push_back(user);
 
     // Reset the new user flag if the user already exists.
     SetIsCurrentUserNew(false);
     NotifyUserAddedToSession(user, true /* user switch pending */);
 
     return;
   }
 
   if (user_id == chromeos::login::kGuestUserName) {
     GuestUserLoggedIn();
   } else if (user_id == chromeos::login::kRetailModeUserName) {
     RetailModeUserLoggedIn();
   } else if (IsKioskApp(user_id)) {
     KioskAppLoggedIn(user_id);
   } else if (IsDemoApp(user_id)) {
     DemoAccountLoggedIn();
   } else {
     EnsureUsersLoaded();
 
-    if (user && user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT) {
+    if (user && user->GetType() == USER_TYPE_PUBLIC_ACCOUNT) {
       PublicAccountUserLoggedIn(user);
-    } else if ((user &&
-                user->GetType() == user_manager::USER_TYPE_SUPERVISED) ||
+    } else if ((user && user->GetType() == USER_TYPE_SUPERVISED) ||
                (!user &&
                 gaia::ExtractDomainName(user_id) ==
                     chromeos::login::kSupervisedUserDomain)) {
       SupervisedUserLoggedIn(user_id);
     } else if (browser_restart && IsPublicAccountMarkedForRemoval(user_id)) {
-      PublicAccountUserLoggedIn(
-          user_manager::User::CreatePublicAccountUser(user_id));
+      PublicAccountUserLoggedIn(User::CreatePublicAccountUser(user_id));
     } else if (user_id != GetOwnerEmail() && !user &&
                (AreEphemeralUsersEnabled() || browser_restart)) {
       RegularUserLoggedInAsEphemeral(user_id);
     } else {
       RegularUserLoggedIn(user_id);
     }
   }
 
   DCHECK(active_user_);
   active_user_->set_is_logged_in(true);
   active_user_->set_is_active(true);
   active_user_->set_username_hash(username_hash);
 
   // Place user who just signed in to the top of the logged in users.
   logged_in_users_.insert(logged_in_users_.begin(), active_user_);
   SetLRUUser(active_user_);
 
   if (!primary_user_) {
     primary_user_ = active_user_;
-    if (primary_user_->GetType() == user_manager::USER_TYPE_REGULAR)
+    if (primary_user_->GetType() == USER_TYPE_REGULAR)
       SendRegularUserLoginMetrics(user_id);
   }
 
-  UMA_HISTOGRAM_ENUMERATION("UserManager.LoginUserType",
-                            active_user_->GetType(),
-                            user_manager::NUM_USER_TYPES);
+  UMA_HISTOGRAM_ENUMERATION(
+      "UserManager.LoginUserType", active_user_->GetType(), NUM_USER_TYPES);
 
   GetLocalState()->SetString(
       kLastLoggedInRegularUser,
-      (active_user_->GetType() == user_manager::USER_TYPE_REGULAR) ? user_id
-                                                                   : "");
+      (active_user_->GetType() == USER_TYPE_REGULAR) ? user_id : "");
 
   NotifyOnLogin();
   PerformPostUserLoggedInActions(browser_restart);
 }
 
 void UserManagerBase::SwitchActiveUser(const std::string& user_id) {
-  user_manager::User* user = FindUserAndModify(user_id);
+  User* user = FindUserAndModify(user_id);
   if (!user) {
     NOTREACHED() << "Switching to a non-existing user";
     return;
   }
   if (user == active_user_) {
     NOTREACHED() << "Switching to a user who is already active";
     return;
   }
   if (!user->is_logged_in()) {
     NOTREACHED() << "Switching to a user that is not logged in";
     return;
   }
-  if (user->GetType() != user_manager::USER_TYPE_REGULAR) {
+  if (user->GetType() != USER_TYPE_REGULAR) {
     NOTREACHED() << "Switching to a non-regular user";
     return;
   }
   if (user->username_hash().empty()) {
     NOTREACHED() << "Switching to a user that doesn't have username_hash set";
     return;
   }
 
   DCHECK(active_user_);
   active_user_->set_is_active(false);
@@ skipping 66 matching lines @@
   }
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
 }
 
 bool UserManagerBase::IsKnownUser(const std::string& user_id) const {
   return FindUser(user_id) != NULL;
 }
 
-const user_manager::User* UserManagerBase::FindUser(
-    const std::string& user_id) const {
+const User* UserManagerBase::FindUser(const std::string& user_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (active_user_ && active_user_->email() == user_id)
     return active_user_;
   return FindUserInList(user_id);
 }
 
-user_manager::User* UserManagerBase::FindUserAndModify(
-    const std::string& user_id) {
+User* UserManagerBase::FindUserAndModify(const std::string& user_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (active_user_ && active_user_->email() == user_id)
     return active_user_;
   return FindUserInListAndModify(user_id);
 }
 
-const user_manager::User* UserManagerBase::GetLoggedInUser() const {
+const User* UserManagerBase::GetLoggedInUser() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return active_user_;
 }
 
-user_manager::User* UserManagerBase::GetLoggedInUser() {
+User* UserManagerBase::GetLoggedInUser() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return active_user_;
 }
 
-const user_manager::User* UserManagerBase::GetActiveUser() const {
+const User* UserManagerBase::GetActiveUser() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return active_user_;
 }
 
-user_manager::User* UserManagerBase::GetActiveUser() {
+User* UserManagerBase::GetActiveUser() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return active_user_;
 }
 
-const user_manager::User* UserManagerBase::GetPrimaryUser() const {
+const User* UserManagerBase::GetPrimaryUser() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return primary_user_;
 }
 
 void UserManagerBase::SaveUserOAuthStatus(
     const std::string& user_id,
-    user_manager::User::OAuthTokenStatus oauth_token_status) {
+    User::OAuthTokenStatus oauth_token_status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DVLOG(1) << "Saving user OAuth token status in Local State";
-  user_manager::User* user = FindUserAndModify(user_id);
+  User* user = FindUserAndModify(user_id);
   if (user)
     user->set_oauth_token_status(oauth_token_status);
 
   // Do not update local state if data stored or cached outside the user's
   // cryptohome is to be treated as ephemeral.
   if (IsUserNonCryptohomeDataEphemeral(user_id))
     return;
 
   DictionaryPrefUpdate oauth_status_update(GetLocalState(),
                                            kUserOAuthTokenStatus);
@@ skipping 14 matching lines @@
   DictionaryPrefUpdate force_online_update(GetLocalState(),
                                            kUserForceOnlineSignin);
   force_online_update->SetBooleanWithoutPathExpansion(user_id,
                                                       force_online_signin);
 }
 
 void UserManagerBase::SaveUserDisplayName(const std::string& user_id,
                                           const base::string16& display_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (user_manager::User* user = FindUserAndModify(user_id)) {
+  if (User* user = FindUserAndModify(user_id)) {
     user->set_display_name(display_name);
 
     // Do not update local state if data stored or cached outside the user's
     // cryptohome is to be treated as ephemeral.
     if (!IsUserNonCryptohomeDataEphemeral(user_id)) {
       DictionaryPrefUpdate display_name_update(GetLocalState(),
                                                kUserDisplayName);
       display_name_update->SetWithoutPathExpansion(
           user_id, new base::StringValue(display_name));
     }
   }
 }
 
 base::string16 UserManagerBase::GetUserDisplayName(
     const std::string& user_id) const {
-  const user_manager::User* user = FindUser(user_id);
+  const User* user = FindUser(user_id);
   return user ? user->display_name() : base::string16();
 }
 
 void UserManagerBase::SaveUserDisplayEmail(const std::string& user_id,
                                            const std::string& display_email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  user_manager::User* user = FindUserAndModify(user_id);
+  User* user = FindUserAndModify(user_id);
   if (!user)
     return;  // Ignore if there is no such user.
 
   user->set_display_email(display_email);
 
   // Do not update local state if data stored or cached outside the user's
   // cryptohome is to be treated as ephemeral.
   if (IsUserNonCryptohomeDataEphemeral(user_id))
     return;
 
   DictionaryPrefUpdate display_email_update(GetLocalState(), kUserDisplayEmail);
   display_email_update->SetWithoutPathExpansion(
       user_id, new base::StringValue(display_email));
 }
 
 std::string UserManagerBase::GetUserDisplayEmail(
     const std::string& user_id) const {
-  const user_manager::User* user = FindUser(user_id);
+  const User* user = FindUser(user_id);
   return user ? user->display_email() : user_id;
 }
 
 void UserManagerBase::UpdateUserAccountData(
     const std::string& user_id,
     const UserAccountData& account_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   SaveUserDisplayName(user_id, account_data.display_name());
 
-  if (user_manager::User* user = FindUserAndModify(user_id)) {
+  if (User* user = FindUserAndModify(user_id)) {
     base::string16 given_name = account_data.given_name();
     user->set_given_name(given_name);
     if (!IsUserNonCryptohomeDataEphemeral(user_id)) {
       DictionaryPrefUpdate given_name_update(GetLocalState(), kUserGivenName);
       given_name_update->SetWithoutPathExpansion(
           user_id, new base::StringValue(given_name));
     }
   }
 
   UpdateUserAccountLocale(user_id, account_data.locale());
@@ skipping 52 matching lines @@
   return IsUserLoggedIn() && active_user_->can_lock();
 }
 
 bool UserManagerBase::IsUserLoggedIn() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return active_user_;
 }
 
 bool UserManagerBase::IsLoggedInAsRegularUser() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return IsUserLoggedIn() &&
-         active_user_->GetType() == user_manager::USER_TYPE_REGULAR;
+  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_REGULAR;
 }
 
 bool UserManagerBase::IsLoggedInAsDemoUser() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return IsUserLoggedIn() &&
-         active_user_->GetType() == user_manager::USER_TYPE_RETAIL_MODE;
+  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_RETAIL_MODE;
 }
 
 bool UserManagerBase::IsLoggedInAsPublicAccount() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return IsUserLoggedIn() &&
-         active_user_->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
+         active_user_->GetType() == USER_TYPE_PUBLIC_ACCOUNT;
 }
 
 bool UserManagerBase::IsLoggedInAsGuest() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return IsUserLoggedIn() &&
-         active_user_->GetType() == user_manager::USER_TYPE_GUEST;
+  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_GUEST;
 }
 
 bool UserManagerBase::IsLoggedInAsSupervisedUser() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return IsUserLoggedIn() &&
-         active_user_->GetType() == user_manager::USER_TYPE_SUPERVISED;
+  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_SUPERVISED;
 }
 
 bool UserManagerBase::IsLoggedInAsKioskApp() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return IsUserLoggedIn() &&
-         active_user_->GetType() == user_manager::USER_TYPE_KIOSK_APP;
+  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_KIOSK_APP;
 }
 
 bool UserManagerBase::IsLoggedInAsStub() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  return IsUserLoggedIn() && active_user_->email() == login::kStubUser;
+  return IsUserLoggedIn() &&
+         active_user_->email() == chromeos::login::kStubUser;
 }
 
 bool UserManagerBase::IsSessionStarted() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return session_started_;
 }
 
 bool UserManagerBase::IsUserNonCryptohomeDataEphemeral(
     const std::string& user_id) const {
   // Data belonging to the guest, retail mode and stub users is always
   // ephemeral.
-  if (user_id == login::kGuestUserName ||
-      user_id == login::kRetailModeUserName || user_id == login::kStubUser) {
+  if (user_id == chromeos::login::kGuestUserName ||
+      user_id == chromeos::login::kRetailModeUserName ||
+      user_id == chromeos::login::kStubUser) {
     return true;
   }
 
   // Data belonging to the owner, anyone found on the user list and obsolete
   // public accounts whose data has not been removed yet is not ephemeral.
   if (user_id == GetOwnerEmail() || UserExistsInList(user_id) ||
       IsPublicAccountMarkedForRemoval(user_id)) {
     return false;
   }
 
@@ skipping 37 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   session_state_observer_list_.RemoveObserver(obs);
 }
 
 void UserManagerBase::NotifyLocalStateChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       UserManager::Observer, observer_list_, LocalStateChanged(this));
 }
 
-bool UserManagerBase::CanUserBeRemoved(const user_manager::User* user) const {
+bool UserManagerBase::CanUserBeRemoved(const User* user) const {
   // Only regular and supervised users are allowed to be manually removed.
-  if (!user || (user->GetType() != user_manager::USER_TYPE_REGULAR &&
-                user->GetType() != user_manager::USER_TYPE_SUPERVISED)) {
+  if (!user || (user->GetType() != USER_TYPE_REGULAR &&
+                user->GetType() != USER_TYPE_SUPERVISED)) {
     return false;
   }
 
   // Sanity check: we must not remove single user unless it's an enterprise
   // device. This check may seem redundant at a first sight because
   // this single user must be an owner and we perform special check later
   // in order not to remove an owner. However due to non-instant nature of
   // ownership assignment this later check may sometimes fail.
   // See http://crosbug.com/12723
   if (users_.size() < 2 && !IsEnterpriseManaged())
     return false;
 
   // Sanity check: do not allow any of the the logged in users to be removed.
-  for (user_manager::UserList::const_iterator it = logged_in_users_.begin();
+  for (UserList::const_iterator it = logged_in_users_.begin();
        it != logged_in_users_.end();
        ++it) {
     if ((*it)->email() == user->email())
       return false;
   }
 
   return true;
 }
 
 bool UserManagerBase::GetEphemeralUsersEnabled() const {
@@ skipping 49 matching lines @@
   // Load regular users and supervised users.
   std::vector<std::string> regular_users;
   std::set<std::string> regular_users_set;
   ParseUserList(*prefs_regular_users,
                 public_sessions_set,
                 &regular_users,
                 &regular_users_set);
   for (std::vector<std::string>::const_iterator it = regular_users.begin();
        it != regular_users.end();
        ++it) {
-    user_manager::User* user = NULL;
+    User* user = NULL;
     const std::string domain = gaia::ExtractDomainName(*it);
     if (domain == chromeos::login::kSupervisedUserDomain)
-      user = user_manager::User::CreateSupervisedUser(*it);
+      user = User::CreateSupervisedUser(*it);
     else
-      user = user_manager::User::CreateRegularUser(*it);
+      user = User::CreateRegularUser(*it);
     user->set_oauth_token_status(LoadUserOAuthStatus(*it));
     user->set_force_online_signin(LoadForceOnlineSignin(*it));
     users_.push_back(user);
 
     base::string16 display_name;
     if (prefs_display_names->GetStringWithoutPathExpansion(*it,
                                                            &display_name)) {
       user->set_display_name(display_name);
     }
 
     base::string16 given_name;
     if (prefs_given_names->GetStringWithoutPathExpansion(*it, &given_name)) {
       user->set_given_name(given_name);
     }
 
     std::string display_email;
     if (prefs_display_emails->GetStringWithoutPathExpansion(*it,
                                                             &display_email)) {
       user->set_display_email(display_email);
     }
   }
 
   user_loading_stage_ = STAGE_LOADED;
 
   PerformPostUserListLoadingActions();
 }
 
-user_manager::UserList& UserManagerBase::GetUsersAndModify() {
+UserList& UserManagerBase::GetUsersAndModify() {
   EnsureUsersLoaded();
   return users_;
 }
 
-const user_manager::User* UserManagerBase::FindUserInList(
-    const std::string& user_id) const {
-  const user_manager::UserList& users = GetUsers();
-  for (user_manager::UserList::const_iterator it = users.begin();
-       it != users.end();
-       ++it) {
+const User* UserManagerBase::FindUserInList(const std::string& user_id) const {
+  const UserList& users = GetUsers();
+  for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
     if ((*it)->email() == user_id)
       return *it;
   }
   return NULL;
 }
 
 const bool UserManagerBase::UserExistsInList(const std::string& user_id) const {
   const base::ListValue* user_list = GetLocalState()->GetList(kRegularUsers);
   for (size_t i = 0; i < user_list->GetSize(); ++i) {
     std::string email;
     if (user_list->GetString(i, &email) && (user_id == email))
       return true;
   }
   return false;
 }
 
-user_manager::User* UserManagerBase::FindUserInListAndModify(
-    const std::string& user_id) {
-  user_manager::UserList& users = GetUsersAndModify();
-  for (user_manager::UserList::iterator it = users.begin(); it != users.end();
-       ++it) {
+User* UserManagerBase::FindUserInListAndModify(const std::string& user_id) {
+  UserList& users = GetUsersAndModify();
+  for (UserList::iterator it = users.begin(); it != users.end(); ++it) {
     if ((*it)->email() == user_id)
       return *it;
   }
   return NULL;
 }
 
 void UserManagerBase::GuestUserLoggedIn() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  active_user_ = user_manager::User::CreateGuestUser();
+  active_user_ = User::CreateGuestUser();
 }
 
-void UserManagerBase::AddUserRecord(user_manager::User* user) {
+void UserManagerBase::AddUserRecord(User* user) {
   // Add the user to the front of the user list.
   ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
   prefs_users_update->Insert(0, new base::StringValue(user->email()));
   users_.insert(users_.begin(), user);
 }
 
 void UserManagerBase::RegularUserLoggedIn(const std::string& user_id) {
   // Remove the user from the user list.
   active_user_ = RemoveRegularOrSupervisedUserFromList(user_id);
 
   // If the user was not found on the user list, create a new user.
   SetIsCurrentUserNew(!active_user_);
   if (IsCurrentUserNew()) {
-    active_user_ = user_manager::User::CreateRegularUser(user_id);
+    active_user_ = User::CreateRegularUser(user_id);
     active_user_->set_oauth_token_status(LoadUserOAuthStatus(user_id));
     SaveUserDisplayName(active_user_->email(),
                         base::UTF8ToUTF16(active_user_->GetAccountName(true)));
   }
 
   AddUserRecord(active_user_);
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
 }
 
 void UserManagerBase::RegularUserLoggedInAsEphemeral(
     const std::string& user_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SetIsCurrentUserNew(true);
   is_current_user_ephemeral_regular_user_ = true;
-  active_user_ = user_manager::User::CreateRegularUser(user_id);
+  active_user_ = User::CreateRegularUser(user_id);
 }
 
 void UserManagerBase::NotifyOnLogin() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   NotifyActiveUserHashChanged(active_user_->username_hash());
   NotifyActiveUserChanged(active_user_);
   UpdateLoginState();
 }
 
-user_manager::User::OAuthTokenStatus UserManagerBase::LoadUserOAuthStatus(
+User::OAuthTokenStatus UserManagerBase::LoadUserOAuthStatus(
     const std::string& user_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const base::DictionaryValue* prefs_oauth_status =
       GetLocalState()->GetDictionary(kUserOAuthTokenStatus);
-  int oauth_token_status = user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN;
+  int oauth_token_status = User::OAUTH_TOKEN_STATUS_UNKNOWN;
   if (prefs_oauth_status &&
       prefs_oauth_status->GetIntegerWithoutPathExpansion(user_id,
                                                          &oauth_token_status)) {
-    user_manager::User::OAuthTokenStatus result =
-        static_cast<user_manager::User::OAuthTokenStatus>(oauth_token_status);
-    if (result == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID)
-      GetUserFlow(user_id)->HandleOAuthTokenStatusChange(result);
-    return result;
+    User::OAuthTokenStatus status =
+        static_cast<User::OAuthTokenStatus>(oauth_token_status);
+    HandleUserOAuthTokenStatusChange(user_id, status);
+
+    return status;
   }
-  return user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN;
+  return User::OAUTH_TOKEN_STATUS_UNKNOWN;
 }
 
 bool UserManagerBase::LoadForceOnlineSignin(const std::string& user_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const base::DictionaryValue* prefs_force_online =
       GetLocalState()->GetDictionary(kUserForceOnlineSignin);
   bool force_online_signin = false;
   if (prefs_force_online) {
     prefs_force_online->GetBooleanWithoutPathExpansion(user_id,
@@ skipping 13 matching lines @@
   DictionaryPrefUpdate prefs_display_email_update(prefs, kUserDisplayEmail);
   prefs_display_email_update->RemoveWithoutPathExpansion(user_id, NULL);
 
   DictionaryPrefUpdate prefs_oauth_update(prefs, kUserOAuthTokenStatus);
   prefs_oauth_update->RemoveWithoutPathExpansion(user_id, NULL);
 
   DictionaryPrefUpdate prefs_force_online_update(prefs, kUserForceOnlineSignin);
   prefs_force_online_update->RemoveWithoutPathExpansion(user_id, NULL);
 }
 
-user_manager::User* UserManagerBase::RemoveRegularOrSupervisedUserFromList(
+User* UserManagerBase::RemoveRegularOrSupervisedUserFromList(
     const std::string& user_id) {
   ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
   prefs_users_update->Clear();
-  user_manager::User* user = NULL;
-  for (user_manager::UserList::iterator it = users_.begin();
-       it != users_.end();) {
+  User* user = NULL;
+  for (UserList::iterator it = users_.begin(); it != users_.end();) {
     const std::string user_email = (*it)->email();
     if (user_email == user_id) {
       user = *it;
       it = users_.erase(it);
     } else {
-      if ((*it)->GetType() == user_manager::USER_TYPE_REGULAR ||
-          (*it)->GetType() == user_manager::USER_TYPE_SUPERVISED) {
+      if ((*it)->GetType() == USER_TYPE_REGULAR ||
+          (*it)->GetType() == USER_TYPE_SUPERVISED) {
         prefs_users_update->Append(new base::StringValue(user_email));
       }
       ++it;
     }
   }
   return user;
 }
 
-void UserManagerBase::NotifyActiveUserChanged(
-    const user_manager::User* active_user) {
+void UserManagerBase::NotifyActiveUserChanged(const User* active_user) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,
                     session_state_observer_list_,
                     ActiveUserChanged(active_user));
 }
 
-void UserManagerBase::NotifyUserAddedToSession(
-    const user_manager::User* added_user,
-    bool user_switch_pending) {
+void UserManagerBase::NotifyUserAddedToSession(const User* added_user,
+                                               bool user_switch_pending) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,
                     session_state_observer_list_,
                     UserAddedToSession(added_user));
 }
 
 void UserManagerBase::NotifyActiveUserHashChanged(const std::string& hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(UserManager::UserSessionStateObserver,
                     session_state_observer_list_,
                     ActiveUserHashChanged(hash));
 }
 
 void UserManagerBase::UpdateLoginState() {
-  if (!LoginState::IsInitialized())
+  if (!chromeos::LoginState::IsInitialized())
     return;  // LoginState may not be intialized in tests.
 
-  LoginState::LoggedInState logged_in_state;
-  logged_in_state =
-      active_user_ ? LoginState::LOGGED_IN_ACTIVE : LoginState::LOGGED_IN_NONE;
+  chromeos::LoginState::LoggedInState logged_in_state;
+  logged_in_state = active_user_ ? chromeos::LoginState::LOGGED_IN_ACTIVE
+                                 : chromeos::LoginState::LOGGED_IN_NONE;
 
-  LoginState::LoggedInUserType login_user_type;
-  if (logged_in_state == LoginState::LOGGED_IN_NONE)
-    login_user_type = LoginState::LOGGED_IN_USER_NONE;
+  chromeos::LoginState::LoggedInUserType login_user_type;
+  if (logged_in_state == chromeos::LoginState::LOGGED_IN_NONE)
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_NONE;
   else if (is_current_user_owner_)
-    login_user_type = LoginState::LOGGED_IN_USER_OWNER;
-  else if (active_user_->GetType() == user_manager::USER_TYPE_GUEST)
-    login_user_type = LoginState::LOGGED_IN_USER_GUEST;
-  else if (active_user_->GetType() == user_manager::USER_TYPE_RETAIL_MODE)
-    login_user_type = LoginState::LOGGED_IN_USER_RETAIL_MODE;
-  else if (active_user_->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT)
-    login_user_type = LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT;
-  else if (active_user_->GetType() == user_manager::USER_TYPE_SUPERVISED)
-    login_user_type = LoginState::LOGGED_IN_USER_SUPERVISED;
-  else if (active_user_->GetType() == user_manager::USER_TYPE_KIOSK_APP)
-    login_user_type = LoginState::LOGGED_IN_USER_KIOSK_APP;
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_OWNER;
+  else if (active_user_->GetType() == USER_TYPE_GUEST)
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_GUEST;
+  else if (active_user_->GetType() == USER_TYPE_RETAIL_MODE)
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_RETAIL_MODE;
+  else if (active_user_->GetType() == USER_TYPE_PUBLIC_ACCOUNT)
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT;
+  else if (active_user_->GetType() == USER_TYPE_SUPERVISED)
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_SUPERVISED;
+  else if (active_user_->GetType() == USER_TYPE_KIOSK_APP)
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_KIOSK_APP;
   else
-    login_user_type = LoginState::LOGGED_IN_USER_REGULAR;
+    login_user_type = chromeos::LoginState::LOGGED_IN_USER_REGULAR;
 
   if (primary_user_) {
-    LoginState::Get()->SetLoggedInStateAndPrimaryUser(
+    chromeos::LoginState::Get()->SetLoggedInStateAndPrimaryUser(
         logged_in_state, login_user_type, primary_user_->username_hash());
   } else {
-    LoginState::Get()->SetLoggedInState(logged_in_state, login_user_type);
+    chromeos::LoginState::Get()->SetLoggedInState(logged_in_state,
+                                                  login_user_type);
   }
 }
 
-void UserManagerBase::SetLRUUser(user_manager::User* user) {
-  user_manager::UserList::iterator it =
+void UserManagerBase::SetLRUUser(User* user) {
+  UserList::iterator it =
       std::find(lru_logged_in_users_.begin(), lru_logged_in_users_.end(), user);
   if (it != lru_logged_in_users_.end())
     lru_logged_in_users_.erase(it);
   lru_logged_in_users_.insert(lru_logged_in_users_.begin(), user);
 }
 
 void UserManagerBase::SendRegularUserLoginMetrics(const std::string& user_id) {
   // If this isn't the first time Chrome was run after the system booted,
   // assume that Chrome was restarted because a previous session ended.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kFirstExecAfterBoot)) {
+          chromeos::switches::kFirstExecAfterBoot)) {
     const std::string last_email =
         GetLocalState()->GetString(kLastLoggedInRegularUser);
     const base::TimeDelta time_to_login =
         base::TimeTicks::Now() - manager_creation_time_;
     if (!last_email.empty() && user_id != last_email &&
         time_to_login.InSeconds() <= kLogoutToLoginDelayMaxSec) {
       UMA_HISTOGRAM_CUSTOM_COUNTS("UserManager.LogoutToLoginDelay",
                                   time_to_login.InSeconds(),
                                   0,
                                   kLogoutToLoginDelayMaxSec,
                                   50);
     }
   }
 }
 
 void UserManagerBase::UpdateUserAccountLocale(const std::string& user_id,
                                               const std::string& locale) {
   if (!locale.empty() && locale != GetApplicationLocale()) {
     base::Callback<void(const std::string&)> on_resolve_callback =
         base::Bind(&UserManagerBase::DoUpdateAccountLocale,
                    weak_factory_.GetWeakPtr(),
                    user_id);
-    BrowserThread::PostBlockingPoolTask(FROM_HERE,
-                                        base::Bind(ResolveLocale,
-                                                   locale,
-                                                   on_resolve_callback));
+    BrowserThread::PostBlockingPoolTask(
+        FROM_HERE, base::Bind(ResolveLocale, locale, on_resolve_callback));
   } else {
     DoUpdateAccountLocale(user_id, locale);
   }
 }
 
 void UserManagerBase::DoUpdateAccountLocale(
     const std::string& user_id,
     const std::string& resolved_locale) {
-  if (user_manager::User* user = FindUserAndModify(user_id))
+  if (User* user = FindUserAndModify(user_id))
     user->SetAccountLocale(resolved_locale);
 }
 
-void UserManagerBase::DeleteUser(user_manager::User* user) {
+void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
-}  // namespace chromeos
+}  // namespace user_manager