Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/ash/chrome_launcher_prefs.cc

Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc
diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
index 8de78f9c6e489c0c8b9525c6eacb98c3579bc984..05e9b3b1c960c312a7b1d412b254c8e2cc68cd7e 100644
--- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
@@ -7,7 +7,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
@@ -42,29 +42,29 @@ extern const char kShelfAlignmentLeft[] = "Left";
 extern const char kShelfAlignmentRight[] = "Right";
 extern const char kShelfAlignmentTop[] = "Top";
 
-void RegisterChromeLauncherUserPrefs(PrefServiceSyncable* user_prefs) {
+void RegisterChromeLauncherUserPrefs(PrefRegistrySyncable* registry) {
   // TODO: If we want to support multiple profiles this will likely need to be
   // pushed to local state and we'll need to track profile per item.
-  user_prefs->RegisterListPref(prefs::kPinnedLauncherApps,
+  registry->RegisterListPref(prefs::kPinnedLauncherApps,
                                CreateDefaultPinnedAppsList(),
-                               PrefServiceSyncable::SYNCABLE_PREF);
-  user_prefs->RegisterStringPref(prefs::kShelfAutoHideBehavior,
+                               PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kShelfAutoHideBehavior,
                                  kShelfAutoHideBehaviorNever,
-                                 PrefServiceSyncable::SYNCABLE_PREF);
-  user_prefs->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal,
+                                 PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal,
                                  std::string(),
-                                 PrefServiceSyncable::UNSYNCABLE_PREF);
-  user_prefs->RegisterStringPref(prefs::kShelfAlignment,
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kShelfAlignment,
                                  kShelfAlignmentBottom,
-                                 PrefServiceSyncable::SYNCABLE_PREF);
-  user_prefs->RegisterStringPref(prefs::kShelfAlignmentLocal,
+                                 PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kShelfAlignmentLocal,
                                  std::string(),
-                                 PrefServiceSyncable::UNSYNCABLE_PREF);
-  user_prefs->RegisterBooleanPref(prefs::kShowLogoutButtonInTray,
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray,
                                   false,
-                                  PrefServiceSyncable::UNSYNCABLE_PREF);
-  user_prefs->RegisterDictionaryPref(prefs::kShelfPreferences,
-                                     PrefServiceSyncable::UNSYNCABLE_PREF);
+                                  PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kShelfPreferences,
+                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 base::DictionaryValue* CreateAppDict(const std::string& app_id) {