chrome/browser/extensions/api/preference/preference_api_prefs_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/preference/preference_api_prefs_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_unittest.cc ('k') | chrome/browser/extensions/extension_special_storage_policy_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/preference/preference_api_prefs_unittest.cc

diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc

index 30ff398ded212af266462b82a21b381fc2d6e5ac..8d6f14f5b74711971f128f95ae0895e6f04cbed6 100644

--- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc

+++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc

@@ -11,7 +11,9 @@

#include "chrome/browser/extensions/./extension_prefs_unittest.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"

#include "chrome/browser/extensions/api/preference/preference_api.h"

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

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

+#include "components/content_settings/core/common/content_settings_client.h"

#include "components/pref_registry/pref_registry_syncable.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/common/extension.h"

@@ -277,8 +279,9 @@ class ControlledPrefsUninstallExtension : public ExtensionControlledPrefsTest {

InstallExtensionControlledPref(

extension1(), kPref2, new base::StringValue("val2"));

scoped_refptr<ContentSettingsStore> store = content_settings_store();

+ content_settings::ChromeContentSettingsClient client;

ContentSettingsPattern pattern =

- ContentSettingsPattern::FromString("http://[*.]example.com");

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

store->SetExtensionContentSetting(extension1()->id(),

pattern, pattern,

CONTENT_SETTINGS_TYPE_IMAGES,