Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/themes/theme_service_factory.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/themes/theme_service_factory.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #endif
 
@@ skipping 30 matching lines @@
 #if defined(TOOLKIT_GTK)
   provider = new GtkThemeService;
 #else
   provider = new ThemeService;
 #endif
   provider->Init(profile);
 
   return provider;
 }
 
-void ThemeServiceFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void ThemeServiceFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
 #if defined(TOOLKIT_GTK)
-  prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
-                             GtkThemeService::DefaultUsesSystemTheme(),
-                             PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(prefs::kUsesSystemTheme,
+                                GtkThemeService::DefaultUsesSystemTheme(),
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
-  prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
-                              base::FilePath(),
-                              PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterStringPref(prefs::kCurrentThemeID,
-                            ThemeService::kDefaultThemeID,
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
+                                 base::FilePath(),
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kCurrentThemeID,
+                               ThemeService::kDefaultThemeID,
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kCurrentThemeImages,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kCurrentThemeColors,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kCurrentThemeTints,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const {
   return true;
 }