Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/prefs/pref_service_builder.h

Index: chrome/browser/prefs/pref_service_builder.h
diff --git a/chrome/browser/prefs/pref_service_builder.h b/chrome/browser/prefs/pref_service_builder.h
index 3c64d0dc6eb1118c262b97d4d82aeb6285c07c0a..d532a06d562f5698df6e486f66cf6e44c4d85a0d 100644
--- a/chrome/browser/prefs/pref_service_builder.h
+++ b/chrome/browser/prefs/pref_service_builder.h
@@ -12,7 +12,6 @@
 #include "base/prefs/pref_store.h"
 
 class FilePath;
-class PrefModelAssociator;
 class PrefService;
 
 namespace base {
@@ -33,9 +32,6 @@ class PrefServiceBuilder {
   PrefServiceBuilder& WithUserPrefs(PersistentPrefStore* store);
   PrefServiceBuilder& WithRecommendedPrefs(PrefStore* store);
 
-  // Takes ownership of the associator.
-  PrefServiceBuilder& WithSyncAssociator(PrefModelAssociator* associator);
-
   // Sets up error callback for the PrefService.  A do-nothing default
   // is provided if this is not called.
   PrefServiceBuilder& WithReadErrorCallback(
@@ -49,8 +45,9 @@ class PrefServiceBuilder {
 
   PrefServiceBuilder& WithAsync(bool async);
 
-  // Creates the PrefService, invalidating the entire builder configuration.
-  virtual PrefService* Create();
+  // Initializes the PrefService object with the builder
+  // configuration. This resets the entire builder configuration.
+  virtual PrefService* Build(PrefService* pref_service);
 
  protected:
   scoped_refptr<PrefStore> managed_prefs_;
@@ -59,10 +56,6 @@ class PrefServiceBuilder {
   scoped_refptr<PersistentPrefStore> user_prefs_;
   scoped_refptr<PrefStore> recommended_prefs_;
 
-  // TODO(joi): Would be nice to switch the various places that deal
-  // with this pointer to using scoped_ptr::Pass semantics.
-  PrefModelAssociator* sync_associator_;
-
   base::Callback<void(PersistentPrefStore::PrefReadError)> read_error_callback_;
 
   // Defaults to false.