Make supervised user ChromeOS import aware of new password schema.

chrome/browser/chromeos/login/managed/managed_user_creation_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 57 matching lines @@
 
   // Configures and initiates importing existing supervised user to this device.
   // Existing user is identified by |sync_id|, has |display_name|, |password|,
   // |avatar_index|. The master key for cryptohome is a |master_key|.
   virtual void StartImport(const base::string16& display_name,
                            const std::string& password,
                            int avatar_index,
                            const std::string& sync_id,
                            const std::string& master_key) = 0;
 
+  // Configures and initiates importing existing supervised user to this device.
+  // Existing user is identified by |sync_id|, has |display_name|,
+  // |avatar_index|. The master key for cryptohome is a |master_key|. The user
+  // has password specified in |password_data| and
+  // |encryption_key|/|signature_key| for cryptohome.
+  virtual void StartImport(const base::string16& display_name,
+                           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) = 0;
+
   virtual void SetManagerProfile(Profile* manager_profile) = 0;
+  virtual Profile* GetManagerProfile() = 0;
   virtual void CancelCreation() = 0;
   virtual void FinishCreation() = 0;
   virtual std::string GetManagedUserId() = 0;
 
  protected:
   // Pointer to the current instance of the controller to be used by
   // automation tests.
   static ManagedUserCreationController* current_controller_;
 
   StatusConsumer* consumer_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManagedUserCreationController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_MANAGED_USER_CREATION_CONTROLLER_H_