Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1635)

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: Comment change. 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..28196a72729470011c2ce0d4061edca641fec8ce 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -140,14 +140,14 @@ TEST_F(PrefProviderTest, Incognito) {
PrefServiceSyncable* regular_prefs = builder.CreateSyncable(registry);
Profile::RegisterUserPrefs(registry);
- chrome::RegisterUserPrefs(regular_prefs, registry);
+ chrome::RegisterUserPrefs(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);
+ chrome::RegisterUserPrefs(otr_registry);
TestingProfile::Builder profile_builder;
profile_builder.SetPrefService(make_scoped_ptr(regular_prefs));
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service_unittest.cc » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698