chrome/browser/content_settings/content_settings_provider_unittest.cc - Issue 6542048: Add content_settings::PolicyProvider and a set of new policies to managed content 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/content_settings/content_settings_provider_unittest.cc

Issue 6542048: Add content_settings::PolicyProvider and a set of new policies to managed content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: " Created 9 years, 10 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/content_settings_policy_provider.cc ('K') | « chrome/browser/content_settings/content_settings_provider.h ('k') | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_provider_unittest.cc b/chrome/browser/content_settings/content_settings_provider_unittest.cc

index 0fb0d5333e922181167c118ab782a46b2d201003..11c0284b24e49daee8c17f06ced04607d9d746ef 100644

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

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

@@ -34,7 +34,9 @@ TEST(ContentSettingsProviderTest, Mock) {

CONTENT_SETTINGS_TYPE_PLUGINS,

"java_plugin",

CONTENT_SETTING_BLOCK,

+ false,

false);

EXPECT_EQ(CONTENT_SETTING_BLOCK, mock_provider.GetContentSetting(

url, url, CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin"));

EXPECT_EQ(CONTENT_SETTING_DEFAULT, mock_provider.GetContentSetting(