chrome/browser/content_settings/host_content_settings_map_unittest.cc - Issue 6410022: Add content_settings::PrefProvider to HostContentSettingsMap.

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/content_settings/host_content_settings_map_unittest.cc

Issue 6410022: Add content_settings::PrefProvider to HostContentSettingsMap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Worked on comments Created 9 years, 11 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

« chrome/browser/content_settings/host_content_settings_map.cc ('K') | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/content_settings/mock_content_settings_provider.h » ('j') | chrome/browser/content_settings/pref_content_settings_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc

index ac4e2d2b9cf910125f14677fb7c19063ba047f9a..edffe7e930165199f10f675e1845c8fcd55e9444 100644

--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc

+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc

@@ -615,6 +615,14 @@ TEST_F(HostContentSettingsMapTest, ResourceIdentifier) {

EXPECT_EQ(CONTENT_SETTING_ALLOW,

host_content_settings_map->GetContentSetting(

host, CONTENT_SETTINGS_TYPE_PLUGINS, resource2));

+ // If resource content settings are enable GetContentSettings should return

Bernhard Bauer 2011/02/07 09:46:46 Nit: "enabled"

markusheintz_ 2011/02/07 15:57:10 Done.

+ // CONTENT_SETTING_DEFAULT for content types that require resource

+ // identifiers.

+ ContentSettings settings =

+ host_content_settings_map->GetContentSettings(host);

+ EXPECT_EQ(CONTENT_SETTING_DEFAULT,

+ settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]);

}

TEST_F(HostContentSettingsMapTest, ResourceIdentifierPrefs) {