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

chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/cocoa/content_settings_dialog_controller.h"
 
 #import "base/scoped_nsobject.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 37 matching lines @@
   EXPECT_TRUE(controller_);
 }
 
 TEST_F(ContentSettingsDialogControllerTest, CookieSetting) {
   // Change setting, check dialog property.
   settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
                                          CONTENT_SETTING_ALLOW);
   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);
 
   // Change dialog property, check setting.
   NSInteger setting;
   [controller_ setCookieSettingIndex:kCookieEnabledIndex];
   setting =
       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);
   EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
 }
 
 TEST_F(ContentSettingsDialogControllerTest, BlockThirdPartyCookiesSetting) {
   // Change setting, check dialog property.
   settingsMap_->SetBlockThirdPartyCookies(YES);
   EXPECT_TRUE([controller_ blockThirdPartyCookies]);
@@ skipping 175 matching lines @@
   EXPECT_EQ(setting, CONTENT_SETTING_ASK);
 
   [controller_ setNotificationsSettingIndex:kNotificationsDisabledIndex];
   setting =
       notificationsService_->GetDefaultContentSetting();
   EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
 }
 
 }  // namespace