Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/prefs/pref_service_builder.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/persistent_pref_store.h"
 #include "base/prefs/pref_store.h"
 
 class FilePath;
-class PrefModelAssociator;
 class PrefService;
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 // A class that allows convenient building of custom PrefServices.
 class PrefServiceBuilder {
  public:
   PrefServiceBuilder();
   virtual ~PrefServiceBuilder();
 
   // Functions for setting the various parameters of the PrefService to build.
   // These take ownership of the |store| parameter.
   PrefServiceBuilder& WithManagedPrefs(PrefStore* store);
   PrefServiceBuilder& WithExtensionPrefs(PrefStore* store);
   PrefServiceBuilder& WithCommandLinePrefs(PrefStore* store);
   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(
       const base::Callback<std::string(int)>& localized_string_method);
   PrefServiceBuilder& WithReadErrorCallback(
       const base::Callback<void(PersistentPrefStore::PrefReadError)>&
           read_error_callback);
 
   // Specifies to use an actual file-backed user pref store.
   PrefServiceBuilder& WithUserFilePrefs(
       const FilePath& prefs_file,
       base::SequencedTaskRunner* task_runner);
 
   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_;
   scoped_refptr<PrefStore> extension_prefs_;
   scoped_refptr<PrefStore> command_line_prefs_;
   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_;
 
   // Defaults to false.
   bool async_;
 
  private:
   void ResetDefaultState();
 
   DISALLOW_COPY_AND_ASSIGN(PrefServiceBuilder);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_