chrome/browser/content_settings/host_content_settings_map_unittest.cc - Issue 7831075: Delegating the "are images allowed" decision to renderer.

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 7831075: Delegating the "are images allowed" decision to renderer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Rebased. Created 9 years, 2 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.h ('K') | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | chrome/common/content_settings.h » ('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 610c1b7a86396c7b1cf75579f4b6e2479c8884de..7e25dfb581d6cb868a0f00fc730ddeb599296914 100644

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

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

@@ -178,7 +178,7 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) {

CONTENT_SETTINGS_TYPE_PLUGINS,

std::string(),

CONTENT_SETTING_BLOCK);

- HostContentSettingsMap::SettingsForOneType host_settings;

+ ContentSettingsForOneType host_settings;

host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES,

"",

&host_settings);

@@ -228,7 +228,7 @@ TEST_F(HostContentSettingsMapTest, Clear) {

CONTENT_SETTING_BLOCK);

host_content_settings_map->ClearSettingsForOneType(

CONTENT_SETTINGS_TYPE_IMAGES);

- HostContentSettingsMap::SettingsForOneType host_settings;

+ ContentSettingsForOneType host_settings;

host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES,

"",

&host_settings);