chrome/browser/ui/cocoa/content_exceptions_window_controller_unittest.mm - Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

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/ui/cocoa/content_exceptions_window_controller_unittest.mm

Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings

Patch Set: updates Created 10 years 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

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

Index: chrome/browser/ui/cocoa/content_exceptions_window_controller_unittest.mm

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

index 99dfb9d431a05ae8db63c20e1c9f3d766edd7be6..d42e1715d92bc2cd87cb9feec9d611ef17d50e47 100644

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

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

@@ -160,7 +160,7 @@ TEST_F(ContentExceptionsWindowControllerTest, Add) {

"",

&settings);

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

- EXPECT_EQ(HostContentSettingsMap::Pattern("addedhost"), settings[0].first);

+ EXPECT_EQ(ContentSettingsPattern("addedhost"), settings[0].first);

}

TEST_F(ContentExceptionsWindowControllerTest, AddEscDoesNotAdd) {

@@ -202,7 +202,7 @@ TEST_F(ContentExceptionsWindowControllerTest, AddEditAddAdd) {

}

TEST_F(ContentExceptionsWindowControllerTest, AddExistingEditAdd) {

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

+ settingsMap_->SetContentSetting(ContentSettingsPattern("myhost"),

CONTENT_SETTINGS_TYPE_PLUGINS,

"",

CONTENT_SETTING_BLOCK);

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

}

TEST_F(ContentExceptionsWindowControllerTest, AddExistingDoesNotOverwrite) {

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

+ settingsMap_->SetContentSetting(ContentSettingsPattern("myhost"),

CONTENT_SETTINGS_TYPE_COOKIES,

"",

CONTENT_SETTING_SESSION_ONLY);