Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/upgrade_detector.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/upgrade_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"

[Mattias Nissler (ping if slow), 2013/01/31 14:50:45]

required?

[Jói, 2013/01/31 16:23:37]

Done.

-#include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/theme_resources.h"
 
 // How long to wait between checks for whether the user has been idle.
 static const int kIdleRepeatingTimerWait = 10;  // Minutes (seconds if testing).
 
 // How much idle time (since last input even was detected) must have passed
 // until we notify that a critical update has occurred.
 static const int kIdleAmount = 2;  // Hours (or seconds, if testing).
 
 bool UseTestingIntervals() {
   // If a command line parameter specifying how long the upgrade check should
   // be, we assume it is for testing and switch to using seconds instead of
   // hours.
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
   return !cmd_line.GetSwitchValueASCII(
       switches::kCheckForUpdateIntervalSec).empty();
 }
 
 // static
-void UpgradeDetector::RegisterPrefs(PrefServiceSimple* prefs) {
-  prefs->RegisterBooleanPref(prefs::kRestartLastSessionOnShutdown, false);
-  prefs->RegisterBooleanPref(prefs::kWasRestarted, false);
+void UpgradeDetector::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterBooleanPref(prefs::kRestartLastSessionOnShutdown, false);
+  registry->RegisterBooleanPref(prefs::kWasRestarted, false);
 }
 
 int UpgradeDetector::GetIconResourceID(UpgradeNotificationIconType type) {
   bool badge = type == UPGRADE_ICON_TYPE_BADGE;
   switch (upgrade_notification_stage_) {
     case UPGRADE_ANNOYANCE_CRITICAL:
       // The critical annoyance state, somewhat ironically, re-purposes the
       // icon for the second highest severity state, since that state has the
       // icon most closely resembling the one requested of this feature and the
       // critical annoyance is never part of the sliding scale of severity
@@ skipping 77 matching lines @@
       break;
     case IDLE_STATE_ACTIVE:
     case IDLE_STATE_UNKNOWN:
       break;
     default:
       NOTREACHED();  // Need to add any new value above (either providing
                      // automatic restart or show notification to user).
       break;
   }
 }