Tame the proliferation of UserContext constructors

chrome/browser/chromeos/login/auth/online_attempt_host.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 "chrome/browser/chromeos/login/auth/online_attempt_host.h"
 
 #include "base/bind.h"
 #include "base/sha1.h"
 #include "chrome/browser/chromeos/login/auth/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/auth/online_attempt.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
-#include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
 
 OnlineAttemptHost::OnlineAttemptHost(Delegate* delegate)
     : delegate_(delegate), weak_ptr_factory_(this) {}
 
 OnlineAttemptHost::~OnlineAttemptHost() {
   Reset();
 }
 
 void OnlineAttemptHost::Check(Profile* profile,
                               const UserContext& user_context) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   std::string attempt_hash = base::SHA1HashString(
       user_context.GetUserID() + "\n" + user_context.GetPassword());
   if (attempt_hash != current_attempt_hash_) {
     Reset();
     current_attempt_hash_ = attempt_hash;
     current_username_ = user_context.GetUserID();
 
-    state_.reset(
-        new AuthAttemptState(
-            UserContext(gaia::CanonicalizeEmail(user_context.GetUserID()),
-                        user_context.GetPassword(),
-                        user_context.GetAuthCode()),
-            std::string(),  // login_token
-            std::string(),  // login_captcha
-            User::USER_TYPE_REGULAR,
-            false));  // user_is_new.
-    online_attempt_.reset(new OnlineAttempt(state_.get(),
-                                            this));
+    state_.reset(new AuthAttemptState(user_context,
+                                      User::USER_TYPE_REGULAR,
+                                      false,    // unlock
+                                      false,    // online_complete
+                                      false));  // user_is_new
+    online_attempt_.reset(new OnlineAttempt(state_.get(), this));
     online_attempt_->Initiate(profile);
   }
 }
 
 void OnlineAttemptHost::Reset() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   online_attempt_.reset(NULL);
   current_attempt_hash_.clear();
   current_username_.clear();
 }
@@ skipping 11 matching lines @@
   }
 }
 
 void OnlineAttemptHost::ResolveOnUIThread(bool success) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   delegate_->OnChecked(current_username_, success);
   Reset();
 }
 
 }  // namespace chromeos