Index: chromeos/login/auth/stub_authenticator.cc |
diff --git a/chromeos/login/auth/stub_authenticator.cc b/chromeos/login/auth/stub_authenticator.cc |
index 8a3e30f263d0e6bbe8eae274dac6d297f7132972..4e9ee28d87f4a0c5bf6d53f7c29b6a465cf7328c 100644 |
--- a/chromeos/login/auth/stub_authenticator.cc |
+++ b/chromeos/login/auth/stub_authenticator.cc |
@@ -35,7 +35,9 @@ 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()) { |
xiyuan
2015/04/09 20:59:21
Think we should also check key here because there
xiyuan
2015/04/09 21:02:12
Interesting that ScreenLockerTest.TestBasic passes
Roger Tawa OOO till Jul 10th
2015/04/10 01:52:57
Done. But you are correct that the test passes wi
Roger Tawa OOO till Jul 10th
2015/04/10 01:52:57
Done.
xiyuan
2015/04/10 02:50:45
Filed http://crbug.com/475777 to track.
|
message_loop_->PostTask( |
FROM_HERE, base::Bind(&StubAuthenticator::OnAuthSuccess, this)); |
return; |