Update Managed user strings for ChromeOS

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 d17df61b0c6f5268e0183e218044427e73366dfd..3272275225d9aee0405b43c2b8f3d333e8990c60 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -464,12 +464,18 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
         chromeos::UserManager::Get()->GetActiveUser()->email());
   }
 
+  virtual const string16 GetLocallyManagedUserManagerName() const OVERRIDE {
+    if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
+      return string16();
+    return UserManager::Get()->GetManagerDisplayNameForManagedUser(
+        chromeos::UserManager::Get()->GetActiveUser()->email());
+  }
+
   virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
         return string16();
     return l10n_util::GetStringFUTF16(IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
-                                      UTF8ToUTF16(
-                                          GetLocallyManagedUserManager()));
+                                      GetLocallyManagedUserManagerName());
   }
 
   virtual bool SystemShouldUpgrade() const OVERRIDE {