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

chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm

Index: chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm
index abd3136cf7743a275620987493e72a3687d875c0..c0f1c3289bf1d7009fbf7f39bfb7bc3d2eccd653 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm
@@ -55,10 +55,6 @@ TEST_F(ContentSettingsDialogControllerTest, CookieSetting) {
   EXPECT_EQ([controller_ cookieSettingIndex], kCookieEnabledIndex);
 
   settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
-                                         CONTENT_SETTING_ASK);
-  EXPECT_EQ([controller_ cookieSettingIndex], kCookieAskIndex);
-
-  settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
                                          CONTENT_SETTING_BLOCK);
   EXPECT_EQ([controller_ cookieSettingIndex], kCookieDisabledIndex);
 
@@ -69,11 +65,6 @@ TEST_F(ContentSettingsDialogControllerTest, CookieSetting) {
       settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES);
   EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
 
-  [controller_ setCookieSettingIndex:kCookieAskIndex];
-  setting =
-      settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES);
-  EXPECT_EQ(setting, CONTENT_SETTING_ASK);
-
   [controller_ setCookieSettingIndex:kCookieDisabledIndex];
   setting =
       settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES);