Clean up PrefServiceBuilder

base/prefs/pref_service_builder.cc

Index: base/prefs/pref_service_builder.cc
diff --git a/base/prefs/pref_service_builder.cc b/base/prefs/pref_service_builder.cc
index 16b4565663b4ce67a7239d03d191b1d0b68e66bb..4ed017c910ee1d758780f6292ec05b96617f52fa 100644
--- a/base/prefs/pref_service_builder.cc
+++ b/base/prefs/pref_service_builder.cc
@@ -12,6 +12,8 @@
 
 #include "base/prefs/pref_value_store.h"
 
+namespace base {
+
 namespace {
 
 // Do-nothing default implementation.
@@ -20,67 +22,28 @@ void DoNothingHandleReadError(PersistentPrefStore::PrefReadError error) {
 
 }  // namespace
 
-PrefServiceBuilder::PrefServiceBuilder() {
-  ResetDefaultState();
-}
-
-PrefServiceBuilder::~PrefServiceBuilder() {
-}
-
-PrefServiceBuilder& PrefServiceBuilder::WithManagedPrefs(PrefStore* store) {
-  managed_prefs_ = store;
-  return *this;
-}
-
-PrefServiceBuilder& PrefServiceBuilder::WithSupervisedUserPrefs(
-    PrefStore* store) {
-  supervised_user_prefs_ = store;
-  return *this;
-}
-
-PrefServiceBuilder& PrefServiceBuilder::WithExtensionPrefs(PrefStore* store) {
-  extension_prefs_ = store;
-  return *this;
-}
-
-PrefServiceBuilder& PrefServiceBuilder::WithCommandLinePrefs(PrefStore* store) {
-  command_line_prefs_ = store;
-  return *this;
-}
-
-PrefServiceBuilder& PrefServiceBuilder::WithUserPrefs(
-    PersistentPrefStore* store) {
-  user_prefs_ = store;
-  return *this;
-}
-
-PrefServiceBuilder& PrefServiceBuilder::WithRecommendedPrefs(PrefStore* store) {
-  recommended_prefs_ = store;
-  return *this;
-}
+PrefServiceBuilder::PrefServiceBuilder()
+    : managed_prefs_(NULL),
+      supervised_user_prefs_(NULL),
+      extension_prefs_(NULL),
+      command_line_prefs_(NULL),
+      user_prefs_(NULL),
+      recommended_prefs_(NULL),
+      read_error_callback_(base::Bind(&DoNothingHandleReadError)),
+      async_(false) {}
 
-PrefServiceBuilder& PrefServiceBuilder::WithReadErrorCallback(
-    const base::Callback<void(PersistentPrefStore::PrefReadError)>&
-    read_error_callback) {
-  read_error_callback_ = read_error_callback;
-  return *this;
-}
+PrefServiceBuilder::~PrefServiceBuilder() {}
 
-PrefServiceBuilder& PrefServiceBuilder::WithUserFilePrefs(
+void PrefServiceBuilder::SetUserPrefsFile(
     const base::FilePath& prefs_file,
     base::SequencedTaskRunner* task_runner) {
   user_prefs_ = new JsonPrefStore(prefs_file, task_runner);
-  return *this;
 }
 
-PrefServiceBuilder& PrefServiceBuilder::WithAsync(bool async) {
-  async_ = async;
-  return *this;
-}
-
-PrefService* PrefServiceBuilder::Create(PrefRegistry* pref_registry) {
+scoped_ptr<PrefService> PrefServiceBuilder::Create(
+    PrefRegistry* pref_registry) {
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PrefService* pref_service =
+  scoped_ptr<PrefService> pref_service(
       new PrefService(pref_notifier,
                       new PrefValueStore(managed_prefs_.get(),
                                          supervised_user_prefs_.get(),
@@ -93,18 +56,8 @@ PrefService* PrefServiceBuilder::Create(PrefRegistry* pref_registry) {
                       user_prefs_.get(),
                       pref_registry,
                       read_error_callback_,
-                      async_);
-  ResetDefaultState();
-  return pref_service;
+                      async_));
+  return pref_service.Pass();
 }
 
-void PrefServiceBuilder::ResetDefaultState() {
-  managed_prefs_ = NULL;
-  supervised_user_prefs_ = NULL;
-  extension_prefs_ = NULL;
-  command_line_prefs_ = NULL;
-  user_prefs_ = NULL;
-  recommended_prefs_ = NULL;
-  read_error_callback_ = base::Bind(&DoNothingHandleReadError);
-  async_ = false;
-}
+}  // namespace base