Replace string16 with base::string16.

chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc

 // Copyright (c) 2012 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_controller.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 66 matching lines @@
   creation_context_.reset(
       new LocallyManagedUserCreationController::UserCreationContext());
   creation_context_->manager_id = manager_id;
 }
 
 LocallyManagedUserCreationController::~LocallyManagedUserCreationController() {
   current_controller_ = NULL;
 }
 
 void LocallyManagedUserCreationController::SetUpCreation(
-    const string16& display_name,
+    const base::string16& display_name,
     const std::string& password,
     int avatar_index) {
   DCHECK(creation_context_);
   creation_context_->display_name = display_name;
   creation_context_->password = password;
   creation_context_->avatar_index = avatar_index;
 }
 
 void LocallyManagedUserCreationController::StartImport(
-    const string16& display_name,
+    const base::string16& display_name,
     const std::string& password,
     int avatar_index,
     const std::string& sync_id,
     const std::string& master_key) {
   DCHECK(creation_context_);
   creation_context_->creation_type = USER_IMPORT;
   creation_context_->display_name = display_name;
   creation_context_->password = password;
   creation_context_->avatar_index = avatar_index;
   creation_context_->sync_user_id = sync_id;
@@ skipping 172 matching lines @@
   // sync service fails to use it.
   UserManager::Get()->SaveUserOAuthStatus(creation_context_->local_user_id,
                                           User::OAUTH2_TOKEN_STATUS_VALID);
   UserManager::Get()->GetSupervisedUserManager()->
       CommitCreationTransaction();
   if (consumer_)
     consumer_->OnCreationSuccess();
 }
 
 }  // namespace chromeos