Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

base/prefs/default_pref_store.h

Index: base/prefs/default_pref_store.h
diff --git a/base/prefs/default_pref_store.h b/base/prefs/default_pref_store.h
index 996bf8b77df37aceadbb0d69a299aa313e99a9f9..89a060266468ad527f1f6bd688cc04fd3b075d1b 100644
--- a/base/prefs/default_pref_store.h
+++ b/base/prefs/default_pref_store.h
@@ -12,8 +12,7 @@
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
 
-// This PrefStore keeps track of default preference values set when a
-// preference is registered with the PrefService.
+// Used within a PrefRegistry to keep track of default preference values.
 class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore {
  public:
   typedef PrefValueMap::const_iterator const_iterator;
@@ -29,10 +28,6 @@ class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore {
   // Removes the value for |key|.
   void RemoveDefaultValue(const std::string& key);
 
-  // Returns the registered type for |key| or Value::TYPE_NULL if the |key|
-  // has not been registered.
-  base::Value::Type GetType(const std::string& key) const;
-
   const_iterator begin() const;
   const_iterator end() const;