chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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/api/content_settings/content_settings_store_unittest.cc

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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_details.h ('K') | « chrome/browser/extensions/api/content_settings/content_settings_store.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_unittest.cc » ('j') | chrome/common/chrome_content_settings_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc

index f3925f0ca468d21ac8250196bea020d6761284dc..3b3f1e8949400b44d3bf739d1836ce17d89149f5 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc

@@ -7,6 +7,7 @@

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/content_settings/content_settings_rule.h"

#include "chrome/browser/content_settings/content_settings_utils.h"

+#include "chrome/common/chrome_content_settings_client.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "url/gurl.h"

@@ -21,8 +22,11 @@ void CheckRule(const content_settings::Rule& rule,

const ContentSettingsPattern& primary_pattern,

const ContentSettingsPattern& secondary_pattern,

ContentSetting setting) {

- EXPECT_EQ(primary_pattern.ToString(), rule.primary_pattern.ToString());

- EXPECT_EQ(secondary_pattern.ToString(), rule.secondary_pattern.ToString());

+ content_settings::ChromeContentSettingsClient client;

+ EXPECT_EQ(primary_pattern.ToString(&client),

+ rule.primary_pattern.ToString(&client));

+ EXPECT_EQ(secondary_pattern.ToString(&client),

+ rule.secondary_pattern.ToString(&client));

EXPECT_EQ(setting, content_settings::ValueToContentSetting(rule.value.get()));

}