Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

base/prefs/public/pref_change_registrar_unittest.cc

Index: base/prefs/public/pref_change_registrar_unittest.cc
diff --git a/base/prefs/public/pref_change_registrar_unittest.cc b/base/prefs/public/pref_change_registrar_unittest.cc
index 185c9ded71117d537088316dcd6e21a240399720..5e7c017ebceaed6799f7dc3f614d1beef16e889e 100644
--- a/base/prefs/public/pref_change_registrar_unittest.cc
+++ b/base/prefs/public/pref_change_registrar_unittest.cc
@@ -128,9 +128,10 @@ class ObserveSetOfPreferencesTest : public testing::Test {
  public:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefServiceSimple);
-    pref_service_->RegisterStringPref(kHomePage, "http://google.com");
-    pref_service_->RegisterBooleanPref(kHomePageIsNewTabPage, false);
-    pref_service_->RegisterStringPref(kApplicationLocale, "");
+    PrefRegistrarSimple* registrar = pref_service_->registrar();
+    registrar->RegisterStringPref(kHomePage, "http://google.com");
+    registrar->RegisterBooleanPref(kHomePageIsNewTabPage, false);
+    registrar->RegisterStringPref(kApplicationLocale, "");
   }
 
   PrefChangeRegistrar* CreatePrefChangeRegistrar() {