Fix memory leak in SetDefaultContentSettings.

chrome/browser/content_settings/host_content_settings_map.cc

Index: chrome/browser/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 39c38a939349651c70d02e0a1759414851fc117a..37045489edb3856fee86e2a59ce809f859b2ddea 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -210,12 +210,15 @@ void HostContentSettingsMap::SetDefaultContentSetting(
   DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE);
   DCHECK(IsSettingAllowedForType(setting, content_type));
 
-  base::Value* value = Value::CreateIntegerValue(setting);
-  if (!content_settings_providers_[DEFAULT_PROVIDER]->SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
-      content_type, std::string(), value)) {
-    delete value;
-  }
+  base::Value* value = NULL;
+  if (setting != CONTENT_SETTING_DEFAULT)
+    value = Value::CreateIntegerValue(setting);
+  SetWebsiteSetting(

[James Hawkins, 2011/11/18 21:21:13]

I don't understand why you got rid of the if check and delete. If this method
returns false, the client must delete |value| (or so the API documentation
says).

[markusheintz_, 2011/11/18 21:28:17]

Sorry for the confusion, but I'm not calling the SetWebsiteSetting method of the
provider anymore. I call the SetWebsiteSetting method of the
HostContentSettingsMap. (see below) This method has not return value.

+      ContentSettingsPattern::Wildcard(),
+      ContentSettingsPattern::Wildcard(),
+      content_type,
+      std::string(),
+      value);
 }
 
 void HostContentSettingsMap::SetWebsiteSetting(