[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/login/session/user_session_manager.cc

Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index d9eb16dcc745e6b92dbd5fa9ba1726ca8d66a02b..1a654b5f57fa798264cf308fb67cac9ce68f0701 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -31,8 +31,8 @@
 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -64,6 +64,7 @@
 #include "components/session_manager/core/session_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -190,7 +191,7 @@ void UserSessionManager::OverrideHomedir() {
   // Override user homedir, check for ProfileManager being initialized as
   // it may not exist in unit tests.
   if (g_browser_process->profile_manager()) {
-    UserManager* user_manager = UserManager::Get();
+    user_manager::UserManager* user_manager = user_manager::UserManager::Get();
     if (user_manager->GetLoggedInUsers().size() == 1) {
       base::FilePath homedir = ProfileHelper::GetProfilePathByUserIdHash(
           user_manager->GetPrimaryUser()->username_hash());
@@ -248,7 +249,7 @@ void UserSessionManager::StartSession(
 }
 
 void UserSessionManager::PerformPostUserLoggedInActions() {
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (user_manager->GetLoggedInUsers().size() == 1) {
     // Owner must be first user in session. DeviceSettingsService can't deal
     // with multiple user and will mix up ownership, crbug.com/230018.
@@ -263,7 +264,7 @@ void UserSessionManager::PerformPostUserLoggedInActions() {
 }
 
 void UserSessionManager::RestoreAuthenticationSession(Profile* user_profile) {
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   // We need to restore session only for logged in regular (GAIA) users.
   // Note: stub user is a special case that is used for tests, running
   // linux_chromeos build on dev workstations w/o user_id parameters.
@@ -366,7 +367,7 @@ bool UserSessionManager::RespectLocalePreference(
   if (g_browser_process == NULL)
     return false;
 
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (!user || (user_manager->IsUserLoggedIn() &&
                 user != user_manager->GetPrimaryUser())) {
     return false;
@@ -426,7 +427,8 @@ bool UserSessionManager::RespectLocalePreference(
   //
   // For Guest mode, user locale preferences will never get initialized.
   // So input methods should be enabled somewhere.
-  const bool enable_layouts = UserManager::Get()->IsLoggedInAsGuest();
+  const bool enable_layouts =
+      user_manager::UserManager::Get()->IsLoggedInAsGuest();
   locale_util::SwitchLanguage(pref_locale,
                               enable_layouts,
                               false /* login_layouts_only */,
@@ -476,8 +478,8 @@ void UserSessionManager::OnSessionRestoreStateChanged(
   // error. http://crbug.com/295245
   if (!connection_error) {
     // We are in one of "done" states here.
-    UserManager::Get()->SaveUserOAuthStatus(
-        UserManager::Get()->GetLoggedInUser()->email(),
+    user_manager::UserManager::Get()->SaveUserOAuthStatus(
+        user_manager::UserManager::Get()->GetLoggedInUser()->email(),
         user_status);
   }
 
@@ -494,8 +496,8 @@ void UserSessionManager::OnNewRefreshTokenAvaiable(Profile* user_profile) {
   login_manager->RemoveObserver(this);
 
   // Mark user auth token status as valid.
-  UserManager::Get()->SaveUserOAuthStatus(
-      UserManager::Get()->GetLoggedInUser()->email(),
+  user_manager::UserManager::Get()->SaveUserOAuthStatus(
+      user_manager::UserManager::Get()->GetLoggedInUser()->email(),
       user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
   VLOG(1) << "Exiting after new refresh token fetched";
@@ -511,7 +513,7 @@ void UserSessionManager::OnConnectionTypeChanged(
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           ::switches::kTestName) ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType);
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (type == net::NetworkChangeNotifier::CONNECTION_NONE ||
       !user_manager->IsUserLoggedIn() ||
       !user_manager->IsLoggedInAsRegularUser() ||
@@ -585,7 +587,7 @@ void UserSessionManager::StartCrosSession() {
 void UserSessionManager::NotifyUserLoggedIn() {
   BootTimesLoader* btl = BootTimesLoader::Get();
   btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   user_manager->UserLoggedIn(user_context_.GetUserID(),
                              user_context_.GetUserIDHash(),
                              false);
@@ -640,20 +642,21 @@ void UserSessionManager::OnProfileCreated(const UserContext& user_context,
 void UserSessionManager::InitProfilePreferences(
     Profile* profile,
     const UserContext& user_context) {
-  if (UserManager::Get()->IsCurrentUserNew()) {
+  if (user_manager::UserManager::Get()->IsCurrentUserNew()) {
     SetFirstLoginPrefs(profile->GetPrefs(),
                        user_context.GetPublicSessionLocale(),
                        user_context.GetPublicSessionInputMethod());
   }
 
-  if (UserManager::Get()->IsLoggedInAsSupervisedUser()) {
-    user_manager::User* active_user = UserManager::Get()->GetActiveUser();
+  if (user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser()) {
+    user_manager::User* active_user =
+        user_manager::UserManager::Get()->GetActiveUser();
     std::string supervised_user_sync_id =
-        UserManager::Get()->GetSupervisedUserManager()->
-            GetUserSyncId(active_user->email());
+        ChromeUserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
+            active_user->email());
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    supervised_user_sync_id);
-  } else if (UserManager::Get()->IsLoggedInAsRegularUser()) {
+  } else if (user_manager::UserManager::Get()->IsLoggedInAsRegularUser()) {
     // Make sure that the google service username is properly set (we do this
     // on every sign in, not just the first login, to deal with existing
     // profiles that might not have it set yet).
@@ -743,7 +746,7 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
   }
   btl->AddLoginTimeMarker("TPMOwn-End", false);
 
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   if (user_manager->IsLoggedInAsRegularUser()) {
     SAMLOfflineSigninLimiter* saml_offline_signin_limiter =
         SAMLOfflineSigninLimiterFactory::GetForProfile(profile);
@@ -867,8 +870,10 @@ void UserSessionManager::InitRlzImpl(Profile* profile, bool disabled) {
   // Negative ping delay means to send ping immediately after a first search is
   // recorded.
   RLZTracker::InitRlzFromProfileDelayed(
-      profile, UserManager::Get()->IsCurrentUserNew(),
-      ping_delay < 0, base::TimeDelta::FromMilliseconds(abs(ping_delay)));
+      profile,
+      user_manager::UserManager::Get()->IsCurrentUserNew(),
+      ping_delay < 0,
+      base::TimeDelta::FromMilliseconds(abs(ping_delay)));
   if (delegate_)
     delegate_->OnRlzInitialized();
 #endif
@@ -909,7 +914,7 @@ void UserSessionManager::OnRestoreActiveSessions(
   }
 
   // One profile has been already loaded on browser start.
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   DCHECK(user_manager->GetLoggedInUsers().size() == 1);
   DCHECK(user_manager->GetActiveUser());
   std::string active_user_id = user_manager->GetActiveUser()->email();
@@ -940,7 +945,7 @@ void UserSessionManager::RestorePendingUserSessions() {
 
   // Check that this user is not logged in yet.
   user_manager::UserList logged_in_users =
-      UserManager::Get()->GetLoggedInUsers();
+      user_manager::UserManager::Get()->GetLoggedInUsers();
   bool user_already_logged_in = false;
   for (user_manager::UserList::const_iterator it = logged_in_users.begin();
        it != logged_in_users.end();