chrome/browser/content_settings/content_settings_provider_unittest.cc - Issue 8804016: Cleanup content settings code

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 8804016: Cleanup content settings code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Re-add deleted include in host_content_settings_map.cc Created 9 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/content_settings/content_settings_provider.h ('k') | chrome/browser/content_settings/content_settings_rule.h » ('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 438d27669bfb1262c9e0f0ad85f57bbb0d023a6a..e0857b3292a9ffa36983b3d45f4cf14fe4d5eab0 100644

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

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

@@ -16,14 +16,14 @@ TEST(ContentSettingsProviderTest, Mock) {

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

GURL url("http://www.youtube.com");

- MockProvider mock_provider(

+ MockProvider mock_provider(false);

+ mock_provider.SetWebsiteSetting(

pattern,

CONTENT_SETTINGS_TYPE_PLUGINS,

"java_plugin",

- CONTENT_SETTING_BLOCK,

- false,

- false);

+ Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));

EXPECT_EQ(CONTENT_SETTING_BLOCK,

GetContentSetting(&mock_provider, url, url,