Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2641)

Issues Search
    My Issues | Starred     Open | Closed | All

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 review comments 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/android/profiles/profile_downloader_android.cc ('K') | « chrome/browser/android/profiles/profile_downloader_android.cc ('k') | chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc » ('j') | chrome/browser/ui/webui/signin/inline_login_handler_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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
« chrome/browser/android/profiles/profile_downloader_android.cc ('K') | « chrome/browser/android/profiles/profile_downloader_android.cc ('k') | chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc » ('j') | chrome/browser/ui/webui/signin/inline_login_handler_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698