Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/ash/chrome_launcher_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 
 #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 {
 
 // App ID of default pinned apps.
 const char* kDefaultPinnedApps[] = {
   "pjkljhegncpnkpknbcohdijeoejaedia",  // Gmail
   "coobgpohoikkiipiblmjeljniedjpjpf",  // Search
   "apdfllckaahabafndbhieahigkjlhalf",  // Doc
   "blpcfgokakmgnkcojhhkbfbldkacnbeo",  // YouTube
@@ skipping 14 matching lines @@
 const char kPinnedAppsPrefAppIDPath[] = "id";
 
 const char kShelfAutoHideBehaviorAlways[] = "Always";
 const char kShelfAutoHideBehaviorNever[] = "Never";
 
 extern const char kShelfAlignmentBottom[] = "Bottom";
 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) {
   scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);
   app_value->SetString(kPinnedAppsPrefAppIDPath, app_id);
   return app_value.release();
 }
 
 }  // namespace ash