Tame the proliferation of UserContext constructors

chrome/browser/chromeos/login/auth/auth_attempt_state.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/auth_attempt_state.h"
 
 #include <string>
 
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 AuthAttemptState::AuthAttemptState(const UserContext& user_context,
-                                   const std::string& login_token,
-                                   const std::string& login_captcha,
-                                   const User::UserType user_type,
-                                   const bool user_is_new)
+                                   User::UserType user_type,
+                                   bool unlock,
+                                   bool online_complete,
+                                   bool user_is_new)
     : user_context(user_context),
-      login_token(login_token),
-      login_captcha(login_captcha),
       user_type(user_type),
-      unlock(false),
-      online_complete_(false),
-      online_outcome_(LoginFailure::NONE),
+      unlock(unlock),
+      online_complete_(online_complete),
+      online_outcome_(online_complete ? LoginFailure::UNLOCK_FAILED :
+                                        LoginFailure::NONE),
       hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
       is_first_time_user_(user_is_new),
       cryptohome_complete_(false),
       cryptohome_outcome_(false),
       cryptohome_code_(cryptohome::MOUNT_ERROR_NONE),
       username_hash_obtained_(true),
       username_hash_valid_(true) {
 }
 
-AuthAttemptState::AuthAttemptState(const std::string& username,
-                                   const std::string& password)
-    : user_context(username, password, ""),
-      user_type(User::USER_TYPE_REGULAR),
-      unlock(true),
-      online_complete_(true),
-      online_outcome_(LoginFailure::UNLOCK_FAILED),
-      hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
-      is_first_time_user_(false),
-      cryptohome_complete_(false),
-      cryptohome_outcome_(false),
-      cryptohome_code_(cryptohome::MOUNT_ERROR_NONE),
-      username_hash_obtained_(true) {
-}
-
-AuthAttemptState::AuthAttemptState(const UserContext& user_context,
-                                   const bool user_is_new)
-    : user_context(user_context),
-      user_type(User::USER_TYPE_REGULAR),
-      unlock(true),
-      online_complete_(false),
-      online_outcome_(LoginFailure::NONE),
-      hosted_policy_(GaiaAuthFetcher::HostedAccountsAllowed),
-      is_first_time_user_(user_is_new),
-      cryptohome_complete_(false),
-      cryptohome_outcome_(false),
-      cryptohome_code_(cryptohome::MOUNT_ERROR_NONE),
-      username_hash_obtained_(true) {
-}
-
 AuthAttemptState::~AuthAttemptState() {}
 
 void AuthAttemptState::RecordOnlineLoginStatus(
     const LoginFailure& outcome) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   online_complete_ = true;
   online_outcome_ = outcome;
   // We're either going to not try again, or try again with HOSTED
   // accounts not allowed, so just set this here.
   DisableHosted();
@@ skipping 77 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return username_hash_obtained_;
 }
 
 bool AuthAttemptState::username_hash_valid() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return username_hash_obtained_;
 }
 
 }  // namespace chromeos