chrome/browser/extensions/extension_content_settings_store_unittest.cc - Issue 8334020: Check for default content setting pattern when requiring user authorization for plug-ins.

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/extensions/extension_content_settings_store_unittest.cc

Issue 8334020: Check for default content setting pattern when requiring user authorization for plug-ins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review 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

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/renderer_host/chrome_render_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_content_settings_store_unittest.cc

diff --git a/chrome/browser/extensions/extension_content_settings_store_unittest.cc b/chrome/browser/extensions/extension_content_settings_store_unittest.cc

index 6d58d3b2dc2cadd2df77b062072f89067d935016..ccbc0e2e4efc087d4001df04e80df808b2c638d5 100644

--- a/chrome/browser/extensions/extension_content_settings_store_unittest.cc

+++ b/chrome/browser/extensions/extension_content_settings_store_unittest.cc

@@ -51,8 +51,10 @@ ContentSetting GetContentSettingFromStore(

bool incognito) {

scoped_ptr<content_settings::RuleIterator> rule_iterator (

store->GetRuleIterator(content_type, resource_identifier, incognito));

- return content_settings::GetContentSetting(

- rule_iterator.get(), primary_url, secondary_url);

+ scoped_ptr<base::Value> setting(

+ content_settings::GetContentSettingValueAndPatterns(

+ rule_iterator.get(), primary_url, secondary_url, NULL, NULL));

+ return content_settings::ValueToContentSetting(setting.get());

}

void GetSettingsForOneTypeFromStore(