chrome/browser/content_settings/content_settings_pref_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_pref_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_unittest.cc ('K') | « chrome/browser/content_settings/content_settings_policy_provider_unittest.cc ('k') | chrome/browser/content_settings/content_settings_provider.h » ('j') | chrome/browser/content_settings/content_settings_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

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

index ddbaa741110d884d973433261c54450b3c9f3a43..31a84bd998e893dd504e95592d89e877e2923c9e 100644

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

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

@@ -235,8 +235,8 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {

GURL host("http://example.com/");

ContentSettingsPattern pattern("[*.]example.com");

- std::string resource1("someplugin");

- std::string resource2("otherplugin");

+ std::string resource1("shockwave");

Bernhard Bauer 2011/02/23 13:18:53 I hope your unit tests don't depend on the actual,

markusheintz_ 2011/02/23 18:42:09 Not at all just wanted to have some names that loo

+ std::string resource2("java-runtime-environment");

EXPECT_EQ(CONTENT_SETTING_DEFAULT,

pref_content_settings_provider.GetContentSetting(