MD Settings: CrOS: Users: Fix names

chrome/browser/chromeos/extensions/users_private/users_private_api.cc

Index: chrome/browser/chromeos/extensions/users_private/users_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
index 4026e98cdd6cec2e7c2148d92b4fc530b5695973..df92a3c216bec1f5a1a600c745f6199746439460 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include "base/memory/ptr_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate.h"
@@ -99,8 +100,12 @@ UsersPrivateGetWhitelistedUsersFunction::Run() {
   for (size_t i = 0; i < email_list->GetSize(); ++i) {
     api::users_private::User user;
     email_list->GetString(i, &user.email);
-    user.name =
-        user_manager->GetUserDisplayEmail(AccountId::FromUserEmail(user.email));
+    AccountId account_id = AccountId::FromUserEmail(user.email);
+    user.name = base::UTF16ToUTF8(user_manager->GetUserDisplayName(account_id));
+    if (user.name.empty()) {
+      // User is not associated with a gaia account.

[michaelpg, 2017/04/06 14:50:29]

what cases don't have gaia accounts or display names?

[stevenjb, 2017/04/06 16:27:58]

I'm not really sure, just making sure we are consistent with previous behavior.
In theory it is possible to log into chromiumos with a non google account,
although I don't know whether that has been implemented in practice.

+      user.name = user_manager->GetUserDisplayEmail(account_id);
+    }
     user.is_owner = chromeos::ProfileHelper::IsOwnerProfile(profile) &&
                     user.email == profile->GetProfileUserName();
     user_list->Append(user.ToValue());