chrome/browser/plugins/plugin_info_message_filter_unittest.cc - Issue 796543002: Plugin Power Saver: Implement option in Settings.

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 796543002: Plugin Power Saver: Implement option in Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: restore 'ask' to list of allowed settings for policy settings Created 6 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

« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | components/policy/resources/policy_templates.json » ('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 7d53aca4b6995f058f1b84a2ac4c98e3dacb4617..59bd2ba2f1f55aa8a3a94701161db1f131c92097 100644

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

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

@@ -216,14 +216,12 @@ TEST_F(PluginInfoMessageFilterTest, GetPluginContentSetting) {

map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,

CONTENT_SETTING_BLOCK);

- // Set plugins to click-to-play on example.com and subdomains.

+ // Set plugins to Plugin Power Saver on example.com and subdomains.

ContentSettingsPattern pattern =

ContentSettingsPattern::FromString("[*.]example.com");

- map->SetContentSetting(pattern,

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTINGS_TYPE_PLUGINS,

- std::string(),

- CONTENT_SETTING_ASK);

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

+ CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),

+ CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);

// Allow plugin "foo" on all sites.

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

@@ -237,8 +235,9 @@ TEST_F(PluginInfoMessageFilterTest, GetPluginContentSetting) {

ASSERT_EQ(CONTENT_SETTING_BLOCK, map->GetContentSetting(

unmatched_host, unmatched_host, CONTENT_SETTINGS_TYPE_PLUGINS,

std::string()));

- ASSERT_EQ(CONTENT_SETTING_ASK, map->GetContentSetting(

- host, host, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));

+ ASSERT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,

+ map->GetContentSetting(host, host, CONTENT_SETTINGS_TYPE_PLUGINS,

+ std::string()));

ASSERT_EQ(CONTENT_SETTING_ALLOW, map->GetContentSetting(

host, host, CONTENT_SETTINGS_TYPE_PLUGINS, "foo"));

ASSERT_EQ(CONTENT_SETTING_DEFAULT, map->GetContentSetting(

@@ -249,7 +248,8 @@ TEST_F(PluginInfoMessageFilterTest, GetPluginContentSetting) {

// There is no specific content setting for "bar", so the general setting

// for example.com applies.

- VerifyPluginContentSetting(host, "bar", CONTENT_SETTING_ASK, false, false);

+ VerifyPluginContentSetting(

+ host, "bar", CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, false, false);

// Otherwise, use the default.

VerifyPluginContentSetting(unmatched_host, "bar", CONTENT_SETTING_BLOCK,