Add a method to the content_settings::ProviderInterface to return the content settings Value.

chrome/browser/content_settings/content_settings_pref_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_pref_provider.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 425 matching lines @@
   pref_change_registrar_.Add(prefs::kGeolocationContentSettings, this);
   pref_change_registrar_.Add(prefs::kDesktopNotificationAllowedOrigins, this);
   pref_change_registrar_.Add(prefs::kDesktopNotificationDeniedOrigins, this);
 }
 
 ContentSetting PrefProvider::GetContentSetting(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier) const {
+  Value* value = GetContentSettingValue(primary_url,

[Bernhard Bauer, 2011/09/01 13:33:19]

This leaks |value|.

[markusheintz_, 2011/09/01 14:32:49]

Fixed here and in the PolicyProvider as well.

+                                        secondary_url,
+                                        content_type,
+                                        resource_identifier);
+  return value ? ValueToContentSetting(value) : CONTENT_SETTING_DEFAULT;
+}
+
+Value* PrefProvider::GetContentSettingValue(
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    ContentSettingsType content_type,
+    const ResourceIdentifier& resource_identifier) const {
   // For a |PrefProvider| used in a |HostContentSettingsMap| of a non incognito
   // profile, this will always return NULL.
   // TODO(markusheintz): I don't like this. I'd like to have an
   // IncognitoProviderWrapper that wrapps the pref provider for a host content
   // settings map of an incognito profile.
   base::AutoLock auto_lock(lock_);
   Value* incognito_value = incognito_value_map_.GetValue(
       primary_url,
       secondary_url,
       content_type,
       resource_identifier);
   if (incognito_value)
-    return ValueToContentSetting(incognito_value);
+    return incognito_value->DeepCopy();
 
   Value* value = value_map_.GetValue(
       primary_url,
       secondary_url,
       content_type,
       resource_identifier);
-  if (value)
-    return ValueToContentSetting(value);
-
-  return CONTENT_SETTING_DEFAULT;
+  return value ? value->DeepCopy() : NULL;
 }
 
 void PrefProvider::GetAllContentSettingsRules(
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     Rules* content_setting_rules) const {
   DCHECK(content_setting_rules);
   content_setting_rules->clear();
 
   const OriginIdentifierValueMap* map_to_return =
@@ skipping 885 matching lines @@
     if (settings_dictionary->GetInteger(
             kTypeNames[CONTENT_SETTINGS_TYPE_GEOLOCATION], &setting_value)) {
       UpdateObsoleteGeolocationPref(pattern_pair.first,
                                     pattern_pair.second,
                                     ContentSetting(setting_value));
     }
   }
 }
 
 }  // namespace content_settings