diff options
| author | rogerta <rogerta@chromium.org> | 2015-04-16 21:16:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 04:16:59 +0000 |
| commit | a1e15d29e401465bacd0681f256af567e7b8242f (patch) | |
| tree | 5225a6498d80fa5bdaf6639cd51f9fe1ac3eef32 /chromeos | |
| parent | 950576043d18caee3fc8bb28dfc432c3d6adcbda (diff) | |
| download | chromium_src-a1e15d29e401465bacd0681f256af567e7b8242f.zip chromium_src-a1e15d29e401465bacd0681f256af567e7b8242f.tar.gz chromium_src-a1e15d29e401465bacd0681f256af567e7b8242f.tar.bz2 | |
Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.
Depends on https://codereview.chromium.org/964553002/
BUG=341408
Review URL: https://codereview.chromium.org/964563002
Cr-Commit-Position: refs/heads/master@{#325594}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/login/auth/stub_authenticator.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromeos/login/auth/stub_authenticator.cc b/chromeos/login/auth/stub_authenticator.cc index 8a3e30f..6613ea2 100644 --- a/chromeos/login/auth/stub_authenticator.cc +++ b/chromeos/login/auth/stub_authenticator.cc @@ -35,7 +35,10 @@ void StubAuthenticator::CompleteLogin(content::BrowserContext* context, void StubAuthenticator::AuthenticateToLogin(content::BrowserContext* context, const UserContext& user_context) { authentication_context_ = context; - if (user_context == expected_user_context_) { + // Don't compare the entire |expected_user_context_| to |user_context| because + // during non-online re-auth |user_context| does not have a gaia id. + if (expected_user_context_.GetUserID() == user_context.GetUserID() && + *expected_user_context_.GetKey() == *user_context.GetKey()) { message_loop_->PostTask( FROM_HERE, base::Bind(&StubAuthenticator::OnAuthSuccess, this)); return; |