chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 12315053: Fix prefs registration in SyncPrefs.

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 12315053: Fix prefs registration in SyncPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years, 10 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

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 d7dd7fd0712d0ccad34d21d96d303c4e84c6094b..ffa7bca43f7d7377e2f5be0383a010abefd07e66 100644

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

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

@@ -139,14 +139,12 @@ TEST_F(PrefProviderTest, Incognito) {

scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable);

PrefServiceSyncable* regular_prefs = builder.CreateSyncable(registry);

- Profile::RegisterUserPrefs(registry);

chrome::RegisterUserPrefs(regular_prefs, registry);

builder.WithUserPrefs(otr_user_prefs);

scoped_refptr<PrefRegistrySyncable> otr_registry(new PrefRegistrySyncable);

PrefServiceSyncable* otr_prefs = builder.CreateSyncable(otr_registry);

- Profile::RegisterUserPrefs(otr_registry);

chrome::RegisterUserPrefs(otr_prefs, otr_registry);

TestingProfile::Builder profile_builder;

« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »