| Index: chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
|
| index c6a3fe826dc9f326f926a939d82984df110d9317..1e18ea77af0f948fc203ffb39a57aa7dfac5d192 100644
|
| --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
|
| +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
|
| @@ -108,8 +108,8 @@ void OAuth2LoginManager::RestoreSessionFromSavedTokens() {
|
| // and OnRefreshTokenAvailable is not called. Flagging it here would
|
| // cause user to go through Gaia in next login to obtain a new refresh
|
| // token.
|
| - UserManager::Get()->SaveUserOAuthStatus(primary_account_id,
|
| - User::OAUTH_TOKEN_STATUS_UNKNOWN);
|
| + GetUserManager()->SaveUserOAuthStatus(primary_account_id,
|
| + User::OAUTH_TOKEN_STATUS_UNKNOWN);
|
|
|
| token_service->LoadCredentials(primary_account_id);
|
| }
|
| @@ -137,15 +137,15 @@ void OAuth2LoginManager::OnRefreshTokenAvailable(
|
|
|
| // Do not validate tokens for supervised users, as they don't actually have
|
| // oauth2 token.
|
| - if (UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
|
| + if (GetUserManager()->IsLoggedInAsLocallyManagedUser()) {
|
| LOG(WARNING) << "Logged in as managed user, skip token validation.";
|
| return;
|
| }
|
| // Only restore session cookies for the primary account in the profile.
|
| if (GetPrimaryAccountId() == account_id) {
|
| // Token is loaded. Undo the flagging before token loading.
|
| - UserManager::Get()->SaveUserOAuthStatus(account_id,
|
| - User::OAUTH2_TOKEN_STATUS_VALID);
|
| + GetUserManager()->SaveUserOAuthStatus(account_id,
|
| + User::OAUTH2_TOKEN_STATUS_VALID);
|
| VerifySessionCookies();
|
| }
|
| }
|
|
|