Replace string16 with base::string16.

chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.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/chromeos/login/managed/locally_managed_user_creation_screen.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/rand_util.h"
@@ skipping 173 matching lines @@
   controller_.reset();
   controller_.reset(new LocallyManagedUserCreationController(this, manager_id));
 
   ExistingUserController::current_controller()->
       Login(UserContext(manager_id,
                         manager_password,
                         std::string()  /* auth_code */));
 }
 
 void LocallyManagedUserCreationScreen::CreateManagedUser(
-    const string16& display_name,
+    const base::string16& display_name,
     const std::string& managed_user_password) {
   DCHECK(controller_.get());
   int image;
   if (selected_image_ == User::kExternalImageIndex)
     // TODO(dzhioev): crbug/249660
     image = LocallyManagedUserCreationController::kDummyAvatarIndex;
   else
     image = selected_image_;
   controller_->SetUpCreation(display_name, managed_user_password, image);
   controller_->StartCreation();
 }
 
 void LocallyManagedUserCreationScreen::ImportManagedUser(
     const std::string& user_id) {
   DCHECK(controller_.get());
   DCHECK(existing_users_.get());
   VLOG(1) << "Importing user " << user_id;
   DictionaryValue* user_info;
   if (!existing_users_->GetDictionary(user_id, &user_info)) {
     LOG(ERROR) << "Can not import non-existing user " << user_id;
     return;
   }
-  string16 display_name;
+  base::string16 display_name;
   std::string master_key;
   std::string avatar;
   bool exists;
   int avatar_index = LocallyManagedUserCreationController::kDummyAvatarIndex;
   user_info->GetString(ManagedUserSyncService::kName, &display_name);
   user_info->GetString(ManagedUserSyncService::kMasterKey, &master_key);
   user_info->GetString(ManagedUserSyncService::kChromeOsAvatar, &avatar);
   user_info->GetBoolean(kUserExists, &exists);
 
   // We should not get here with existing user selected, so just display error.
@@ skipping 23 matching lines @@
     const std::string& user_id,
     const std::string& password) {
   DCHECK(controller_.get());
   DCHECK(existing_users_.get());
   VLOG(1) << "Importing user " << user_id;
   DictionaryValue* user_info;
   if (!existing_users_->GetDictionary(user_id, &user_info)) {
     LOG(ERROR) << "Can not import non-existing user " << user_id;
     return;
   }
-  string16 display_name;
+  base::string16 display_name;
   std::string master_key;
   std::string avatar;
   bool exists;
   int avatar_index = LocallyManagedUserCreationController::kDummyAvatarIndex;
   user_info->GetString(ManagedUserSyncService::kName, &display_name);
   user_info->GetString(ManagedUserSyncService::kMasterKey, &master_key);
   user_info->GetString(ManagedUserSyncService::kChromeOsAvatar, &avatar);
   user_info->GetBoolean(kUserExists, &exists);
 
   // We should not get here with existing user selected, so just display error.
@@ skipping 54 matching lines @@
 }
 
 void LocallyManagedUserCreationScreen::OnActorDestroyed(
     LocallyManagedUserCreationScreenHandler* actor) {
   if (actor_ == actor)
     actor_ = NULL;
 }
 
 void LocallyManagedUserCreationScreen::OnCreationError(
     LocallyManagedUserCreationController::ErrorCode code) {
-  string16 title;
-  string16 message;
-  string16 button;
+  base::string16 title;
+  base::string16 message;
+  base::string16 button;
   // TODO(antrim) : find out which errors do we really have.
   // We might reuse some error messages from ordinary user flow.
   switch (code) {
     case LocallyManagedUserCreationController::CRYPTOHOME_NO_MOUNT:
     case LocallyManagedUserCreationController::CRYPTOHOME_FAILED_MOUNT:
     case LocallyManagedUserCreationController::CRYPTOHOME_FAILED_TPM:
       title = l10n_util::GetStringUTF16(
           IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR_TITLE);
       message = l10n_util::GetStringUTF16(
           IDS_CREATE_LOCALLY_MANAGED_USER_TPM_ERROR);
@@ skipping 24 matching lines @@
 }
 
 void LocallyManagedUserCreationScreen::OnLongCreationWarning() {
   if (actor_) {
     actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
         IDS_PROFILES_CREATE_MANAGED_JUST_SIGNED_IN));
   }
 }
 
 bool LocallyManagedUserCreationScreen::FindUserByDisplayName(
-    const string16& display_name,
+    const base::string16& display_name,
     std::string *out_id) const {
   if (!existing_users_.get())
     return false;
   for (base::DictionaryValue::Iterator it(*existing_users_.get());
        !it.IsAtEnd(); it.Advance()) {
     const base::DictionaryValue* user_info =
         static_cast<const base::DictionaryValue*>(&it.value());
-    string16 user_display_name;
+    base::string16 user_display_name;
     if (user_info->GetString(ManagedUserSyncService::kName,
                              &user_display_name)) {
       if (display_name == user_display_name) {
         if (out_id)
           *out_id = it.key();
         return true;
       }
     }
   }
   return false;
@@ skipping 77 matching lines @@
       local_copy->SetString(
           ManagedUserSyncService::kChromeOsAvatar,
           ManagedUserSyncService::BuildAvatarString(i));
       local_copy->SetBoolean(kRandomAvatarKey, true);
       ui_copy->SetString(kAvatarURLKey, GetDefaultImageUrl(i));
     }
 
     local_copy->SetBoolean(kUserExists, false);
     ui_copy->SetBoolean(kUserExists, false);
 
-    string16 display_name;
+    base::string16 display_name;
     local_copy->GetString(ManagedUserSyncService::kName, &display_name);
 
     if (supervised_user_manager->FindBySyncId(it.key())) {
       local_copy->SetBoolean(kUserExists, true);
       ui_copy->SetBoolean(kUserExists, true);
       local_copy->SetString(kUserConflict, kUserConflictImported);
       ui_copy->SetString(kUserConflict, kUserConflictImported);
     } else if (supervised_user_manager->FindByDisplayName(display_name)) {
       local_copy->SetBoolean(kUserExists, true);
       ui_copy->SetBoolean(kUserExists, true);
@@ skipping 52 matching lines @@
     selected_image_ = User::kExternalImageIndex;
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
 }
 
 void LocallyManagedUserCreationScreen::OnImageAccepted() {
 }
 
 }  // namespace chromeos