Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/bookmarks/bookmark_model_factory.cc

Index: chrome/browser/bookmarks/bookmark_model_factory.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index 6f1bb5e3a93c16a0ea05690e78ef6a81b724d71a..20d4f3fe0d7a921a49f597f70b6409ab604317e9 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -5,8 +5,9 @@
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 
 #include "base/memory/singleton.h"
+#include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/pref_names.h"
@@ -41,13 +42,14 @@ ProfileKeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
   return bookmark_model;
 }
 
-void BookmarkModelFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void BookmarkModelFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   // Don't sync this, as otherwise, due to a limitation in sync, it
   // will cause a deadlock (see http://crbug.com/97955).  If we truly
   // want to sync the expanded state of folders, it should be part of
   // bookmark sync itself (i.e., a property of the sync folder nodes).
-  prefs->RegisterListPref(prefs::kBookmarkEditorExpandedNodes, new ListValue,
-                          PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterListPref(prefs::kBookmarkEditorExpandedNodes,
+                             new base::ListValue,
+                             PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 bool BookmarkModelFactory::ServiceRedirectedInIncognito() const {