Clean up PrefServiceBuilder

chrome/browser/prefs/chrome_pref_service_factory.h

Index: chrome/browser/prefs/chrome_pref_service_factory.h
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h
index eb6b4fce2cc0a80a2f0b4e0dcc4a399e877135d6..b1322b768e29e33a7bb6bd5defc7ac2298b30907 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.h
+++ b/chrome/browser/prefs/chrome_pref_service_factory.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 
 namespace base {
 class FilePath;
@@ -43,14 +44,14 @@ namespace chrome_prefs {
 // guaranteed that in asynchronous version initialization happens after this
 // function returned.
 
-PrefService* CreateLocalState(
+scoped_ptr<PrefService> CreateLocalState(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     const scoped_refptr<PrefRegistry>& pref_registry,
     bool async);
 
-PrefServiceSyncable* CreateProfilePrefs(
+scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
     const base::FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,