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

chrome/browser/content_settings/content_settings_policy_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_policy_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 373 matching lines @@
     ContentSetting content_setting) {
 }
 
 ContentSetting PolicyProvider::GetContentSetting(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier) const {
   // Resource identifier are not supported by policies as long as the feature is
   // behind a flag. So resource identifiers are simply ignored.
+  scoped_ptr<Value> value(GetContentSettingValue(primary_url,
+                                                 secondary_url,
+                                                 content_type,
+                                                 resource_identifier));
+  ContentSetting setting =
+      value.get() ? ValueToContentSetting(value.get())
+                  : CONTENT_SETTING_DEFAULT;
+  if (setting == CONTENT_SETTING_DEFAULT && default_provider_)
+    setting = default_provider_->ProvideDefaultSetting(content_type);
+  return setting;
+}
+
+Value* PolicyProvider::GetContentSettingValue(
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    ContentSettingsType content_type,
+    const ResourceIdentifier& resource_identifier) const {
+  // Resource identifier are not supported by policies as long as the feature is
+  // behind a flag. So resource identifiers are simply ignored.
   Value* value = value_map_.GetValue(primary_url,
                                      secondary_url,
                                      content_type,
                                      resource_identifier);
-  ContentSetting setting =
-      value == NULL ? CONTENT_SETTING_DEFAULT : ValueToContentSetting(value);
-  if (setting == CONTENT_SETTING_DEFAULT && default_provider_)
-    setting = default_provider_->ProvideDefaultSetting(content_type);
-  return setting;
+  return value ? value->DeepCopy() : NULL;

[wtc, 2011/09/01 18:21:09]

I hope these DeepCopy() calls are not expensive.  You call
them to create the function's return value |Value| object,
only to be deleted by the caller.

Another option is to return |Value| instead of |Value*|.
Does |Value| have a copy constructor?

[markusheintz_, 2011/09/02 15:22:21]

Using a pointer may cause synchronization issues.
Value has no copy constructor.

 }
 
+

[wtc, 2011/09/01 18:21:09]

Nit: remove these two blank lines.

[markusheintz_, 2011/09/02 15:22:21]

Done.

+
 void PolicyProvider::GetAllContentSettingsRules(
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     Rules* content_setting_rules) const {
   DCHECK_NE(RequiresResourceIdentifier(content_type),
             resource_identifier.empty());
   DCHECK(content_setting_rules);
   content_setting_rules->clear();
 
   const OriginIdentifierValueMap* map_to_return = &value_map_;
@@ skipping 52 matching lines @@
                       ContentSettingsPattern(),
                       CONTENT_SETTINGS_TYPE_DEFAULT,
                       std::string());
     }
   } else {
     NOTREACHED() << "Unexpected notification";
   }
 }
 
 }  // namespace content_settings