Make login cancel logic load localaccount file before attempting offline login

chrome/browser/chromeos/login/google_authenticator.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/login/google_authenticator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 45 matching lines @@
       unlock_(false),
       try_again_(true),
       checked_for_localaccount_(false) {
   CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
 }
 
 GoogleAuthenticator::~GoogleAuthenticator() {}
 
 void GoogleAuthenticator::CancelClientLogin() {
   if (gaia_authenticator_->HasPendingFetch()) {
+    LOG(INFO) << "Canceling ClientLogin attempt.";
     gaia_authenticator_->CancelRequest();
+
+    ChromeThread::PostTask(
+        ChromeThread::FILE, FROM_HERE,
+        NewRunnableMethod(this,
+                          &GoogleAuthenticator::LoadLocalaccount,
+                          std::string(kLocalaccountFile)));
+
     CheckOffline("Login has timed out; please try again!");
   }
 }
 
 void GoogleAuthenticator::TryClientLogin() {
   gaia_authenticator_->StartClientLogin(username_,
                                         password_,
                                         GaiaAuthenticator2::kContactsService,
                                         login_token_,
                                         login_captcha_);
@@ skipping 345 matching lines @@
   DCHECK_EQ(parts.size(), 2U) << "email_address should have only one @";
   RemoveChars(parts[0], ".", &parts[0]);
   if (parts[0].find('+') != std::string::npos)
     parts[0].erase(parts[0].find('+'));
   std::string new_email = StringToLowerASCII(JoinString(parts, at));
   LOG(INFO) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
 }
 
 }  // namespace chromeos