Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc |
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
index c81a38458fbc4d320be38a72a1988919be9dbd6a..ceee1f60ff869c0f932570ef2dad42b7961f753b 100644 |
--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
@@ -271,9 +271,13 @@ base::ListValue* ContentSettingsStore::GetSettingsForExtension( |
it->first.resource_identifier); |
ContentSetting content_setting = ValueToContentSetting(rule.value.get()); |
DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting); |
- setting_dict->SetString( |
- keys::kContentSettingKey, |
- helpers::ContentSettingToString(content_setting)); |
+ |
+ std::string setting_string; |
+ bool return_value = content_settings::ContentSettingToString( |
+ content_setting, &setting_string); |
+ DCHECK(return_value); |
+ |
+ setting_dict->SetString(keys::kContentSettingKey, setting_string); |
settings->Append(setting_dict); |
} |
} |
@@ -315,8 +319,8 @@ void ContentSettingsStore::SetExtensionContentSettingFromList( |
std::string content_setting_string; |
dict->GetString(keys::kContentSettingKey, &content_setting_string); |
ContentSetting setting = CONTENT_SETTING_DEFAULT; |
- bool result = |
- helpers::StringToContentSetting(content_setting_string, &setting); |
+ bool result = content_settings::ContentSettingFromString( |
+ content_setting_string, &setting); |
DCHECK(result); |
SetExtensionContentSetting(extension_id, |