Tame the proliferation of UserContext constructors

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // Copyright (c) 2013 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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1126 matching lines @@
                                               const std::string& password,
                                               bool using_saml) {
   if (!delegate_)
     return;
 
   if (using_saml && !using_saml_api_)
     RecordSAMLScrapingVerificationResultInHistogram(true);
 
   const std::string sanitized_email = gaia::SanitizeEmail(typed_email);
   delegate_->SetDisplayEmail(sanitized_email);
-  delegate_->CompleteLogin(UserContext(
-      sanitized_email,
-      password,
-      std::string(),  // auth_code
-      std::string(),  // username_hash
-      true,           // using_oauth
-      using_saml ? UserContext::AUTH_FLOW_GAIA_WITH_SAML
-                 : UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML));
+  UserContext user_context(sanitized_email);
+  user_context.SetPassword(password);
+  user_context.SetAuthFlow(using_saml ?
+      UserContext::AUTH_FLOW_GAIA_WITH_SAML :
+      UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
+  delegate_->CompleteLogin(user_context);
 
   if (test_expects_complete_login_) {
     VLOG(2) << "Complete test login for " << typed_email
             << ", requested=" << test_user_;
 
     test_expects_complete_login_ = false;
     test_user_.clear();
     test_pass_.clear();
   }
 }
 
 void SigninScreenHandler::HandleCompleteAuthentication(
     const std::string& email,
     const std::string& password,
     const std::string& auth_code) {
   if (!delegate_)
     return;
-  const std::string sanitized_email = gaia::SanitizeEmail(email);
-  delegate_->SetDisplayEmail(sanitized_email);
-  delegate_->CompleteLogin(UserContext(sanitized_email, password, auth_code));
+  delegate_->SetDisplayEmail(gaia::SanitizeEmail(email));
+  UserContext user_context(email);
+  user_context.SetPassword(password);
+  user_context.SetAuthCode(auth_code);
+  delegate_->CompleteLogin(user_context);
 }
 
 void SigninScreenHandler::HandleAuthenticateUser(const std::string& username,
                                                  const std::string& password) {
   if (!delegate_)
     return;
-  delegate_->Login(UserContext(gaia::SanitizeEmail(username),
-                               password,
-                               std::string()));  // auth_code
+  UserContext user_context(username);
+  user_context.SetPassword(password);
+  delegate_->Login(user_context);
 }
 
 void SigninScreenHandler::HandleLaunchDemoUser() {
   if (delegate_)
     delegate_->LoginAsRetailModeUser();
 }
 
 void SigninScreenHandler::HandleLaunchIncognito() {
   if (delegate_)
     delegate_->LoginAsGuest();
@@ skipping 591 matching lines @@
   DCHECK(gaia_screen_handler_);
   return gaia_screen_handler_->frame_state();
 }
 
 net::Error SigninScreenHandler::FrameError() const {
   DCHECK(gaia_screen_handler_);
   return gaia_screen_handler_->frame_error();
 }
 
 }  // namespace chromeos