Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/policy/device_status_collector.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
 namespace content {
 class NotificationDetails;
 class NotificationSource;
 }
 
 namespace enterprise_management {
 class DeviceStatusReportRequest;
 }
 
 class PrefService;
-class PrefServiceSimple;
+class PrefRegistrySimple;
 
 namespace policy {
 
 // Collects and summarizes the status of an enterprised-managed ChromeOS device.
 class DeviceStatusCollector : public CloudPolicyClient::StatusProvider,
                               public content::NotificationObserver {
  public:
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   typedef void(*LocationUpdateRequester)(
       const content::GeolocationUpdateCallback& callback);
 
   DeviceStatusCollector(PrefService* local_state,
                         chromeos::system::StatisticsProvider* provider,
                         LocationUpdateRequester location_update_requester);
   virtual ~DeviceStatusCollector();
 
   void GetStatus(enterprise_management::DeviceStatusReportRequest* request);
 
   // CloudPolicyClient::StatusProvider:
   virtual bool GetDeviceStatus(
       enterprise_management::DeviceStatusReportRequest* status) OVERRIDE;
   virtual bool GetSessionStatus(
       enterprise_management::SessionStatusReportRequest* status) OVERRIDE;
   virtual void OnSubmittedSuccessfully() OVERRIDE;
 
-  static void RegisterPrefs(PrefServiceSimple* local_state);
+  static void RegisterPrefs(PrefRegistrySimple* registry);
 
   // How often, in seconds, to poll to see if the user is idle.
   static const unsigned int kIdlePollIntervalSeconds = 30;
 
  protected:
   // Check whether the user has been idle for a certain period of time.
   virtual void CheckIdleState();
 
   // Used instead of base::Time::Now(), to make testing possible.
   virtual base::Time GetCurrentTime();
@@ skipping 96 matching lines @@
   bool report_activity_times_;
   bool report_boot_mode_;
   bool report_location_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_STATUS_COLLECTOR_H_