| Index: chrome/browser/chromeos/login/online_attempt_host.cc
|
| diff --git a/chrome/browser/chromeos/login/online_attempt_host.cc b/chrome/browser/chromeos/login/online_attempt_host.cc
|
| index 7c21186aea3f05c09c3706838028482c1198c124..801c8f447e71e91132f0c385cf8f112ebbf59447 100644
|
| --- a/chrome/browser/chromeos/login/online_attempt_host.cc
|
| +++ b/chrome/browser/chromeos/login/online_attempt_host.cc
|
| @@ -24,24 +24,25 @@ OnlineAttemptHost::~OnlineAttemptHost() {
|
| }
|
|
|
| void OnlineAttemptHost::Check(Profile* profile,
|
| - const std::string& username,
|
| - const std::string& password) {
|
| + const UserCredentials& credentials) {
|
| DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
| - std::string attempt_hash = base::SHA1HashString(username + "\n" + password);
|
| + std::string attempt_hash = base::SHA1HashString(
|
| + credentials.username + "\n" + credentials.password);
|
| if (attempt_hash != current_attempt_hash_) {
|
| Reset();
|
| current_attempt_hash_ = attempt_hash;
|
| - current_username_ = username;
|
| + current_username_ = credentials.username;
|
|
|
| state_.reset(
|
| new AuthAttemptState(
|
| - gaia::CanonicalizeEmail(username),
|
| - password,
|
| - std::string(),
|
| - std::string(),
|
| - std::string(),
|
| + UserCredentials(gaia::CanonicalizeEmail(credentials.username),
|
| + credentials.password,
|
| + credentials.auth_code),
|
| + std::string(), // ascii_hash
|
| + std::string(), // login_token
|
| + std::string(), // login_captcha
|
| User::USER_TYPE_REGULAR,
|
| - false)); // Isn't a new user.
|
| + false)); // user_is_new.
|
| online_attempt_.reset(new OnlineAttempt(state_.get(),
|
| this));
|
| online_attempt_->Initiate(profile);
|
|
|