Clean up PrefServiceBuilder

chrome/browser/prefs/pref_service_syncable_builder.h

Index: chrome/browser/prefs/pref_service_syncable_builder.h
diff --git a/chrome/browser/prefs/pref_service_syncable_builder.h b/chrome/browser/prefs/pref_service_syncable_builder.h
index df0e53d0a7bf289c042ee37894b4f4f7279966b6..566559e0876f3409ad3d7c437d2a161a64a17ad7 100644
--- a/chrome/browser/prefs/pref_service_syncable_builder.h
+++ b/chrome/browser/prefs/pref_service_syncable_builder.h
@@ -21,23 +21,21 @@ class PrefRegistrySyncable;
 // A PrefServiceBuilder that also knows how to build a
 // PrefServiceSyncable, and may know about Chrome concepts such as
 // PolicyService.
-class PrefServiceSyncableBuilder : public PrefServiceBuilder {
+class PrefServiceSyncableBuilder : public base::PrefServiceBuilder {
  public:
   PrefServiceSyncableBuilder();
   virtual ~PrefServiceSyncableBuilder();
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // Set up policy pref stores using the given policy service.
-  PrefServiceSyncableBuilder& WithManagedPolicies(
-      policy::PolicyService* service);
-  PrefServiceSyncableBuilder& WithRecommendedPolicies(
-      policy::PolicyService* service);
+  void SetManagedPolicies(policy::PolicyService* service);
+  void SetRecommendedPolicies(policy::PolicyService* service);
 #endif
 
   // Specifies to use an actual command-line backed command-line pref store.
-  PrefServiceSyncableBuilder& WithCommandLine(CommandLine* command_line);
+  void SetCommandLine(CommandLine* command_line);
 
-  virtual PrefServiceSyncable* CreateSyncable(
+  scoped_ptr<PrefServiceSyncable> CreateSyncable(
       user_prefs::PrefRegistrySyncable* registry);
 
  private: