Replace string16 with base::string16.

chrome/browser/chromeos/login/user_manager_impl.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/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 617 matching lines @@
     User::OAuthTokenStatus result =
         static_cast<User::OAuthTokenStatus>(oauth_token_status);
     if (result == User::OAUTH2_TOKEN_STATUS_INVALID)
       GetUserFlow(user_id)->HandleOAuthTokenStatusChange(result);
     return result;
   }
   return User::OAUTH_TOKEN_STATUS_UNKNOWN;
 }
 
 void UserManagerImpl::SaveUserDisplayName(const std::string& user_id,
-                                          const string16& display_name) {
+                                          const base::string16& display_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (User* user = FindUserAndModify(user_id)) {
     user->set_display_name(display_name);
 
     // Do not update local store if data stored or cached outside the user's
     // cryptohome is to be treated as ephemeral.
     if (!IsUserNonCryptohomeDataEphemeral(user_id)) {
       PrefService* local_state = g_browser_process->local_state();
 
       DictionaryPrefUpdate display_name_update(local_state, kUserDisplayName);
       display_name_update->SetWithoutPathExpansion(
           user_id,
           new base::StringValue(display_name));
 
       supervised_user_manager_->UpdateManagerName(user_id, display_name);
     }
   }
 }
 
 string16 UserManagerImpl::GetUserDisplayName(
     const std::string& user_id) const {
   const User* user = FindUser(user_id);
-  return user ? user->display_name() : string16();
+  return user ? user->display_name() : base::string16();
 }
 
 void UserManagerImpl::SaveUserDisplayEmail(const std::string& user_id,
                                            const std::string& display_email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   User* user = FindUserAndModify(user_id);
   if (!user)
     return;  // Ignore if there is no such user.
 
@@ skipping 19 matching lines @@
 }
 
 void UserManagerImpl::UpdateUserAccountData(
     const std::string& user_id,
     const UserAccountData& account_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   SaveUserDisplayName(user_id, account_data.display_name());
 
   if (User* user = FindUserAndModify(user_id)) {
-    string16 given_name = account_data.given_name();
+    base::string16 given_name = account_data.given_name();
     user->set_given_name(given_name);
     if (!IsUserNonCryptohomeDataEphemeral(user_id)) {
       PrefService* local_state = g_browser_process->local_state();
 
       DictionaryPrefUpdate given_name_update(local_state, kUserGivenName);
       given_name_update->SetWithoutPathExpansion(
           user_id,
           new base::StringValue(given_name));
     }
   }
@@ skipping 326 matching lines @@
        it != regular_users.end(); ++it) {
     User* user = NULL;
     const std::string domain = gaia::ExtractDomainName(*it);
     if (domain == UserManager::kLocallyManagedUserDomain)
       user = User::CreateLocallyManagedUser(*it);
     else
       user = User::CreateRegularUser(*it);
     user->set_oauth_token_status(LoadUserOAuthStatus(*it));
     users_.push_back(user);
 
-    string16 display_name;
+    base::string16 display_name;
     if (prefs_display_names->GetStringWithoutPathExpansion(*it,
                                                            &display_name)) {
       user->set_display_name(display_name);
     }
 
-    string16 given_name;
+    base::string16 given_name;
     if (prefs_given_names->GetStringWithoutPathExpansion(*it, &given_name)) {
       user->set_given_name(given_name);
     }
 
     std::string display_email;
     if (prefs_display_emails->GetStringWithoutPathExpansion(*it,
                                                             &display_email)) {
       user->set_display_email(display_email);
     }
   }
@@ skipping 756 matching lines @@
 
 void UserManagerImpl::DoUpdateAccountLocale(
     const std::string& user_id,
     const std::string& resolved_locale) {
   if (User* user = FindUserAndModify(user_id))
     user->SetAccountLocale(resolved_locale);
 }
 
 
 }  // namespace chromeos