Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/test/reliability/page_load_test.cc

Index: chrome/test/reliability/page_load_test.cc
diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index c0590d05c7dc072d4f096fbaa5c2785f37123454..de42666c9cbddabf66704cdd81ac72ad4ef512f1 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -754,7 +754,7 @@ class PageLoadTest : public UITest {
   // Get a PrefService whose contents correspond to the Local State file
   // that was saved by the app as it closed.  The caller takes ownership of the
   // returned PrefService object.
-  PrefServiceSimple* GetLocalState() {
+  PrefService* GetLocalState() {
     FilePath path = user_data_dir().Append(chrome::kLocalStateFilename);
     PrefServiceMockBuilder builder;
     builder.WithUserFilePrefs(path,
@@ -765,7 +765,7 @@ class PageLoadTest : public UITest {
   void GetStabilityMetrics(NavigationMetrics* metrics) {
     if (!metrics)
       return;
-    scoped_ptr<PrefServiceSimple> local_state(GetLocalState());
+    scoped_ptr<PrefService> local_state(GetLocalState());
     if (!local_state.get())
       return;
     local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);