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..80c1dfc478a2750fe0810e20eb6a7cc195acb4fc 100644 |
--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
@@ -273,7 +273,7 @@ base::ListValue* ContentSettingsStore::GetSettingsForExtension( |
DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting); |
setting_dict->SetString( |
keys::kContentSettingKey, |
- helpers::ContentSettingToString(content_setting)); |
+ content_settings::ContentSettingToString(content_setting)); |
settings->Append(setting_dict); |
} |
} |
@@ -314,10 +314,9 @@ 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); |
- DCHECK(result); |
+ ContentSetting setting = |
+ content_settings::ContentSettingFromString(content_setting_string); |
+ DCHECK_NE(CONTENT_SETTING_DEFAULT, setting); |
SetExtensionContentSetting(extension_id, |
primary_pattern, |