Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/translate/translate_prefs.cc

 // Copyright (c) 2011 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/translate/translate_prefs.h"
 
 #include "base/string_util.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 
 const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] =
     "translate_language_blacklist";
 const char TranslatePrefs::kPrefTranslateSiteBlacklist[] =
     "translate_site_blacklist";
 const char TranslatePrefs::kPrefTranslateWhitelists[] =
     "translate_whitelists";
 const char TranslatePrefs::kPrefTranslateDeniedCount[] =
@@ skipping 123 matching lines @@
     return false;
   return (!prefs.IsLanguageBlacklisted(original_language));
 }
 
 bool TranslatePrefs::ShouldAutoTranslate(PrefService* user_prefs,
     const std::string& original_language, std::string* target_language) {
   TranslatePrefs prefs(user_prefs);
   return prefs.IsLanguageWhitelisted(original_language, target_language);
 }
 
-void TranslatePrefs::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
-  if (!user_prefs->FindPreference(kPrefTranslateLanguageBlacklist))
-    user_prefs->RegisterListPref(kPrefTranslateLanguageBlacklist,
-                                 PrefServiceSyncable::SYNCABLE_PREF);
-  if (!user_prefs->FindPreference(kPrefTranslateSiteBlacklist))
-    user_prefs->RegisterListPref(kPrefTranslateSiteBlacklist,
-                                 PrefServiceSyncable::SYNCABLE_PREF);
-  if (!user_prefs->FindPreference(kPrefTranslateWhitelists)) {
-    user_prefs->RegisterDictionaryPref(kPrefTranslateWhitelists,
-                                       PrefServiceSyncable::SYNCABLE_PREF);
-    MigrateTranslateWhitelists(user_prefs);
+void TranslatePrefs::RegisterUserPrefs(PrefService* prefs,
+                                       PrefRegistrySyncable* registry) {
+  if (!prefs->FindPreference(kPrefTranslateLanguageBlacklist))
+    registry->RegisterListPref(kPrefTranslateLanguageBlacklist,
+                               PrefRegistrySyncable::SYNCABLE_PREF);
+  if (!prefs->FindPreference(kPrefTranslateSiteBlacklist))
+    registry->RegisterListPref(kPrefTranslateSiteBlacklist,
+                               PrefRegistrySyncable::SYNCABLE_PREF);
+  if (!prefs->FindPreference(kPrefTranslateWhitelists)) {
+    registry->RegisterDictionaryPref(kPrefTranslateWhitelists,
+                                     PrefRegistrySyncable::SYNCABLE_PREF);
+    MigrateTranslateWhitelists(prefs);
   }
-  if (!user_prefs->FindPreference(kPrefTranslateDeniedCount))
-    user_prefs->RegisterDictionaryPref(kPrefTranslateDeniedCount,
-                                       PrefServiceSyncable::SYNCABLE_PREF);
-  if (!user_prefs->FindPreference(kPrefTranslateAcceptedCount))
-    user_prefs->RegisterDictionaryPref(kPrefTranslateAcceptedCount,
-                                       PrefServiceSyncable::SYNCABLE_PREF);
+  if (!prefs->FindPreference(kPrefTranslateDeniedCount))
+    registry->RegisterDictionaryPref(kPrefTranslateDeniedCount,
+                                     PrefRegistrySyncable::SYNCABLE_PREF);
+  if (!prefs->FindPreference(kPrefTranslateAcceptedCount))
+    registry->RegisterDictionaryPref(kPrefTranslateAcceptedCount,
+                                     PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 // TranslatePrefs: private, static: --------------------------------------------
 
 void TranslatePrefs::MigrateTranslateWhitelists(PrefService* user_prefs) {
   // Old format of kPrefTranslateWhitelists
   // - original language -> list of target langs to auto-translate
   // - list of langs is in order of being enabled i.e. last in list is the
   //   most recent language that user enabled via
   //   Always translate |source_lang| to |target_lang|"
@@ skipping 71 matching lines @@
 
 bool TranslatePrefs::IsLanguageWhitelisted(
     const std::string& original_language, std::string* target_language) {
   const DictionaryValue* dict = prefs_->GetDictionary(kPrefTranslateWhitelists);
   if (dict && dict->GetString(original_language, target_language)) {
     DCHECK(!target_language->empty());
     return !target_language->empty();
   }
   return false;
 }