Settings People Revamp: Update ManageProfileHandler to use Promises.

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 54 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "removeProfileShortcut",
       base::Bind(&ManageProfileHandler::HandleRemoveProfileShortcut,
                  base::Unretained(this)));
 }
 
 void ManageProfileHandler::OnProfileAvatarChanged(
     const base::FilePath& profile_path) {
   // This is necessary to send the potentially updated GAIA photo.
-  SendAvailableIcons();
+  web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
+                                   base::StringValue("available-icons-changed"),
+                                   *GetAvailableIcons());
 }
 
 void ManageProfileHandler::HandleGetAvailableIcons(
     const base::ListValue* args) {
   // This is also used as a signal that the page has loaded and is ready to
   // observe profile avatar changes.
   if (!observer_.IsObservingSources()) {
     observer_.Add(
         &g_browser_process->profile_manager()->GetProfileAttributesStorage());
   }
 
   profiles::UpdateGaiaProfileInfoIfNeeded(profile_);
 
-  SendAvailableIcons();
+  CHECK_EQ(1U, args->GetSize());
+  const base::Value* callback_id;
+  CHECK(args->Get(0, &callback_id));
+  ResolveJavascriptCallback(*callback_id, *GetAvailableIcons());
 }
 
-void ManageProfileHandler::SendAvailableIcons() {
-  base::ListValue image_url_list;
+scoped_ptr<base::ListValue> ManageProfileHandler::GetAvailableIcons() {
+  scoped_ptr<base::ListValue> image_url_list(new base::ListValue());
 
   // First add the GAIA picture 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) {
       gfx::Image icon2 = profiles::GetAvatarIconForWebUI(*icon, true);
       gaia_picture_url_ = webui::GetBitmapDataUrl(icon2.AsBitmap());
-      image_url_list.AppendString(gaia_picture_url_);
+      image_url_list->AppendString(gaia_picture_url_);
     }
   }
 
   // Next add the default avatar icons and names.
   for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); i++) {
     std::string url = profiles::GetDefaultAvatarIconUrl(i);
-    image_url_list.AppendString(url);
+    image_url_list->AppendString(url);
   }
 
-  web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
-                                   base::StringValue("available-icons-changed"),
-                                   image_url_list);
+  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;
   CHECK(args->GetString(0, &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