MD Settings: People: Fix issues with user icons

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 176 matching lines @@
 std::unique_ptr<base::DictionaryValue>
 ProfileInfoHandler::GetAccountNameAndIcon() const {
   std::string name;
   std::string icon_url;
 
 #if defined(OS_CHROMEOS)
   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();
-  }
 
   // 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);
+      chromeos::options::UserImageSource::GetUserImage(user->GetAccountId());
   icon_url = webui::GetPngDataUrl(image->front(), image->size());
 #else   // !defined(OS_CHROMEOS)
   ProfileAttributesEntry* entry;
   if (g_browser_process->profile_manager()
           ->GetProfileAttributesStorage()
           .GetProfileAttributesWithPath(profile_->GetPath(), &entry)) {
     name = base::UTF16ToUTF8(entry->GetName());
 
     if (entry->IsUsingGAIAPicture() && entry->GetGAIAPicture()) {
       constexpr int kAvatarIconSize = 40;
@@ skipping 10 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