Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9e27a922dea936ba660d45291f07cad1ccb17abd..893504b622d0ac0527335f72f514dde6d9a1e64a 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -269,26 +269,26 @@ int ProfileImpl::create_readme_delay_ms = 60000;
 const char* const ProfileImpl::kPrefExitTypeNormal = "Normal";
 
 // static
-void ProfileImpl::RegisterUserPrefs(PrefService* prefs) {
+void ProfileImpl::RegisterUserPrefs(PrefServiceSyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled,
                              false,
-                             PrefService::UNSYNCABLE_PREF);
+                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kForceSafeSearch,
                              false,
-                             PrefService::UNSYNCABLE_PREF);
+                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kProfileAvatarIndex,
                              -1,
-                             PrefService::SYNCABLE_PREF);
+                             PrefServiceSyncable::SYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kProfileName,
                             "",
-                            PrefService::SYNCABLE_PREF);
+                            PrefServiceSyncable::SYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kHomePage,
                             std::string(),
-                            PrefService::SYNCABLE_PREF);
+                            PrefServiceSyncable::SYNCABLE_PREF);
 #if defined(ENABLE_PRINTING)
   prefs->RegisterBooleanPref(prefs::kPrintingEnabled,
                              true,
-                             PrefService::UNSYNCABLE_PREF);
+                             PrefServiceSyncable::UNSYNCABLE_PREF);
 #endif
   prefs->RegisterBooleanPref(prefs::kPrintPreviewDisabled,
 #if defined(GOOGLE_CHROME_BUILD)
@@ -296,23 +296,23 @@ void ProfileImpl::RegisterUserPrefs(PrefService* prefs) {
 #else
                              true,
 #endif
-                             PrefService::UNSYNCABLE_PREF);
+                             PrefServiceSyncable::UNSYNCABLE_PREF);
 
   // Initialize the cache prefs.
   prefs->RegisterFilePathPref(prefs::kDiskCacheDir,
                               FilePath(),
-                              PrefService::UNSYNCABLE_PREF);
+                              PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kDiskCacheSize,
                              0,
-                             PrefService::UNSYNCABLE_PREF);
+                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kMediaCacheSize,
                              0,
-                             PrefService::UNSYNCABLE_PREF);
+                             PrefServiceSyncable::UNSYNCABLE_PREF);
 
   // Deprecated. Kept around for migration.
   prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit,
                              false,
-                             PrefService::SYNCABLE_PREF);
+                             PrefServiceSyncable::SYNCABLE_PREF);
 }
 
 ProfileImpl::ProfileImpl(
@@ -350,9 +350,9 @@ ProfileImpl::ProfileImpl(
 
   // TODO(atwilson): Change |cloud_policy_manager_| and
   // |managed_mode_policy_provider_| to proper ProfileKeyedServices once
-  // PrefService is a ProfileKeyedService (policy must be initialized before
-  // PrefService because PrefService depends on policy loading to get overridden
-  // pref values).
+  // PrefServiceSyncable is a ProfileKeyedService (policy must be initialized
+  // before PrefServiceSyncable because PrefServiceSyncable depends on policy
+  // loading to get overridden pref values).
 #if !defined(OS_CHROMEOS)
   if (command_line->HasSwitch(switches::kLoadCloudPolicyOnSignin)) {
     cloud_policy_manager_ =
@@ -373,7 +373,7 @@ ProfileImpl::ProfileImpl(
 #endif
 
   if (create_mode == CREATE_MODE_ASYNCHRONOUS) {
-    prefs_.reset(ChromePrefServiceBuilder().CreateChromePrefs(
+    prefs_.reset(ChromePrefServiceBuilder().CreateProfilePrefs(
         GetPrefFilePath(),
         sequenced_task_runner,
         policy_service_.get(),
@@ -388,7 +388,7 @@ ProfileImpl::ProfileImpl(
                                            base::Unretained(this)));
   } else if (create_mode == CREATE_MODE_SYNCHRONOUS) {
     // Load prefs synchronously.
-    prefs_.reset(ChromePrefServiceBuilder().CreateChromePrefs(
+    prefs_.reset(ChromePrefServiceBuilder().CreateProfilePrefs(
         GetPrefFilePath(),
         sequenced_task_runner,
         policy_service_.get(),