Index: components/content_settings/core/browser/content_settings_utils.cc |
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc |
index a67bb7de3ba994faa87c3f823ca87d1ef03c8471..2c774fb420fdfc9140f6453ccae4a16dcb09c197 100644 |
--- a/components/content_settings/core/browser/content_settings_utils.cc |
+++ b/components/content_settings/core/browser/content_settings_utils.cc |
@@ -91,7 +91,7 @@ std::string ContentSettingToString(ContentSetting setting) { |
NOTREACHED(); |
} |
- return std::string(); |
+ return ResourceIdentifier(); |
} |
ContentSetting ContentSettingFromString(const std::string& name) { |
@@ -229,9 +229,13 @@ base::Value* GetContentSettingValueAndPatterns( |
void GetRendererContentSettingRules(const HostContentSettingsMap* map, |
RendererContentSettingRules* rules) { |
map->GetSettingsForOneType( |
- CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); |
+ CONTENT_SETTINGS_TYPE_IMAGES, |
+ ResourceIdentifier(), |
+ &(rules->image_rules)); |
map->GetSettingsForOneType( |
- CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); |
+ CONTENT_SETTINGS_TYPE_JAVASCRIPT, |
+ ResourceIdentifier(), |
+ &(rules->script_rules)); |
} |
} // namespace content_settings |