Index: chrome/browser/chromeos/login/signin/auth_sync_observer.cc |
diff --git a/chrome/browser/chromeos/login/signin/auth_sync_observer.cc b/chrome/browser/chromeos/login/signin/auth_sync_observer.cc |
index a0ed887a34280b67158758029c6188b9a60e848f..31f88797bb0fa4f91151d0afaf32403f303cf7f2 100644 |
--- a/chrome/browser/chromeos/login/signin/auth_sync_observer.cc |
+++ b/chrome/browser/chromeos/login/signin/auth_sync_observer.cc |
@@ -44,8 +44,8 @@ void AuthSyncObserver::Shutdown() { |
} |
void AuthSyncObserver::OnStateChanged() { |
- DCHECK(UserManager::Get()->IsLoggedInAsRegularUser() || |
- UserManager::Get()->IsLoggedInAsLocallyManagedUser()); |
+ DCHECK(GetUserManager()->IsLoggedInAsRegularUser() || |
+ GetUserManager()->IsLoggedInAsLocallyManagedUser()); |
ProfileSyncService* sync_service = |
ProfileSyncServiceFactory::GetForProfile(profile_); |
User* user = ProfileHelper::Get()->GetUserByProfile(profile_); |
@@ -64,15 +64,15 @@ void AuthSyncObserver::OnStateChanged() { |
DCHECK(!email.empty()); |
// TODO(nkostyelv): Change observer after active user has changed. |
User::OAuthTokenStatus old_status = user->oauth_token_status(); |
- UserManager::Get()->SaveUserOAuthStatus(email, |
- User::OAUTH2_TOKEN_STATUS_INVALID); |
+ GetUserManager()->SaveUserOAuthStatus(email, |
+ User::OAUTH2_TOKEN_STATUS_INVALID); |
if (user->GetType() == user_manager::USER_TYPE_LOCALLY_MANAGED && |
old_status != User::OAUTH2_TOKEN_STATUS_INVALID) { |
// Attempt to restore token from file. |
- UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken( |
- profile_, |
- base::Bind(&AuthSyncObserver::OnSupervisedTokenLoaded, |
- base::Unretained(this))); |
+ GetUserManager()->GetSupervisedUserManager()->LoadSupervisedUserToken( |
+ profile_, |
+ base::Bind(&AuthSyncObserver::OnSupervisedTokenLoaded, |
+ base::Unretained(this))); |
content::RecordAction( |
base::UserMetricsAction("ManagedUsers_Chromeos_Sync_Invalidated")); |
} |
@@ -81,9 +81,8 @@ void AuthSyncObserver::OnStateChanged() { |
user->oauth_token_status() == User::OAUTH2_TOKEN_STATUS_INVALID) { |
LOG(ERROR) << |
"Got an incorrectly invalidated token case, restoring token status."; |
- UserManager::Get()->SaveUserOAuthStatus( |
- user->email(), |
- User::OAUTH2_TOKEN_STATUS_VALID); |
+ GetUserManager()->SaveUserOAuthStatus(user->email(), |
+ User::OAUTH2_TOKEN_STATUS_VALID); |
content::RecordAction( |
base::UserMetricsAction("ManagedUsers_Chromeos_Sync_Recovered")); |
} |
@@ -91,8 +90,8 @@ void AuthSyncObserver::OnStateChanged() { |
} |
void AuthSyncObserver::OnSupervisedTokenLoaded(const std::string& token) { |
- UserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken( |
- profile_, token); |
+ GetUserManager()->GetSupervisedUserManager()->ConfigureSyncWithToken(profile_, |
+ token); |
} |
} // namespace chromeos |