Remove the cookie prompt from the settings UI and migrate prefs from ask to block.

chrome/browser/dom_ui/content_settings_handler.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/content_settings_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 45 matching lines @@
     return CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
 
   NOTREACHED();
   return CONTENT_SETTINGS_TYPE_DEFAULT;
 }
 
 std::string ContentSettingToString(ContentSetting setting) {
   switch (setting) {
     case CONTENT_SETTING_ALLOW:
       return "allow";
-    case CONTENT_SETTING_ASK:
-      return "ask";
     case CONTENT_SETTING_BLOCK:
       return "block";
 
     default:
       NOTREACHED();
       return "";
   }
 }
 
 ContentSetting ContentSettingFromString(const std::string& name) {
   if (name == "allow")
     return CONTENT_SETTING_ALLOW;
-  if (name == "ask")
-    return CONTENT_SETTING_ASK;
   if (name == "block")
     return CONTENT_SETTING_BLOCK;
 
   NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
 }  // namespace
 
 ContentSettingsHandler::ContentSettingsHandler() {
@@ skipping 11 matching lines @@
   localized_strings->SetString(L"contentSettingsPage",
       l10n_util::GetString(IDS_CONTENT_SETTINGS_TITLE));
 
   // Cookies filter.
   localized_strings->SetString(L"cookies_tab_label",
       l10n_util::GetString(IDS_COOKIES_TAB_LABEL));
   localized_strings->SetString(L"cookies_modify",
       l10n_util::GetString(IDS_MODIFY_COOKIE_STORING_LABEL));
   localized_strings->SetString(L"cookies_allow",
       l10n_util::GetString(IDS_COOKIES_ALLOW_RADIO));
-  localized_strings->SetString(L"cookies_ask",
-      l10n_util::GetString(IDS_COOKIES_ASK_EVERY_TIME_RADIO));
   localized_strings->SetString(L"cookies_block",
       l10n_util::GetString(IDS_COOKIES_BLOCK_RADIO));
   localized_strings->SetString(L"cookies_block_3rd_party",
       l10n_util::GetString(IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX));
   localized_strings->SetString(L"cookies_clear_on_exit",
       l10n_util::GetString(IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX));
   localized_strings->SetString(L"cookies_show_cookies",
       l10n_util::GetString(IDS_COOKIES_SHOW_COOKIES_BUTTON));
   localized_strings->SetString(L"flash_storage_settings",
       l10n_util::GetString(IDS_FLASH_STORAGE_SETTINGS));
@@ skipping 120 matching lines @@
       ContentSettingsTypeFromGroupName(group),
       ContentSettingFromString(setting));
 }
 
 void ContentSettingsHandler::SetAllowThirdPartyCookies(const Value* value) {
   std::wstring allow = ExtractStringValue(value);
 
   dom_ui_->GetProfile()->GetHostContentSettingsMap()->SetBlockThirdPartyCookies(
       allow == L"true");
 }