chrome/browser/extensions/extension_prefs_unittest.cc - Issue 10381097: Move content settings extension API to content_settings dir.

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/extension_prefs_unittest.cc

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fixed conflict Created 8 years, 7 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:

Index: chrome/browser/extensions/extension_prefs_unittest.cc

diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc

index 7c9733dd5fe9532cde4e0b3154d7cadc291f3436..17bb3b19048f39af96d1a307b8282d84b1b760b4 100644

--- a/chrome/browser/extensions/extension_prefs_unittest.cc

+++ b/chrome/browser/extensions/extension_prefs_unittest.cc

@@ -935,7 +935,7 @@ class ExtensionPrefsUninstallExtension : public ExtensionPrefsPrepopulatedTest {

virtual void Initialize() {

InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));

InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2"));

- ExtensionContentSettingsStore* store = prefs()->content_settings_store();

+ extensions::ContentSettingsStore* store = prefs()->content_settings_store();

ContentSettingsPattern pattern =

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

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