Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/bookmarks/bookmark_prompt_prefs.cc

Index: chrome/browser/bookmarks/bookmark_prompt_prefs.cc
diff --git a/chrome/browser/bookmarks/bookmark_prompt_prefs.cc b/chrome/browser/bookmarks/bookmark_prompt_prefs.cc
index 28440cd0a4e27ef81ad9a33522bf1d4159583c21..b412c12f4dc6b85d001174ce26b73200e8207861 100644
--- a/chrome/browser/bookmarks/bookmark_prompt_prefs.cc
+++ b/chrome/browser/bookmarks/bookmark_prompt_prefs.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
 
-#include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
+#include "chrome/browser/prefs/pref_service.h"

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

Should be pref_service_base.h instead? But the plan for that was to go away in
favor of a single PrefService type, correct? In that case, no change needed.

[Jói, 2013/02/07 14:52:32]

That's right, the plan is for PrefServiceBase to go away so I'm preferring to
include the concrete type.

 #include "chrome/common/pref_names.h"
 
 BookmarkPromptPrefs::BookmarkPromptPrefs(PrefServiceBase* user_prefs)
@@ -32,11 +33,11 @@ bool BookmarkPromptPrefs::IsBookmarkPromptEnabled() const {
 }
 
 // static
-void BookmarkPromptPrefs::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
+void BookmarkPromptPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   // We always register preferences without checking FieldTrial, because
   // we may not receive field trial list from the server yet.
-  user_prefs->RegisterBooleanPref(prefs::kBookmarkPromptEnabled, true,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
-  user_prefs->RegisterIntegerPref(prefs::kBookmarkPromptImpressionCount, 0,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kBookmarkPromptEnabled, true,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(prefs::kBookmarkPromptImpressionCount, 0,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }