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 a6702b706492d0f61c7697aed7b731321eed3558..0b0f38cf05c863af0a48ca3c1790af5f6599c4e9 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 callbacks for the PrefService.  Do-nothing defaults are
   // provided if these are not called.
   PrefServiceBuilder& WithLocalizedStringMethod(
@@ -51,8 +47,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);

[Mattias Nissler (ping if slow), 2012/12/14 13:50:06]

Ah, now I understand the issue :) You want the builder to be able to build both
PrefServiceSimple and PrefServiceSyncable. I'd just create subclasses here that
override Build and pass on the parameters.

[kaiwang, 2012/12/15 00:10:07]

Initializing PrefServiceSimple and PrefServiceSyncable are exactly same code, so
write sub-builders may not worth. I just changed the code to make constructors
private for PrefServices. This can also make sure no uninitialized PrefService
exist

 
  protected:
   scoped_refptr<PrefStore> managed_prefs_;
@@ -61,10 +58,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<std::string(int)> get_localized_string_method_;
   base::Callback<void(PersistentPrefStore::PrefReadError)> read_error_callback_;