chrome/browser/policy/cloud/user_policy_signin_service.cc - Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id.

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/policy/cloud/user_policy_signin_service.cc

Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Hui's comments, fix cvox tests Created 6 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

« chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc ('k') | chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc » ('j') | components/signin/core/browser/signin_manager_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/cloud/user_policy_signin_service.cc

diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc

index e39ccc6cf5894cd5812f458dd0bf4ced26f1f239..d49698fa18d9eebd7716aa025c055a8eea938977 100644

--- a/chrome/browser/policy/cloud/user_policy_signin_service.cc

+++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc

@@ -42,8 +42,9 @@ UserPolicySigninService::UserPolicySigninService(

// ProfileOAuth2TokenService should not yet have loaded its tokens since this

// happens in the background after PKS initialization - so this service

// should always be created before the oauth token is available.

- DCHECK(!oauth2_token_service_->RefreshTokenIsAvailable(

- signin_manager->GetAuthenticatedAccountId()));

+ DCHECK(!signin_manager->IsAuthenticated() ||

+ (!oauth2_token_service_->RefreshTokenIsAvailable(

+ signin_manager->GetAuthenticatedAccountId())));

// Listen for an OAuth token to become available so we can register a client

// if for some reason the client is not already registered (for example, if