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.
-  Value* value = value_map_.GetValue(primary_url,
-                                     secondary_url,
-                                     content_type,
-                                     resource_identifier);
+  Value* value = GetContentSettingValue(primary_url,
+                                        secondary_url,
+                                        content_type,
+                                       resource_identifier);

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

Nit: indent

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

Done.

   ContentSetting setting =
       value == NULL ? CONTENT_SETTING_DEFAULT : ValueToContentSetting(value);
   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);
+  return value ? value->DeepCopy() : NULL;
+}
+
+
+
 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