| Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc
|
| index 80006dc5b51aa0dbe50eee1e4d7acf1b227e6f07..6da94f90495f0e01997ee874cbcfcd07980f925d 100644
|
| --- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc
|
| +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc
|
| @@ -84,7 +84,7 @@ LocallyManagedUserCreationController::~LocallyManagedUserCreationController() {
|
| }
|
|
|
| void LocallyManagedUserCreationController::SetUpCreation(
|
| - const string16& display_name,
|
| + const base::string16& display_name,
|
| const std::string& password,
|
| int avatar_index) {
|
| DCHECK(creation_context_);
|
| @@ -94,7 +94,7 @@ void LocallyManagedUserCreationController::SetUpCreation(
|
| }
|
|
|
| void LocallyManagedUserCreationController::StartImport(
|
| - const string16& display_name,
|
| + const base::string16& display_name,
|
| const std::string& password,
|
| int avatar_index,
|
| const std::string& sync_id,
|
|
|