Make supervised user ChromeOS import aware of new password schema.

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 54 matching lines @@
 
 ManagedUserCreationControllerNew::UserCreationContext::UserCreationContext() {}
 
 ManagedUserCreationControllerNew::UserCreationContext::~UserCreationContext() {}
 
 void ManagedUserCreationControllerNew::SetManagerProfile(
     Profile* manager_profile) {
   creation_context_->manager_profile = manager_profile;
 }
 
+Profile* ManagedUserCreationControllerNew::GetManagerProfile() {
+  return creation_context_->manager_profile;
+}
+
 void ManagedUserCreationControllerNew::StartCreation(
     const base::string16& display_name,
     const std::string& password,
     int avatar_index) {
   DCHECK(creation_context_);
   creation_context_->creation_type = NEW_USER;
   creation_context_->display_name = display_name;
   creation_context_->password = password;
   creation_context_->avatar_index = avatar_index;
   StartCreationImpl();
@@ skipping 13 matching lines @@
   creation_context_->avatar_index = avatar_index;
 
   creation_context_->sync_user_id = sync_id;
 
   creation_context_->master_key = master_key;
   StartCreationImpl();
 }
 
 void ManagedUserCreationControllerNew::StartImport(
     const base::string16& display_name,
-    const std::string& password,
     int avatar_index,
     const std::string& sync_id,
     const std::string& master_key,
     const base::DictionaryValue* password_data,
     const std::string& encryption_key,
     const std::string& signature_key) {
   DCHECK(creation_context_);
-  creation_context_->creation_type = USER_IMPORT_OLD;
+  creation_context_->creation_type = USER_IMPORT_NEW;
 
   creation_context_->display_name = display_name;
-  creation_context_->password = password;
+
   creation_context_->avatar_index = avatar_index;
 
   creation_context_->sync_user_id = sync_id;
 
   creation_context_->master_key = master_key;
 
   password_data->GetStringWithoutPathExpansion(
       kEncryptedPassword, &creation_context_->salted_password);
 
   creation_context_->signature_key = signature_key;
@@ skipping 254 matching lines @@
   creation_context_->registration_utility.reset();
   chrome::AttemptUserExit();
 }
 
 std::string ManagedUserCreationControllerNew::GetManagedUserId() {
   DCHECK(creation_context_);
   return creation_context_->local_user_id;
 }
 
 }  // namespace chromeos