Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/test/reliability/page_load_test.cc

 // 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.
 //
 // This file provides reliablity test which runs under UI test framework. The
 // test is intended to run within QEMU environment.
 //
 // Usage 1: reliability_test
 // Upon invocation, it visits a hard coded list of sample URLs. This is mainly
 // used by buildbot, to verify reliability_test itself runs ok.
@@ skipping 34 matching lines @@
 #include "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "chrome/browser/net/url_fixer_upper.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
@@ skipping 673 matching lines @@
         num_dumps++;
       }
     }
     if (metrics)
       metrics->crash_dump_count = num_dumps;
   }
 
   // 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(PrefRegistry* registry) {
     FilePath path = user_data_dir().Append(chrome::kLocalStateFilename);
     PrefServiceMockBuilder builder;
     builder.WithUserFilePrefs(path,
                               MessageLoop::current()->message_loop_proxy());
-    return builder.CreateSimple();
+    return builder.Create(registry);
   }
 
   void GetStabilityMetrics(NavigationMetrics* metrics) {
     if (!metrics)
       return;
-    scoped_ptr<PrefServiceSimple> local_state(GetLocalState());
+    scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple();
+    registry->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);
+    registry->RegisterIntegerPref(prefs::kStabilityLaunchCount, -1);
+    registry->RegisterIntegerPref(prefs::kStabilityPageLoadCount, -1);
+    registry->RegisterIntegerPref(prefs::kStabilityCrashCount, 0);
+    registry->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
+
+    scoped_ptr<PrefService> local_state(GetLocalState(registry));
     if (!local_state.get())
       return;
-    local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, false);
-    local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, -1);
-    local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, -1);
-    local_state->RegisterIntegerPref(prefs::kStabilityCrashCount, 0);
-    local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
 
     metrics->browser_clean_exit =
         local_state->GetBoolean(prefs::kStabilityExitedCleanly);
     metrics->browser_launch_count =
         local_state->GetInteger(prefs::kStabilityLaunchCount);
     metrics->page_load_count =
         local_state->GetInteger(prefs::kStabilityPageLoadCount);
     metrics->browser_crash_count =
         local_state->GetInteger(prefs::kStabilityCrashCount);
     metrics->renderer_crash_count =
@@ skipping 49 matching lines @@
   if (!g_end_url.empty()) {
     NavigateToURLLogResult(
         g_end_url, log_file, NULL, g_continuous_load, false);
   }
 
   log_file.close();
 }
 
 }  // namespace