Valgrind: Fix a leak in ManageProfileHandler::SendProfileIcons().

chrome/browser/ui/webui/options2/manage_profile_handler.cc

 // Copyright (c) 2012 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/options2/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 
 namespace options2 {
 
+namespace {
+
+const char kCreateProfileIconGridName[] = "create-profile-icon-grid";
+const char kManageProfileIconGridName[] = "manage-profile-icon-grid";
+
+}  // namespace
+
 ManageProfileHandler::ManageProfileHandler() {
 }
 
 ManageProfileHandler::~ManageProfileHandler() {
 }
 
 void ManageProfileHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
@@ skipping 39 matching lines @@
       base::Bind(&ManageProfileHandler::ProfileIconSelectionChanged,
                  base::Unretained(this)));
 }
 
 void ManageProfileHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED) {
     SendProfileNames();
-    SendProfileIcons(Value::CreateStringValue("manage-profile-icon-grid"));
+    base::StringValue value(kManageProfileIconGridName);
+    SendProfileIcons(value);
   } else {
     OptionsPageUIHandler::Observe(type, source, details);
   }
 }
 
 void ManageProfileHandler::RequestDefaultProfileIcons(const ListValue* args) {
-  SendProfileIcons(Value::CreateStringValue("manage-profile-icon-grid"));
-  SendProfileIcons(Value::CreateStringValue("create-profile-icon-grid"));
+  base::StringValue create_value(kCreateProfileIconGridName);
+  base::StringValue manage_value(kManageProfileIconGridName);
+  SendProfileIcons(manage_value);
+  SendProfileIcons(create_value);
 }
 
-void ManageProfileHandler::SendProfileIcons(base::StringValue* icon_grid) {
+void ManageProfileHandler::SendProfileIcons(
+    const base::StringValue& icon_grid) {
   ListValue image_url_list;
 
   // First add the GAIA picture if it's available.
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   Profile* profile = Profile::FromWebUI(web_ui());
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   if (profile_index != std::string::npos) {
     const gfx::Image* icon =
         cache.GetGAIAPictureOfProfileAtIndex(profile_index);
     if (icon) {
       gfx::Image icon2 = profiles::GetAvatarIconForWebUI(*icon, true);
       gaia_picture_url_ = web_ui_util::GetImageDataUrl(*icon2.ToImageSkia());
       image_url_list.Append(Value::CreateStringValue(gaia_picture_url_));
     }
   }
 
   // Next add the default avatar icons.
   for (size_t i = 0; i < ProfileInfoCache::GetDefaultAvatarIconCount(); i++) {
     std::string url = ProfileInfoCache::GetDefaultAvatarIconUrl(i);
     image_url_list.Append(Value::CreateStringValue(url));
   }
 
   web_ui()->CallJavascriptFunction(
-      "ManageProfileOverlay.receiveDefaultProfileIcons", *icon_grid,
+      "ManageProfileOverlay.receiveDefaultProfileIcons", icon_grid,
       image_url_list);
 }
 
 void ManageProfileHandler::SendProfileNames() {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   DictionaryValue profile_name_dict;
   for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i)
     profile_name_dict.SetBoolean(UTF16ToUTF8(cache.GetNameOfProfileAtIndex(i)),
                                  true);
@@ skipping 134 matching lines @@
   string16 gaia_name = cache.GetGAIANameOfProfileAtIndex(i);
   if (gaia_name.empty())
     return;
 
   StringValue gaia_name_value(gaia_name);
   web_ui()->CallJavascriptFunction("ManageProfileOverlay.setProfileName",
                                    gaia_name_value);
 }
 
 }  // namespace options2