Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/browser_shutdown.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.
 
 #include "chrome/browser/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/switch_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 31 matching lines @@
 bool g_mode_switch = false;
 #endif
 
 Time* shutdown_started_ = NULL;
 ShutdownType shutdown_type_ = NOT_VALID;
 int shutdown_num_processes_;
 int shutdown_num_processes_slow_;
 
 const char kShutdownMsFile[] = "chrome_shutdown_ms.txt";
 
-void RegisterPrefs(PrefServiceSimple* local_state) {
+void RegisterPrefs(PrefRegistrySimple* local_state) {

[Mattias Nissler (ping if slow), 2013/01/31 13:06:25]

I could nit here (and elsewhere) that the parameter name should be |registry|,
but I don't care much. Up to you.

[Jói, 2013/01/31 13:43:42]

I was thinking I might leave it, but nicer to do it right :)  Fixed.

   local_state->RegisterIntegerPref(prefs::kShutdownType, NOT_VALID);
   local_state->RegisterIntegerPref(prefs::kShutdownNumProcesses, 0);
   local_state->RegisterIntegerPref(prefs::kShutdownNumProcessesSlow, 0);
 }
 
 ShutdownType GetShutdownType() {
   return shutdown_type_;
 }
 
 void OnShutdownStarting(ShutdownType type) {
@@ skipping 237 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
   return g_shutting_down_without_closing_browsers;
 }
 
 void SetShuttingDownWithoutClosingBrowsers(bool without_close) {
   g_shutting_down_without_closing_browsers = without_close;
 }
 
 }  // namespace browser_shutdown