Tame the proliferation of UserContext constructors

chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.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/managed/managed_user_creation_controller_new.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 249 matching lines @@
   // Plain text password, hashed and salted with individual salt.
   // It can be used for mounting homedir, and can be replaced only when signed.
   cryptohome::KeyDefinition password_key(creation_context_->salted_password,
                                          kCryptohomeManagedUserKeyLabel,
                                          kCryptohomeManagedUserKeyPrivileges);
   base::Base64Decode(creation_context_->encryption_key,
                      &password_key.encryption_key);
   base::Base64Decode(creation_context_->signature_key,
                      &password_key.signature_key);
 
-  UserContext context(creation_context_->local_user_id,
-                      creation_context_->salted_master_key,
-                      std::string());
-  context.SetIsUsingOAuth(false);
+  UserContext context(creation_context_->local_user_id);
+  context.SetPassword(creation_context_->salted_master_key);
   context.SetDoesNeedPasswordHashing(false);
   context.SetKeyLabel(kCryptohomeMasterKeyLabel);
+  context.SetIsUsingOAuth(false);
 
   authenticator_->AddKey(
       context,
       password_key,
       true,
       base::Bind(&ManagedUserCreationControllerNew::OnAddKeySuccess,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ManagedUserCreationControllerNew::OnAddKeySuccess() {
@@ skipping 101 matching lines @@
   creation_context_->registration_utility.reset();
   chrome::AttemptUserExit();
 }
 
 std::string ManagedUserCreationControllerNew::GetManagedUserId() {
   DCHECK(creation_context_);
   return creation_context_->local_user_id;
 }
 
 }  // namespace chromeos