Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome_frame/test/reliability/page_load_test.cc

Index: chrome_frame/test/reliability/page_load_test.cc
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index 1a6b7815b603eb32ec163c56f9ec06c7b6c2507d..50a4499231cd48df4f5d10470bfd746925fe7ae1 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -428,7 +428,7 @@ class PageLoadTest : public testing::Test {
   // 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;
     chrome::GetChromeFrameUserDataDirectory(&path);
     PrefServiceMockBuilder builder;
@@ -442,7 +442,7 @@ class PageLoadTest : public testing::Test {
   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);