Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/upgrade_detector.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_H_
 #define CHROME_BROWSER_UPGRADE_DETECTOR_H_
 
 #include "base/timer.h"
 #include "chrome/browser/idle.h"
 #include "ui/gfx/image/image.h"
 
-class PrefServiceSimple;
+class PrefRegistrySimple;
 
 ///////////////////////////////////////////////////////////////////////////////
 // UpgradeDetector
 //
 // This class is a singleton class that monitors when an upgrade happens in the
 // background. We basically ask Omaha what it thinks the latest version is and
 // if our version is lower we send out a notification upon:
 //   a) Detecting an upgrade and...
 //   b) When we think the user should be notified about the upgrade.
 // The latter happens much later, since we don't want to be too annoying.
@@ skipping 14 matching lines @@
   enum UpgradeNotificationIconType {
     UPGRADE_ICON_TYPE_BADGE = 0,  // For overlay badging of the wrench menu.
     UPGRADE_ICON_TYPE_MENU_ICON,  // For showing in the wrench menu.
   };
 
   // Returns the singleton implementation instance.
   static UpgradeDetector* GetInstance();
 
   virtual ~UpgradeDetector();
 
-  static void RegisterPrefs(PrefServiceSimple* prefs);
+  static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // Whether the user should be notified about an upgrade.
   bool notify_upgrade() const { return notify_upgrade_; }
 
   // Whether the upgrade is a critical upgrade (such as a zero-day update).
   bool is_critical_update() const { return is_critical_upgrade_; }
 
   // Notifify this object that the user has acknowledged the critical update
   // so we don't need to complain about it for now.
   void acknowledge_critical_update() {
@@ skipping 60 matching lines @@
   UpgradeNotificationAnnoyanceLevel upgrade_notification_stage_;
 
   // Whether we have waited long enough after detecting an upgrade (to see
   // is we should start nagging about upgrading).
   bool notify_upgrade_;
 
   DISALLOW_COPY_AND_ASSIGN(UpgradeDetector);
 };
 
 #endif  // CHROME_BROWSER_UPGRADE_DETECTOR_H_