chrome/browser/profile_resetter/profile_resetter_unittest.cc - Issue 1320673013: Remove HostContentSettingsMap::IsSettingAllowedForType

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/profile_resetter/profile_resetter_unittest.cc

Issue 1320673013: Remove HostContentSettingsMap::IsSettingAllowedForType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-issetting-allowed

Patch Set: Created 5 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/profile_resetter/profile_resetter.cc ('K') | « chrome/browser/profile_resetter/profile_resetter.cc ('k') | components/content_settings/core/browser/content_settings_info.h » ('j') | components/content_settings/core/browser/content_settings_info.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/profile_resetter_unittest.cc

diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc

index 1d7f32f373fbcabdfa9004e7f2eea1feb2f6a177..50420abd5ed2845f57217be4a182712ee4467e22 100644

--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc

+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc

@@ -515,13 +515,11 @@ TEST_F(ProfileResetterTest, ResetContentSettings) {

ContentSetting site_setting = default_setting == CONTENT_SETTING_ALLOW

? CONTENT_SETTING_ALLOW

: CONTENT_SETTING_BLOCK;

- if (HostContentSettingsMap::IsSettingAllowedForType(

- profile()->GetPrefs(), wildcard_setting, content_type)) {

+ if (info->IsSettingValid(wildcard_setting)) {

host_content_settings_map->SetDefaultContentSetting(content_type,

wildcard_setting);

}

- if (HostContentSettingsMap::IsSettingAllowedForType(

- profile()->GetPrefs(), site_setting, content_type)) {

+ if (info->IsSettingValid(site_setting)) {

host_content_settings_map->SetContentSetting(

pattern, ContentSettingsPattern::Wildcard(), content_type,

std::string(), site_setting);