MD Settings: People: Show correct user name

chrome/browser/ui/webui/settings/profile_info_handler.cc

 // Copyright 2016 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/ui/webui/settings/profile_info_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 170 matching lines @@
       base::Value(kProfileManagesSupervisedUsersChangedEventName),
       base::Value(IsProfileManagingSupervisedUsers()));
 }
 
 std::unique_ptr<base::DictionaryValue>
 ProfileInfoHandler::GetAccountNameAndIcon() const {
   std::string name;
   std::string icon_url;
 
 #if defined(OS_CHROMEOS)
-  name = profile_->GetProfileUserName();
-  std::string user_email;
-  if (name.empty()) {
-    // User is not associated with a gaia account, use the display name.
-    const user_manager::User* user =
-        chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
-    // Note: We don't show the User section in Guest mode.
-    DCHECK(user && (user->GetType() != user_manager::USER_TYPE_GUEST));
-    name = base::UTF16ToUTF8(user->GetDisplayName());
+  const user_manager::User* user =
+      chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+  DCHECK(user);
+  name = base::UTF16ToUTF8(user->GetDisplayName());
+  std::string user_email = profile_->GetProfileUserName();
+  if (user_email.empty()) {
+    // User is not associated with a gaia account.
     user_email = user->GetAccountId().GetUserEmail();
-  } else {
-    name = gaia::SanitizeEmail(gaia::CanonicalizeEmail(name));
-    user_email = name;
   }
 
   // Get image as data URL instead of using chrome://userimage source to avoid
   // issues with caching.
   const AccountId account_id(AccountId::FromUserEmail(user_email));
   scoped_refptr<base::RefCountedMemory> image =
       chromeos::options::UserImageSource::GetUserImage(account_id);
   icon_url = webui::GetPngDataUrl(image->front(), image->size());
 #else   // !defined(OS_CHROMEOS)
   ProfileAttributesEntry* entry;
@@ skipping 16 matching lines @@
   response->SetString("name", name);
   response->SetString("iconUrl", icon_url);
   return base::WrapUnique(response);
 }
 
 bool ProfileInfoHandler::IsProfileManagingSupervisedUsers() const {
   return !profile_->GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
 }
 
 }  // namespace settings