| Index: chrome/browser/host_content_settings_map.cc
|
| ===================================================================
|
| --- chrome/browser/host_content_settings_map.cc (revision 59533)
|
| +++ chrome/browser/host_content_settings_map.cc (working copy)
|
| @@ -804,13 +804,10 @@
|
| }
|
| }
|
| }
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableCookiePrompt)) {
|
| - // Migrate obsolete cookie prompt mode.
|
| - if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
|
| - CONTENT_SETTING_ASK)
|
| - settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;
|
| - }
|
| + // Migrate obsolete cookie prompt mode.
|
| + if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] ==
|
| + CONTENT_SETTING_ASK)
|
| + settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;
|
| }
|
|
|
| void HostContentSettingsMap::GetResourceSettingsFromDictionary(
|
|
|