chrome/browser/profile_resetter/profile_resetter_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/profile_resetter/profile_resetter_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/policy/policy_browsertest.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | chrome/common/chrome_content_settings_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/profile_resetter_unittest.cc

diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc

index 9db4dd6406424c0fda22620d19dc3c74ce40260a..a80c8dd53c0c08d3152da98fd976a9975dde4ba1 100644

--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc

+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc

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

#include "chrome/browser/themes/theme_service_factory.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/webdata/web_data_service_factory.h"

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

#include "chrome/common/pref_names.h"

#include "chrome/test/base/browser_with_test_window_test.h"

#include "components/google/core/browser/google_pref_names.h"

@@ -492,8 +493,9 @@ TEST_F(ProfileResetterTest, ResetHomepagePartially) {

TEST_F(ProfileResetterTest, ResetContentSettings) {

HostContentSettingsMap* host_content_settings_map =

profile()->GetHostContentSettingsMap();

+ content_settings::ChromeContentSettingsClient client;

ContentSettingsPattern pattern =

- ContentSettingsPattern::FromString("[*.]example.org");

+ ContentSettingsPattern::FromString(&client, "[*.]example.org");

std::map<ContentSettingsType, ContentSetting> default_settings;

for (int type = 0; type < CONTENT_SETTINGS_NUM_TYPES; ++type) {