Replace string16 with base::string16.

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index c71fb3be44f396644613db485bb075cf162c7f07..e1f6c83fd0850202b6b6977f6b2b76c2d5424919 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -424,9 +424,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     return enterprise_domain_;
   }
 
-  virtual const string16 GetEnterpriseMessage() const OVERRIDE {
+  virtual const base::string16 GetEnterpriseMessage() const OVERRIDE {
     if (GetEnterpriseDomain().empty())
-        return string16();
+        return base::string16();
     return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
                                       UTF8ToUTF16(GetEnterpriseDomain()));
   }
@@ -439,17 +439,17 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
             chromeos::UserManager::Get()->GetActiveUser()->email());
   }
 
-  virtual const string16 GetLocallyManagedUserManagerName() const OVERRIDE {
+  virtual const base::string16 GetLocallyManagedUserManagerName() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
-      return string16();
+      return base::string16();
     return UserManager::Get()->GetSupervisedUserManager()->
         GetManagerDisplayName(
             chromeos::UserManager::Get()->GetActiveUser()->email());
   }
 
-  virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
+  virtual const base::string16 GetLocallyManagedUserMessage() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
-        return string16();
+        return base::string16();
     return l10n_util::GetStringFUTF16(
         IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
         UTF8ToUTF16(GetLocallyManagedUserManager()));