diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-31 19:17:42 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-31 19:17:42 +0000 |
| commit | d983b84870429ce4e860277262cf3f151ac4144d (patch) | |
| tree | 4625c8163bdd31317e4a8a0187eebe89ef1c9c13 | |
| parent | 2fd2994d21269d5295dea67223e6151f60225c00 (diff) | |
| download | chromium_src-d983b84870429ce4e860277262cf3f151ac4144d.zip chromium_src-d983b84870429ce4e860277262cf3f151ac4144d.tar.gz chromium_src-d983b84870429ce4e860277262cf3f151ac4144d.tar.bz2 | |
Also fix mac unit tests
BUG=none
TEST=unit_tests
Review URL: http://codereview.chromium.org/2873086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54463 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm index c0f1c32..3e62b96 100644 --- a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm +++ b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm @@ -56,7 +56,9 @@ TEST_F(ContentSettingsDialogControllerTest, CookieSetting) { settingsMap_->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_BLOCK); - EXPECT_EQ([controller_ cookieSettingIndex], kCookieDisabledIndex); + // Since the cookie prompt is disabled per default, the index of the block + // radio is actually 1 == kCookieAskIndex. + EXPECT_EQ([controller_ cookieSettingIndex], kCookieAskIndex); // Change dialog property, check setting. NSInteger setting; @@ -65,7 +67,9 @@ TEST_F(ContentSettingsDialogControllerTest, CookieSetting) { settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES); EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); - [controller_ setCookieSettingIndex:kCookieDisabledIndex]; + // Since the cookie prompt is disabled per default, the index of the block + // radio is actually 1 == kCookieAskIndex. + [controller_ setCookieSettingIndex:kCookieAskIndex]; setting = settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES); EXPECT_EQ(setting, CONTENT_SETTING_BLOCK); |