Fix memory leak in SetDefaultContentSettings.

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2011 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/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 192 matching lines @@
                           false);
   }
 }
 
 void HostContentSettingsMap::SetDefaultContentSetting(
     ContentSettingsType content_type,
     ContentSetting setting) {
   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(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     base::Value* value) {
   DCHECK(IsValueAllowedForType(value, content_type));
   DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
@@ skipping 218 matching lines @@
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return NULL;
 }