| Index: chrome/browser/content_settings/content_settings_policy_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc
|
| index c5f3348ff59f338a2cd97ad32f39ba4ff6dcdad3..371a0b6aad5344f7ce65bdf1f5f41ac08ee74b16 100644
|
| --- a/chrome/browser/content_settings/content_settings_policy_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_policy_provider.cc
|
| @@ -289,13 +289,12 @@ void PolicyProvider::GetContentSettingsFromPreferences(
|
| ContentSettingsPattern secondary_pattern =
|
| !pattern_pair.second.IsValid() ? ContentSettingsPattern::Wildcard()
|
| : pattern_pair.second;
|
| - value_map->SetValue(
|
| - pattern_pair.first,
|
| - secondary_pattern,
|
| - content_type,
|
| - NO_RESOURCE_IDENTIFIER,
|
| - base::Value::CreateIntegerValue(
|
| - kPrefsForManagedContentSettingsMap[i].setting));
|
| + value_map->SetValue(pattern_pair.first,
|
| + secondary_pattern,
|
| + content_type,
|
| + NO_RESOURCE_IDENTIFIER,
|
| + new base::FundamentalValue(
|
| + kPrefsForManagedContentSettingsMap[i].setting));
|
| }
|
| }
|
| }
|
| @@ -413,12 +412,11 @@ void PolicyProvider::UpdateManagedDefaultSetting(
|
| content_type,
|
| std::string());
|
| } else {
|
| - value_map_.SetValue(
|
| - ContentSettingsPattern::Wildcard(),
|
| - ContentSettingsPattern::Wildcard(),
|
| - content_type,
|
| - std::string(),
|
| - base::Value::CreateIntegerValue(setting));
|
| + value_map_.SetValue(ContentSettingsPattern::Wildcard(),
|
| + ContentSettingsPattern::Wildcard(),
|
| + content_type,
|
| + std::string(),
|
| + new base::FundamentalValue(setting));
|
| }
|
| }
|
|
|
|
|