Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 153d286a4afb5f0ef50c7e0bad35879db7801e4b..d011ad11bdfe374b2e079a948617ca7ac422b448 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -144,7 +144,7 @@ enum MigratedPreferences {
 
 namespace chrome {
 
-void RegisterLocalState(PrefService* local_state) {
+void RegisterLocalState(PrefServiceSimple* local_state) {
   // Prefs in Local State.
   local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
 
@@ -218,7 +218,7 @@ void RegisterLocalState(PrefService* local_state) {
 #endif
 }
 
-void RegisterUserPrefs(PrefService* user_prefs) {
+void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
   // User prefs. Please keep this list alphabetized.
   AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
   AutofillManager::RegisterUserPrefs(user_prefs);
@@ -243,11 +243,11 @@ void RegisterUserPrefs(PrefService* user_prefs) {
   NetPrefObserver::RegisterPrefs(user_prefs);
   NewTabUI::RegisterUserPrefs(user_prefs);
   PasswordManager::RegisterUserPrefs(user_prefs);
-  PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs);
+  PrefProxyConfigTrackerImpl::RegisterUserPrefs(user_prefs);
   PrefsTabHelper::RegisterUserPrefs(user_prefs);
   ProfileImpl::RegisterUserPrefs(user_prefs);
   PromoResourceService::RegisterUserPrefs(user_prefs);
-  ProtocolHandlerRegistry::RegisterPrefs(user_prefs);
+  ProtocolHandlerRegistry::RegisterUserPrefs(user_prefs);

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

I don't see why you renamed this.

[Jói, 2012/12/20 16:30:31]

Because the convention is that RegisterPrefs takes a pointer to the local state
prefs, and RegisterUserPrefs takes a pointer to the profile prefs.  So renaming
it makes it conssistent with all the other functions here, and less confusing
when you read the code for the classes where I renamed.

[Mattias Nissler (ping if slow), 2012/12/21 13:09:31]

I see, makes sense. Then please also change lines 230, 243, 257 and 290.

[Jói, 2012/12/21 14:34:13]

Done. chrome::RegisterAutolaunchPrefs -> chrome::RegisterAutoLaunchPrefs, the
rest just renamed RegisterPrefs to RegisterUserPrefs.

   RegisterBrowserUserPrefs(user_prefs);
   SessionStartupPref::RegisterUserPrefs(user_prefs);
   TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
@@ -297,37 +297,35 @@ void RegisterUserPrefs(PrefService* user_prefs) {
 
 #if defined(OS_CHROMEOS)
   chromeos::Preferences::RegisterUserPrefs(user_prefs);
-  chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs);
+  chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(user_prefs);
 #endif
 
 #if defined(OS_WIN)
-  NetworkProfileBubble::RegisterPrefs(user_prefs);
+  NetworkProfileBubble::RegisterUserPrefs(user_prefs);

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

why rename?

[Jói, 2012/12/20 16:30:31]

As above.

 #endif
 }
 
 void MigrateUserPrefs(Profile* profile) {
   // Cleanup old prefs.
   static const char kBackupPref[] = "backup";
-  PrefService* prefs = profile->GetPrefs();
+  PrefServiceSyncable* prefs = profile->GetPrefs();
   prefs->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
-                                PrefService::UNSYNCABLE_PREF);
+                                PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(kBackupPref);
   prefs->UnregisterPreference(kBackupPref);
 }
 
-void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
+void MigrateBrowserPrefs(Profile* profile, PrefServiceSimple* local_state) {
   // Copy pref values which have been migrated to user_prefs from local_state,
   // or remove them from local_state outright, if copying is not required.
   int current_version =
       local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
 
   if (!(current_version & DNS_PREFS)) {
-    local_state->RegisterListPref(prefs::kDnsStartupPrefetchList,
-                                  PrefService::UNSYNCABLE_PREF);
+    local_state->RegisterListPref(prefs::kDnsStartupPrefetchList);
     local_state->ClearPref(prefs::kDnsStartupPrefetchList);
 
-    local_state->RegisterListPref(prefs::kDnsHostReferralList,
-                                  PrefService::UNSYNCABLE_PREF);
+    local_state->RegisterListPref(prefs::kDnsHostReferralList);
     local_state->ClearPref(prefs::kDnsHostReferralList);
 
     current_version |= DNS_PREFS;
@@ -335,11 +333,12 @@ void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
                             current_version);
   }
 
-  PrefService* user_prefs = profile->GetPrefs();
+  PrefServiceSyncable* user_prefs = profile->GetPrefs();
   if (!(current_version & WINDOWS_PREFS)) {
     local_state->RegisterIntegerPref(prefs::kDevToolsHSplitLocation, -1);
     if (local_state->HasPrefPath(prefs::kDevToolsHSplitLocation)) {
-      user_prefs->SetInteger(prefs::kDevToolsHSplitLocation,
+      user_prefs->SetInteger(
+          prefs::kDevToolsHSplitLocation,
           local_state->GetInteger(prefs::kDevToolsHSplitLocation));
     }
     local_state->ClearPref(prefs::kDevToolsHSplitLocation);
@@ -349,7 +348,8 @@ void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
       const PrefService::Preference* pref =
           local_state->FindPreference(prefs::kBrowserWindowPlacement);
       DCHECK(pref);
-      user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
+      user_prefs->Set(prefs::kBrowserWindowPlacement,
+                      *(pref->GetValue()));
     }
     local_state->ClearPref(prefs::kBrowserWindowPlacement);
 
@@ -364,14 +364,15 @@ void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
                                     GoogleURLTracker::kDefaultGoogleHomepage);
     if (local_state->HasPrefPath(prefs::kLastKnownGoogleURL)) {
       user_prefs->SetString(prefs::kLastKnownGoogleURL,
-          local_state->GetString(prefs::kLastKnownGoogleURL));
+                            local_state->GetString(prefs::kLastKnownGoogleURL));
     }
     local_state->ClearPref(prefs::kLastKnownGoogleURL);
 
     local_state->RegisterStringPref(prefs::kLastPromptedGoogleURL,
                                     std::string());
     if (local_state->HasPrefPath(prefs::kLastPromptedGoogleURL)) {
-      user_prefs->SetString(prefs::kLastPromptedGoogleURL,
+      user_prefs->SetString(
+          prefs::kLastPromptedGoogleURL,
           local_state->GetString(prefs::kLastPromptedGoogleURL));
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);