Replace string16 with base::string16.

chrome/browser/chromeos/login/user.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/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 132 matching lines @@
 }
 
 bool UserContext::operator==(const UserContext& context) const {
   return context.username == username &&
          context.password == password &&
          context.auth_code == auth_code &&
          context.username_hash == username_hash &&
          context.using_oauth == using_oauth;
 }
 
-string16 User::GetDisplayName() const {
+base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ?
       UTF8ToUTF16(GetAccountName(true)) :
       display_name_;
 }
 
 std::string User::GetAccountName(bool use_display_email) const {
   if (use_display_email && !display_email_.empty())
     return GetUserName(display_email_);
   else
@@ skipping 177 matching lines @@
     case USER_TYPE_LOCALLY_MANAGED:
     case USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace chromeos