chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace.

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_pref_provider_unittest.cc

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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_policy_provider.cc ('K') | « chrome/browser/content_settings/content_settings_pref_provider.cc ('k') | chrome/browser/content_settings/cookie_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

index 1ddc6d092632e48228eed233b0ba28d38660768f..c287abb33fbde39b3da6d9b53bd3e0233dae11f6 100644

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

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

@@ -136,13 +136,15 @@ TEST_F(PrefProviderTest, Incognito) {

PrefServiceMockBuilder builder;

builder.WithUserPrefs(user_prefs);

- scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);

+ scoped_refptr<user_prefs::PrefRegistrySyncable> registry(

+ new user_prefs::PrefRegistrySyncable);

PrefServiceSyncable* regular_prefs = builder.CreateSyncable(registry);

chrome::RegisterUserPrefs(registry);

builder.WithUserPrefs(otr_user_prefs);

- scoped_refptr<PrefRegistrySyncable> otr_registry(new PrefRegistrySyncable);

+ scoped_refptr<user_prefs::PrefRegistrySyncable> otr_registry(

+ new user_prefs::PrefRegistrySyncable);

PrefServiceSyncable* otr_prefs = builder.CreateSyncable(otr_registry);

chrome::RegisterUserPrefs(otr_registry);