Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/chrome_pref_service_factory.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_CHROME_PREF_SERVICE_FACTORY_H_
 #define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
 
+#include "base/memory/scoped_ptr.h"
+
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace policy {
 class PolicyService;
 }
 
 class FilePath;
-class PrefServiceSimple;
+class PrefRegistry;
+class PrefService;
 class PrefServiceSyncable;
 class PrefStore;
 
 namespace chrome_prefs {
 
 // Factory methods that create and initialize a new instance of a
 // PrefService for Chrome with the applicable PrefStores. The
 // |pref_filename| points to the user preference file. This is the
 // usual way to create a new PrefService.
 // |extension_pref_store| is used as the source for extension-controlled
 // preferences and may be NULL.
 // |policy_service| is used as the source for mandatory or recommended
 // policies.
+// |pref_registry| is the registry object to retrieve registration

[Mattias Nissler (ping if slow), 2013/01/29 18:10:45]

This sentence is a bit cloudy, can we just say that |pref_registry| keeps the
list of registered prefs and their default values?

[Jói, 2013/01/30 14:23:33]

Done.

+// information from; PrefService takes ownership (not used for

[Mattias Nissler (ping if slow), 2013/01/29 18:10:45]

PrefRegistry is RefCounted vs. ownership transfer

[Jói, 2013/01/30 14:23:33]

Done.

+// CreateProfilePrefs yet).
 // If |async| is true, asynchronous version is used.
 // Notifies using PREF_INITIALIZATION_COMPLETED in the end. Details is set to
 // the created PrefService or NULL if creation has failed. Note, it is
 // guaranteed that in asynchronous version initialization happens after this
 // function returned.
 
-PrefServiceSimple* CreateLocalState(
+PrefService* CreateLocalState(
     const FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     PrefStore* extension_prefs,
+    PrefRegistry* pref_registry,

[Mattias Nissler (ping if slow), 2013/01/29 18:10:45]

Isn't this now refcounted? I think the rule is to pass the pointer wrapped in a
scoped_refptr then.

[Jói, 2013/01/30 14:23:33]

Done.

     bool async);
 
 PrefServiceSyncable* CreateProfilePrefs(
     const FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     PrefStore* extension_prefs,
     bool async);
 
 }  // namespace chrome_prefs
 
 #endif  // CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_