chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm - Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block. (Closed)

Patch Set: updates Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/cocoa/content_exceptions_window_controller.mm ('k') | chrome/browser/cocoa/content_settings_dialog_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

diff --git a/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm b/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

index 730a0453bc4402cf76919ed70f04ba914ba2664a..2c842b5c69eb23dbb475e2a0243dbaf7b18d4b47 100644

--- a/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

+++ b/chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

@@ -220,7 +220,7 @@ TEST_F(ContentExceptionsWindowControllerTest, AddExistingEditAdd) {

TEST_F(ContentExceptionsWindowControllerTest, AddExistingDoesNotOverwrite) {

settingsMap_->SetContentSetting(HostContentSettingsMap::Pattern("myhost"),

CONTENT_SETTINGS_TYPE_COOKIES,

- CONTENT_SETTING_ASK);

+ CONTENT_SETTING_SESSION_ONLY);

ContentExceptionsWindowController* controller =

GetController(CONTENT_SETTINGS_TYPE_COOKIES);

@@ -235,7 +235,7 @@ TEST_F(ContentExceptionsWindowControllerTest, AddExistingDoesNotOverwrite) {

settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_COOKIES,

&settings);

EXPECT_EQ(1u, settings.size());

- EXPECT_EQ(CONTENT_SETTING_ASK, settings[0].second);

+ EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY, settings[0].second);

}