Fix memory leak in SetDefaultContentSettings.

chrome/browser/content_settings/content_settings_default_provider.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/content_settings_default_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 116 matching lines @@
 }
 
 DefaultProvider::~DefaultProvider() {
 }
 
 bool DefaultProvider::SetWebsiteSetting(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
-    Value* value) {
+    Value* in_value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(prefs_);
 
   // Ignore non default settings
   if (primary_pattern != ContentSettingsPattern::Wildcard() ||
       secondary_pattern != ContentSettingsPattern::Wildcard()) {
     return false;
   }
 
   // The default settings may not be directly modified for OTR sessions.
   // Instead, they are synced to the main profile's setting.
   if (is_incognito_)
     return false;
 
+  // Put |in_value| in a scoped pointer to ensure that it gets cleaned up
+  // properly if we don't pass on the ownership.
+  scoped_ptr<base::Value> value(in_value);
   {
     AutoReset<bool> auto_reset(&updating_preferences_, true);
     // Keep the obsolete pref in sync as long as backwards compatibility is
     // required. This is required to keep sync working correctly.
     if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-      if (value) {
+      if (value.get()) {
         prefs_->Set(prefs::kGeolocationDefaultContentSetting, *value);
       } else {
         prefs_->ClearPref(prefs::kGeolocationDefaultContentSetting);
       }
     }
 
     // |DefaultProvider| should not send any notifications when holding
     // |lock_|. |DictionaryPrefUpdate| destructor and
     // |PrefService::SetInteger()| send out notifications. As a response, the
     // upper layers may call |GetAllContentSettingRules| which acquires |lock_|
     // again.
     DictionaryPrefUpdate update(prefs_, prefs::kDefaultContentSettings);
     DictionaryValue* default_settings_dictionary = update.Get();
     base::AutoLock lock(lock_);
-    if (value == NULL ||
-        ValueToContentSetting(value) == kDefaultSettings[content_type]) {
+    if (value.get() == NULL ||
+        ValueToContentSetting(value.get()) == kDefaultSettings[content_type]) {
       // If |value| is NULL we need to reset the default setting the the
       // hardcoded default.
       default_settings_[content_type].reset(
           Value::CreateIntegerValue(kDefaultSettings[content_type]));
 
       // Remove the corresponding pref entry since the hardcoded default value
       // is used.
       default_settings_dictionary->RemoveWithoutPathExpansion(
           GetTypeName(content_type), NULL);
     } else {
       default_settings_[content_type].reset(value->DeepCopy());
       // Transfer ownership of |value| to the |default_settings_dictionary|.
       default_settings_dictionary->SetWithoutPathExpansion(
-          GetTypeName(content_type), value);
+          GetTypeName(content_type), value.release());
     }
   }
 
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   content_type,
                   std::string());
 
   return true;
 }
@@ skipping 150 matching lines @@
     SetWebsiteSetting(
         ContentSettingsPattern::Wildcard(),
         ContentSettingsPattern::Wildcard(),
         CONTENT_SETTINGS_TYPE_GEOLOCATION,
         std::string(),
         value->DeepCopy());
   }
 }
 
 }  // namespace content_settings