Clean up PrefServiceBuilder

chrome/browser/prefs/pref_service_syncable_builder.cc

Index: chrome/browser/prefs/pref_service_syncable_builder.cc
diff --git a/chrome/browser/prefs/pref_service_syncable_builder.cc b/chrome/browser/prefs/pref_service_syncable_builder.cc
index 701be662623e1c9276e391a9734be73aaae9c460..86899fc5bca298165aa5d55239ef05d64c5d7985 100644
--- a/chrome/browser/prefs/pref_service_syncable_builder.cc
+++ b/chrome/browser/prefs/pref_service_syncable_builder.cc
@@ -27,49 +27,47 @@ PrefServiceSyncableBuilder::~PrefServiceSyncableBuilder() {
 }
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
-PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithManagedPolicies(
+void PrefServiceSyncableBuilder::SetManagedPolicies(
     policy::PolicyService* service) {
-  WithManagedPrefs(new policy::ConfigurationPolicyPrefStore(
-      service,
-      g_browser_process->browser_policy_connector()->GetHandlerList(),
-      policy::POLICY_LEVEL_MANDATORY));
-  return *this;
+  set_managed_prefs(
+      new policy::ConfigurationPolicyPrefStore(
+          service,
+          g_browser_process->browser_policy_connector()->GetHandlerList(),
+          policy::POLICY_LEVEL_MANDATORY));
 }
 
-PrefServiceSyncableBuilder& PrefServiceSyncableBuilder::WithRecommendedPolicies(
+void PrefServiceSyncableBuilder::SetRecommendedPolicies(
     policy::PolicyService* service) {
-  WithRecommendedPrefs(new policy::ConfigurationPolicyPrefStore(
-      service,
-      g_browser_process->browser_policy_connector()->GetHandlerList(),
-      policy::POLICY_LEVEL_RECOMMENDED));
-  return *this;
+  set_recommended_prefs(
+      new policy::ConfigurationPolicyPrefStore(
+          service,
+          g_browser_process->browser_policy_connector()->GetHandlerList(),
+          policy::POLICY_LEVEL_RECOMMENDED));
 }
 #endif
 
-PrefServiceSyncableBuilder&
-PrefServiceSyncableBuilder::WithCommandLine(CommandLine* command_line) {
-  WithCommandLinePrefs(new CommandLinePrefStore(command_line));
-  return *this;
+void PrefServiceSyncableBuilder::SetCommandLine(CommandLine* command_line) {
+  set_command_line_prefs(new CommandLinePrefStore(command_line));
 }
 
-PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable(
+scoped_ptr<PrefServiceSyncable> PrefServiceSyncableBuilder::CreateSyncable(
     user_prefs::PrefRegistrySyncable* pref_registry) {
   TRACE_EVENT0("browser", "PrefServiceSyncableBuilder::CreateSyncable");
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  PrefServiceSyncable* pref_service = new PrefServiceSyncable(
-      pref_notifier,
-      new PrefValueStore(managed_prefs_.get(),
-                         supervised_user_prefs_.get(),
-                         extension_prefs_.get(),
-                         command_line_prefs_.get(),
-                         user_prefs_.get(),
-                         recommended_prefs_.get(),
-                         pref_registry->defaults().get(),
-                         pref_notifier),
-      user_prefs_.get(),
-      pref_registry,
-      read_error_callback_,
-      async_);
-  ResetDefaultState();
-  return pref_service;
+  scoped_ptr<PrefServiceSyncable> pref_service(
+      new PrefServiceSyncable(
+          pref_notifier,
+          new PrefValueStore(managed_prefs_.get(),
+                             supervised_user_prefs_.get(),
+                             extension_prefs_.get(),
+                             command_line_prefs_.get(),
+                             user_prefs_.get(),
+                             recommended_prefs_.get(),
+                             pref_registry->defaults().get(),
+                             pref_notifier),
+          user_prefs_.get(),
+          pref_registry,
+          read_error_callback_,
+          async_));
+  return pref_service.Pass();
 }