Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chromeos/login/auth/stub_authenticator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/login/auth/stub_authenticator.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 
@@ skipping 17 matching lines @@
                                       const UserContext& user_context) {
   authentication_context_ = context;
   if (expected_user_context_ != user_context)
     NOTREACHED();
   OnAuthSuccess();
 }
 
 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;
   }
   GoogleServiceAuthError error(
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
   message_loop_->PostTask(
       FROM_HERE, base::Bind(&StubAuthenticator::OnAuthFailure, this,
                             AuthFailure::FromNetworkAuthFailure(error)));
 }
@@ skipping 50 matching lines @@
 
 void StubAuthenticator::SetExpectedCredentials(
     const UserContext& user_context) {
   expected_user_context_ = user_context;
 }
 
 StubAuthenticator::~StubAuthenticator() {
 }
 
 }  // namespace chromeos