Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

chrome/browser/chromeos/login/session/user_session_manager.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/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 122 matching lines @@
 UserSessionManager* UserSessionManager::GetInstance() {
   return Singleton<UserSessionManager,
       DefaultSingletonTraits<UserSessionManager> >::get();
 }
 
 // static
 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();
+    UserManager* user_manager = GetUserManager();
     if (user_manager->GetLoggedInUsers().size() == 1) {
       base::FilePath homedir = ProfileHelper::GetProfilePathByUserIdHash(
           user_manager->GetPrimaryUser()->username_hash());
       // This path has been either created by cryptohome (on real Chrome OS
       // device) or by ProfileManager (on chromeos=1 desktop builds).
       PathService::OverrideAndCreateIfNeeded(base::DIR_HOME,
                                              homedir,
                                              true /* path is absolute */,
                                              false /* don't create */);
     }
@@ skipping 35 matching lines @@
   if (!has_active_session)
     StartCrosSession();
 
   // TODO(nkostylev): Notify UserLoggedIn() after profile is actually
   // ready to be used (http://crbug.com/361528).
   NotifyUserLoggedIn();
   PrepareProfile();
 }
 
 void UserSessionManager::PerformPostUserLoggedInActions() {
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   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.
     OwnerSettingsServiceFactory::GetInstance()->
         SetUsername(user_manager->GetActiveUser()->email());
 
     if (NetworkPortalDetector::IsInitialized()) {
       NetworkPortalDetector::Get()->SetStrategy(
           PortalDetectorStrategy::STRATEGY_ID_SESSION);
     }
   }
 }
 
 void UserSessionManager::RestoreAuthenticationSession(Profile* user_profile) {
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   // 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.
   // Stub user is considered to be a regular GAIA user but it has special
   // user_id (kStubUser) and certain services like restoring OAuth session are
   // explicitly disabled for it.
   if (!user_manager->IsUserLoggedIn() ||
       !user_manager->IsLoggedInAsRegularUser() ||
       user_manager->IsLoggedInAsStub()) {
     return;
@@ skipping 71 matching lines @@
 
 bool UserSessionManager::RespectLocalePreference(
     Profile* profile,
     const User* user,
     scoped_ptr<locale_util::SwitchLanguageCallback> callback) const {
   // TODO(alemate): http://crbug.com/288941 : Respect preferred language list in
   // the Google user profile.
   if (g_browser_process == NULL)
     return false;
 
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   if ((user == NULL) || (user != user_manager->GetPrimaryUser()) ||
       (!user->is_profile_created()))
     return false;
 
   // In case of multi-profiles session we don't apply profile locale
   // because it is unsafe.
   if (user_manager->GetLoggedInUsers().size() != 1)
     return false;
 
   const PrefService* prefs = profile->GetPrefs();
@@ skipping 34 matching lines @@
 
   // Here we don't enable keyboard layouts for normal users. Input methods
   // are set up when the user first logs in. Then the user may customize the
   // input methods.  Hence changing input methods here, just because the user's
   // UI language is different from the login screen UI language, is not
   // desirable. Note that input method preferences are synced, so users can use
   // their farovite input methods as soon as the preferences are synced.
   //
   // 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 = GetUserManager()->IsLoggedInAsGuest();
   locale_util::SwitchLanguage(pref_locale,
                               enable_layouts,
                               false /* login_layouts_only */,
                               callback.Pass());
 
   return true;
 }
 
 void UserSessionManager::OnSessionRestoreStateChanged(
     Profile* user_profile,
@@ skipping 16 matching lines @@
     case OAuth2LoginManager::SESSION_RESTORE_NOT_STARTED:
     case OAuth2LoginManager::SESSION_RESTORE_PREPARING:
     case OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS:
       return;
   }
 
   // We should not be clearing existing token state if that was a connection
   // error. http://crbug.com/295245
   if (!connection_error) {
     // We are in one of "done" states here.
-    UserManager::Get()->SaveUserOAuthStatus(
-        UserManager::Get()->GetLoggedInUser()->email(),
-        user_status);
+    GetUserManager()->SaveUserOAuthStatus(
+        GetUserManager()->GetLoggedInUser()->email(), user_status);
   }
 
   login_manager->RemoveObserver(this);
 }
 
 void UserSessionManager::OnNewRefreshTokenAvaiable(Profile* user_profile) {
   // Check if we were waiting to restart chrome.
   if (!exit_after_session_restore_)
     return;
 
   OAuth2LoginManager* login_manager =
       OAuth2LoginManagerFactory::GetInstance()->GetForProfile(user_profile);
   login_manager->RemoveObserver(this);
 
   // Mark user auth token status as valid.
-  UserManager::Get()->SaveUserOAuthStatus(
-      UserManager::Get()->GetLoggedInUser()->email(),
+  GetUserManager()->SaveUserOAuthStatus(
+      GetUserManager()->GetLoggedInUser()->email(),
       User::OAUTH2_TOKEN_STATUS_VALID);
 
   LOG(WARNING) << "Exiting after new refresh token fetched";
 
   // We need to restart cleanly in this case to make sure OAuth2 RT is actually
   // saved.
   chrome::AttemptRestart();
 }
 
 void UserSessionManager::OnConnectionTypeChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   if (type == net::NetworkChangeNotifier::CONNECTION_NONE ||
       !user_manager->IsUserLoggedIn() ||
       !user_manager->IsLoggedInAsRegularUser() ||
       user_manager->IsLoggedInAsStub()) {
     return;
   }
 
   // Need to iterate over all users and their OAuth2 session state.
   const UserList& users = user_manager->GetLoggedInUsers();
   for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
@@ skipping 35 matching lines @@
   BootTimesLoader* btl = BootTimesLoader::Get();
   btl->AddLoginTimeMarker("StartSession-Start", false);
   DBusThreadManager::Get()->GetSessionManagerClient()->
       StartSession(user_context_.GetUserID());
   btl->AddLoginTimeMarker("StartSession-End", false);
 }
 
 void UserSessionManager::NotifyUserLoggedIn() {
   BootTimesLoader* btl = BootTimesLoader::Get();
   btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   user_manager->UserLoggedIn(user_context_.GetUserID(),
                              user_context_.GetUserIDHash(),
                              false);
   btl->AddLoginTimeMarker("UserLoggedIn-End", false);
 }
 
 void UserSessionManager::PrepareProfile() {
   bool is_demo_session =
       DemoAppLauncher::IsDemoAppSession(user_context_.GetUserID());
 
@@ skipping 31 matching lines @@
     case Profile::CREATE_STATUS_REMOTE_FAIL:
     case Profile::CREATE_STATUS_CANCELED:
     case Profile::MAX_CREATE_STATUS:
       NOTREACHED();
       break;
   }
 }
 
 void UserSessionManager::InitProfilePreferences(Profile* profile,
                                             const std::string& user_id) {
-  if (UserManager::Get()->IsCurrentUserNew())
+  if (GetUserManager()->IsCurrentUserNew())
     SetFirstLoginPrefs(profile->GetPrefs());
 
-  if (UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
-    User* active_user = UserManager::Get()->GetActiveUser();
+  if (GetUserManager()->IsLoggedInAsLocallyManagedUser()) {
+    User* active_user = GetUserManager()->GetActiveUser();
     std::string managed_user_sync_id =
-        UserManager::Get()->GetSupervisedUserManager()->
-            GetUserSyncId(active_user->email());
+        GetUserManager()->GetSupervisedUserManager()->GetUserSyncId(
+            active_user->email());
     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
                                    managed_user_sync_id);
-  } else if (UserManager::Get()->IsLoggedInAsRegularUser()) {
+  } else if (GetUserManager()->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).
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(profile);
     signin_manager->SetAuthenticatedUsername(user_id);
   }
 }
 
 void UserSessionManager::UserProfileInitialized(Profile* profile,
@@ skipping 51 matching lines @@
   btl->AddLoginTimeMarker("TPMOwn-Start", false);
   if (cryptohome_util::TpmIsEnabled() && !cryptohome_util::TpmIsBeingOwned()) {
     if (cryptohome_util::TpmIsOwned()) {
       client->CallTpmClearStoredPasswordAndBlock();
     } else {
       client->TpmCanAttemptOwnership(EmptyVoidDBusMethodCallback());
     }
   }
   btl->AddLoginTimeMarker("TPMOwn-End", false);
 
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   if (user_manager->IsLoggedInAsRegularUser()) {
     SAMLOfflineSigninLimiter* saml_offline_signin_limiter =
         SAMLOfflineSigninLimiterFactory::GetForProfile(profile);
     if (saml_offline_signin_limiter)
       saml_offline_signin_limiter->SignedIn(user_context_.GetAuthFlow());
   }
 
   profile->OnLogin();
 
   // Send the notification before creating the browser so additional objects
@@ skipping 98 matching lines @@
     // When switching to RLZ enabled/disabled state, clear all recorded events.
     RLZTracker::ClearRlzState();
     local_state->SetBoolean(prefs::kRLZDisabled, disabled);
   }
   // Init the RLZ library.
   int ping_delay = profile->GetPrefs()->GetInteger(
       first_run::GetPingDelayPrefName().c_str());
   // 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,
+      GetUserManager()->IsCurrentUserNew(),
+      ping_delay < 0,
+      base::TimeDelta::FromMilliseconds(abs(ping_delay)));
   if (delegate_)
     delegate_->OnRlzInitialized();
 #endif
 }
 
 void UserSessionManager::InitializeCertsForPrimaryUser(Profile* profile) {
   // Now that the user profile has been initialized
   // |GetNSSCertDatabaseForProfile| is safe to be used.
-  UserManager* user_manager = UserManager::Get();
+  UserManager* user_manager = GetUserManager();
   const User* primary_user = user_manager->GetPrimaryUser();
   if (user_manager->IsUserLoggedIn() &&
       primary_user &&
       profile == ProfileHelper::Get()->GetProfileByUser(primary_user) &&
       CertLoader::IsInitialized() &&
       base::SysInfo::IsRunningOnChromeOS()) {
     GetNSSCertDatabaseForProfile(profile,
                                  base::Bind(&OnGetNSSCertDatabaseForUser));
   }
 }
 
 }  // namespace chromeos