Replace string16 with base::string16.

chrome/browser/chromeos/login/user_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/base/locale_util.h"
@@ skipping 41 matching lines @@
     // Called when UserManager finishes restoring user sessions after crash.
     virtual void PendingUserSessionsRestoreFinished();
 
    protected:
     virtual ~UserSessionStateObserver();
   };
 
   // Data retrieved from user account.
   class UserAccountData {
    public:
-    UserAccountData(const string16& display_name,
-                    const string16& given_name,
+    UserAccountData(const base::string16& display_name,
+                    const base::string16& given_name,
                     const std::string& locale);
     ~UserAccountData();
-    const string16& display_name() const { return display_name_; }
-    const string16& given_name() const { return given_name_; }
+    const base::string16& display_name() const { return display_name_; }
+    const base::string16& given_name() const { return given_name_; }
     const std::string& locale() const { return locale_; }
 
    private:
-    const string16 display_name_;
-    const string16 given_name_;
+    const base::string16 display_name_;
+    const base::string16 given_name_;
     const std::string locale_;
 
     DISALLOW_COPY_AND_ASSIGN(UserAccountData);
   };
 
   // Username for stub login when not running on ChromeOS.
   static const char kStubUser[];
 
   // Magic e-mail addresses are bad. They exist here because some code already
   // depends on them and it is hard to figure out what. Any user types added in
@@ skipping 138 matching lines @@
   virtual Profile* GetProfileByUser(const User* user) const = 0;
 
   // Saves user's oauth token status in local state preferences.
   virtual void SaveUserOAuthStatus(
       const std::string& user_id,
       User::OAuthTokenStatus oauth_token_status) = 0;
 
   // Saves user's displayed name in local state preferences.
   // Ignored If there is no such user.
   virtual void SaveUserDisplayName(const std::string& user_id,
-                                   const string16& display_name) = 0;
+                                   const base::string16& display_name) = 0;
 
   // Updates data upon User Account download.
   virtual void UpdateUserAccountData(const std::string& user_id,
                                      const UserAccountData& account_data) = 0;
 
   // Returns the display name for user |user_id| if it is known (was
   // previously set by a |SaveUserDisplayName| call).
   // Otherwise, returns an empty string.
-  virtual string16 GetUserDisplayName(
+  virtual base::string16 GetUserDisplayName(
       const std::string& user_id) const = 0;
 
   // Saves user's displayed (non-canonical) email in local state preferences.
   // Ignored If there is no such user.
   virtual void SaveUserDisplayEmail(const std::string& user_id,
                                     const std::string& display_email) = 0;
 
   // Returns the display email for user |user_id| if it is known (was
   // previously set by a |SaveUserDisplayEmail| call).
   // Otherwise, returns |user_id| itself.
@@ skipping 139 matching lines @@
   ScopedTestUserManager();
   ~ScopedTestUserManager();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_