Refactor fetching profile avatar icons and labels repeated md-settings & md-user-manager (C++)

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

 // Copyright 2015 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/settings_manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 82 matching lines @@
 
   profiles::UpdateGaiaProfileInfoIfNeeded(profile_);
 
   CHECK_EQ(1U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
   ResolveJavascriptCallback(*callback_id, *GetAvailableIcons());
 }
 
 std::unique_ptr<base::ListValue> ManageProfileHandler::GetAvailableIcons() {
-  std::unique_ptr<base::ListValue> image_url_list(new base::ListValue());
+  std::unique_ptr<base::ListValue> image_url_list(
+      profiles::GetDefaultProfileAvatarIconsAndLabels());
 
-  // First add the GAIA picture if it is available.
+  // Add the GAIA picture to the beginning of the list if it is available.
   ProfileAttributesEntry* entry;
   if (g_browser_process->profile_manager()->GetProfileAttributesStorage().
           GetProfileAttributesWithPath(profile_->GetPath(), &entry)) {
     const gfx::Image* icon = entry->GetGAIAPicture();
     if (icon) {
-      std::unique_ptr<base::DictionaryValue> gaia_picture_info(
-          new base::DictionaryValue());
+      base::DictionaryValue* gaia_picture_info = new base::DictionaryValue();
       gfx::Image icon2 = profiles::GetAvatarIconForWebUI(*icon, true);
       gaia_picture_url_ = webui::GetBitmapDataUrl(icon2.AsBitmap());
       gaia_picture_info->SetString("url", gaia_picture_url_);
       gaia_picture_info->SetString(
           "label",
           l10n_util::GetStringUTF16(IDS_SETTINGS_CHANGE_PICTURE_PROFILE_PHOTO));
-      image_url_list->Append(std::move(gaia_picture_info));
+      image_url_list->Insert(0, gaia_picture_info);
     }
   }
 
-  // Next add the default avatar icons and names.
-  size_t placeholder_avatar_index = profiles::GetPlaceholderAvatarIndex();
-  for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount() &&
-                     i != placeholder_avatar_index;
-       i++) {
-    std::unique_ptr<base::DictionaryValue> avatar_info(
-        new base::DictionaryValue());
-    avatar_info->SetString("url", profiles::GetDefaultAvatarIconUrl(i));
-    avatar_info->SetString(
-        "label", l10n_util::GetStringUTF16(
-                     profiles::GetDefaultAvatarLabelResourceIDAtIndex(i)));
-    image_url_list->Append(std::move(avatar_info));
-  }
-
   return image_url_list;
 }
 
 void ManageProfileHandler::HandleSetProfileIconAndName(
     const base::ListValue* args) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(args);
   DCHECK_EQ(2u, args->GetSize());
 
   std::string icon_url;
@@ skipping 89 matching lines @@
     g_browser_process->profile_manager()->profile_shortcut_manager();
   DCHECK(shortcut_manager);
 
   shortcut_manager->RemoveProfileShortcuts(profile_->GetPath());
 
   // Update the UI buttons.
   OnHasProfileShortcuts(false);
 }
 
 }  // namespace settings