Allow sync with 2-factor StrongAuth accounts in ChromeOS.

chrome/browser/chromeos/login/google_authenticator.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_GOOGLE_AUTHENTICATOR_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_GOOGLE_AUTHENTICATOR_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 82 matching lines @@
       const std::string& old_password,
       const GaiaAuthConsumer::ClientLoginResult& credentials);
   void ResyncEncryptedData(
       const GaiaAuthConsumer::ClientLoginResult& credentials);
   void RetryAuth(Profile* profile,
                  const std::string& username,
                  const std::string& password,
                  const std::string& login_token,
                  const std::string& login_captcha);
 
+  const GoogleServiceAuthError& last_error() { return last_error_; }

[Chris Masone, 2010/11/17 01:11:09]

You can get rid of this if you take the approach I suggest in
login_status_consumer.h

+
   // Callbacks from GaiaAuthFetcher
   virtual void OnClientLoginFailure(
       const GoogleServiceAuthError& error);
   virtual void OnClientLoginSuccess(
       const GaiaAuthConsumer::ClientLoginResult& credentials);
 
  private:
 
   // If we don't have the system salt yet, loads it from the CryptohomeLibrary.
   void LoadSystemSalt();
@@ skipping 77 matching lines @@
 
   std::string ascii_hash_;
   chromeos::CryptohomeBlob system_salt_;
   bool unlock_;  // True if authenticating to unlock the computer.
   bool try_again_;  // True if we're willing to retry the login attempt.
 
   std::string localaccount_;
   bool checked_for_localaccount_;  // needed because empty localaccount_ is ok.
   Lock localaccount_lock_;  // a lock around checked_for_localaccount_.
 
+  GoogleServiceAuthError last_error_;
+
   friend class GoogleAuthenticatorTest;
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, SaltToAscii);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, CheckTwoFactorResponse);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, CheckNormalErrorCode);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, EmailAddressNoOp);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, EmailAddressIgnoreCaps);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
                            EmailAddressIgnoreDomainCaps);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest,
                            EmailAddressIgnoreOneUsernameDot);
@@ skipping 15 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, LoginNetFailure);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, LoginDenied);
   FRIEND_TEST_ALL_PREFIXES(GoogleAuthenticatorTest, TwoFactorLogin);
 
   DISALLOW_COPY_AND_ASSIGN(GoogleAuthenticator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_GOOGLE_AUTHENTICATOR_H_