Index: chrome/browser/content_settings/cookie_settings.cc |
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc |
index e34a56e9a1922a7fb0e6c7dd18394459eef7740c..e0b1ff67d1cec902d14fe21b3c2fc8b114ce48f6 100644 |
--- a/chrome/browser/content_settings/cookie_settings.cc |
+++ b/chrome/browser/content_settings/cookie_settings.cc |
@@ -130,7 +130,7 @@ bool CookieSettings::IsCookieSessionOnly(const GURL& origin) const { |
void CookieSettings::GetCookieSettings( |
ContentSettingsForOneType* settings) const { |
return host_content_settings_map_->GetSettingsForOneType( |
- CONTENT_SETTINGS_TYPE_COOKIES, "", settings); |
+ CONTENT_SETTINGS_TYPE_COOKIES, std::string(), settings); |
} |
void CookieSettings::SetDefaultCookieSetting(ContentSetting setting) { |
@@ -147,17 +147,21 @@ void CookieSettings::SetCookieSetting( |
if (setting == CONTENT_SETTING_SESSION_ONLY) { |
DCHECK(secondary_pattern == ContentSettingsPattern::Wildcard()); |
} |
- host_content_settings_map_->SetContentSetting( |
- primary_pattern, secondary_pattern, CONTENT_SETTINGS_TYPE_COOKIES, "", |
- setting); |
+ host_content_settings_map_->SetContentSetting(primary_pattern, |
+ secondary_pattern, |
+ CONTENT_SETTINGS_TYPE_COOKIES, |
+ std::string(), |
+ setting); |
} |
void CookieSettings::ResetCookieSetting( |
const ContentSettingsPattern& primary_pattern, |
const ContentSettingsPattern& secondary_pattern) { |
- host_content_settings_map_->SetContentSetting( |
- primary_pattern, secondary_pattern, CONTENT_SETTINGS_TYPE_COOKIES, "", |
- CONTENT_SETTING_DEFAULT); |
+ host_content_settings_map_->SetContentSetting(primary_pattern, |
+ secondary_pattern, |
+ CONTENT_SETTINGS_TYPE_COOKIES, |
+ std::string(), |
+ CONTENT_SETTING_DEFAULT); |
} |
void CookieSettings::ShutdownOnUIThread() { |
@@ -176,9 +180,12 @@ ContentSetting CookieSettings::GetCookieSetting( |
// First get any host-specific settings. |
content_settings::SettingInfo info; |
- scoped_ptr<base::Value> value( |
- host_content_settings_map_->GetWebsiteSetting( |
- url, first_party_url, CONTENT_SETTINGS_TYPE_COOKIES, "", &info)); |
+ scoped_ptr<base::Value> value(host_content_settings_map_->GetWebsiteSetting( |
+ url, |
+ first_party_url, |
+ CONTENT_SETTINGS_TYPE_COOKIES, |
+ std::string(), |
+ &info)); |
if (source) |
*source = info.source; |