chrome/browser/plugins/plugin_info_message_filter_unittest.cc - Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope()

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/plugins/plugin_info_message_filter_unittest.cc

Issue 1818843002: Rename SetContentSetting() to SetContentSettingCustomScope() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix comment alignment Created 4 years, 9 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/permissions/permission_manager_unittest.cc ('K') | « chrome/browser/permissions/permission_manager_unittest.cc ('k') | chrome/browser/push_messaging/push_messaging_browsertest.cc » ('j') | chrome/browser/push_messaging/push_messaging_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/plugins/plugin_info_message_filter_unittest.cc

diff --git a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc

index c66faa5d54ecd004dbeeed70e231af4cdc47089a..a98a2ce0ed13efb9fc1f1fda1f0938a3b8c81dfc 100644

--- a/chrome/browser/plugins/plugin_info_message_filter_unittest.cc

+++ b/chrome/browser/plugins/plugin_info_message_filter_unittest.cc

@@ -227,11 +227,9 @@ TEST_F(PluginInfoMessageFilterTest, GetPluginContentSetting) {

CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);

// Allow plugin "foo" on all sites.

- map->SetContentSetting(ContentSettingsPattern::Wildcard(),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTINGS_TYPE_PLUGINS,

- "foo",

- CONTENT_SETTING_ALLOW);

+ map->SetContentSettingCustomScope(

+ ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTINGS_TYPE_PLUGINS, "foo", CONTENT_SETTING_ALLOW);

GURL unmatched_host("https://www.google.com");

ASSERT_EQ(CONTENT_SETTING_BLOCK, map->GetContentSetting(