| Index: chrome/browser/chromeos/login/parallel_authenticator.h
 | 
| diff --git a/chrome/browser/chromeos/login/parallel_authenticator.h b/chrome/browser/chromeos/login/parallel_authenticator.h
 | 
| index 46a77a7ef362edd4fdf8eab84ff49b124047bca0..ae1de806e11619385c05cb665356a4d6ad849161 100644
 | 
| --- a/chrome/browser/chromeos/login/parallel_authenticator.h
 | 
| +++ b/chrome/browser/chromeos/login/parallel_authenticator.h
 | 
| @@ -73,8 +73,7 @@ class ParallelAuthenticator : public Authenticator,
 | 
|  
 | 
|    // Authenticator overrides.
 | 
|    virtual void CompleteLogin(Profile* profile,
 | 
| -                             const std::string& username,
 | 
| -                             const std::string& password) OVERRIDE;
 | 
| +                             const UserCredentials& credentials) OVERRIDE;
 | 
|  
 | 
|    // Given a |username| and |password|, this method attempts to authenticate to
 | 
|    // the Google accounts servers and your Chrome OS device simultaneously.
 | 
| @@ -102,23 +101,22 @@ class ParallelAuthenticator : public Authenticator,
 | 
|    // we are asked to authenticate valid HOSTED account creds, we will
 | 
|    // call OnLoginFailure() with HOSTED_NOT_ALLOWED.
 | 
|    virtual void AuthenticateToLogin(Profile* profile,
 | 
| -                                   const std::string& username,
 | 
| -                                   const std::string& password,
 | 
| +                                   const UserCredentials& credentials,
 | 
|                                     const std::string& login_token,
 | 
|                                     const std::string& login_captcha) OVERRIDE;
 | 
|  
 | 
| -  // Given a |username| and |password|, this method attempts to
 | 
| -  // authenticate to the cached credentials. This will never contact
 | 
| -  // the server even if it's online. The auth result is sent to
 | 
| -  // LoginStatusConsumer in a same way as AuthenticateToLogin does.
 | 
| -  virtual void AuthenticateToUnlock(const std::string& username,
 | 
| -                                    const std::string& password) OVERRIDE;
 | 
| +  // Given |credentials|, this method attempts to authenticate to the cached
 | 
| +  // credentials. This will never contact the server even if it's online.
 | 
| +  // The auth result is sent to LoginStatusConsumer in a same way as
 | 
| +  // AuthenticateToLogin does.
 | 
| +  virtual void AuthenticateToUnlock(
 | 
| +      const UserCredentials& credentials) OVERRIDE;
 | 
|  
 | 
|    // Initiates locally managed user login.
 | 
|    // Creates cryptohome if missing or mounts existing one and
 | 
|    // notifies consumer on the success/failure.
 | 
| -  virtual void LoginAsLocallyManagedUser(const std::string& username,
 | 
| -                                         const std::string& password) OVERRIDE;
 | 
| +  virtual void LoginAsLocallyManagedUser(
 | 
| +      const UserCredentials& credentials) OVERRIDE;
 | 
|  
 | 
|    // Initiates retail mode login.
 | 
|    // Mounts tmpfs and notifies consumer on the success/failure.
 | 
| @@ -142,8 +140,7 @@ class ParallelAuthenticator : public Authenticator,
 | 
|        const std::string& old_password) OVERRIDE;
 | 
|    virtual void ResyncEncryptedData() OVERRIDE;
 | 
|    virtual void RetryAuth(Profile* profile,
 | 
| -                         const std::string& username,
 | 
| -                         const std::string& password,
 | 
| +                         const UserCredentials& credentials,
 | 
|                           const std::string& login_token,
 | 
|                           const std::string& login_captcha) OVERRIDE;
 | 
|    // AuthAttemptStateResolver overrides.
 | 
| 
 |