| Index: chrome/browser/content_settings/host_content_settings_map.cc
|
| diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
|
| index 8749d6f98c749cc6847336288bcc2229073da8d4..777203d532890446aaa49767cd8e4be0bb541b53 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -133,7 +133,7 @@ void HostContentSettingsMap::RegisterExtensionService(
|
| OnContentSettingChanged(ContentSettingsPattern(),
|
| ContentSettingsPattern(),
|
| CONTENT_SETTINGS_TYPE_DEFAULT,
|
| - "");
|
| + std::string());
|
| }
|
| #endif
|
|
|
| @@ -159,7 +159,7 @@ ContentSetting HostContentSettingsMap::GetDefaultContentSettingFromProvider(
|
| ContentSettingsType content_type,
|
| content_settings::ProviderInterface* provider) const {
|
| scoped_ptr<content_settings::RuleIterator> rule_iterator(
|
| - provider->GetRuleIterator(content_type, "", false));
|
| + provider->GetRuleIterator(content_type, std::string(), false));
|
|
|
| ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
|
| while (rule_iterator->HasNext()) {
|
| @@ -460,19 +460,18 @@ void HostContentSettingsMap::MigrateObsoleteClearOnExitPref() {
|
| AddSettingsForOneType(content_settings_providers_[PREF_PROVIDER],
|
| PREF_PROVIDER,
|
| CONTENT_SETTINGS_TYPE_COOKIES,
|
| - "",
|
| + std::string(),
|
| &exceptions,
|
| false);
|
| for (ContentSettingsForOneType::iterator it = exceptions.begin();
|
| it != exceptions.end(); ++it) {
|
| if (it->setting != CONTENT_SETTING_ALLOW)
|
| continue;
|
| - SetWebsiteSetting(
|
| - it->primary_pattern,
|
| - it->secondary_pattern,
|
| - CONTENT_SETTINGS_TYPE_COOKIES,
|
| - "",
|
| - Value::CreateIntegerValue(CONTENT_SETTING_SESSION_ONLY));
|
| + SetWebsiteSetting(it->primary_pattern,
|
| + it->secondary_pattern,
|
| + CONTENT_SETTINGS_TYPE_COOKIES,
|
| + std::string(),
|
| + Value::CreateIntegerValue(CONTENT_SETTING_SESSION_ONLY));
|
| }
|
|
|
| prefs_->SetBoolean(prefs::kContentSettingsClearOnExitMigrated, true);
|
|
|