chrome/browser/chromeos/login/signin/auth_sync_observer.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/signin/auth_sync_observer.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | chrome/browser/chromeos/login/signin/device_id_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 99b50e5396a03b5aab1d24758ee96b86c72cc926..8fa574959b7f0d25a03e412db313ca62c041ae3c 100644

--- a/chrome/browser/chromeos/login/signin/auth_sync_observer.cc

+++ b/chrome/browser/chromeos/login/signin/auth_sync_observer.cc

@@ -62,14 +62,14 @@

// TODO(nkostylev): Remove after crosbug.com/25978 is implemented.

LOG(WARNING) << "Invalidate OAuth token because of a sync error: "

<< sync_service->GetAuthError().ToString();

- const AccountId& account_id = user->GetAccountId();

- DCHECK(account_id.is_valid());

+ std::string email = user->email();

+ DCHECK(!email.empty());

// TODO(nkostyelv): Change observer after active user has changed.

user_manager::User::OAuthTokenStatus old_status =

user->oauth_token_status();

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- account_id, user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);

- RecordReauthReason(account_id, ReauthReason::SYNC_FAILED);

+ email, user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);

+ RecordReauthReason(email, ReauthReason::SYNC_FAILED);

if (user->GetType() == user_manager::USER_TYPE_SUPERVISED &&

old_status != user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) {

// Attempt to restore token from file.

@@ -89,7 +89,7 @@

LOG(ERROR) <<

"Got an incorrectly invalidated token case, restoring token status.";

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- user->GetAccountId(), user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

+ user->email(), user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

content::RecordAction(

base::UserMetricsAction("ManagedUsers_Chromeos_Sync_Recovered"));

}