Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry.

chrome/browser/chromeos/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_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/idle.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/geolocation_provider.h"
-#include "content/public/browser/notification_observer.h"
 #include "content/public/common/geoposition.h"
 
 namespace chromeos {
 class CrosSettings;
 namespace system {
 class StatisticsProvider;
 }
 }
 
 namespace content {
 class NotificationDetails;
 class NotificationSource;
 }
 
 namespace enterprise_management {
 class DeviceStatusReportRequest;
 }
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace policy {
 
 // Collects and summarizes the status of an enterprised-managed ChromeOS device.
-class DeviceStatusCollector : public CloudPolicyClient::StatusProvider,
-                              public content::NotificationObserver {
+class DeviceStatusCollector : public CloudPolicyClient::StatusProvider {
  public:
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   typedef base::Callback<void(
       const content::GeolocationProvider::LocationUpdateCallback& callback)>
           LocationUpdateRequester;
 
   DeviceStatusCollector(
       PrefService* local_state,
       chromeos::system::StatisticsProvider* provider,
@@ skipping 27 matching lines @@
   // The number of days in the past to store device activity.
   // This is kept in case device status uploads fail for a number of days.
   unsigned int max_stored_past_activity_days_;
 
   // The number of days in the future to store device activity.
   // When changing the system time and/or timezones, it's possible to record
   // activity time that is slightly in the future.
   unsigned int max_stored_future_activity_days_;
 
  private:
-  // A helper class to manage receiving geolocation notifications on the IO
+  // A helper class to manage receiving geolocation callbacks on the IO
   // thread.
   class Context : public base::RefCountedThreadSafe<Context> {
    public:
     Context();
 
     void GetLocationUpdate(
         const content::GeolocationProvider::LocationUpdateCallback& callback);
 
    private:
     friend class base::RefCountedThreadSafe<Context>;
@@ skipping 37 matching lines @@
   void GetBootMode(
       enterprise_management::DeviceStatusReportRequest* request);
   void GetLocation(
       enterprise_management::DeviceStatusReportRequest* request);
   void GetNetworkInterfaces(
       enterprise_management::DeviceStatusReportRequest* request);
 
   // Update the cached values of the reporting settings.
   void UpdateReportingSettings();
 
-  // content::NotificationObserver interface.
-  virtual void Observe(
-      int type,
-      const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE;
-
   void ScheduleGeolocationUpdateRequest();
 
   // content::GeolocationUpdateCallback implementation.
   void ReceiveGeolocationUpdate(const content::Geoposition&);
 
   // How often to poll to see if the user is idle.
   int poll_interval_seconds_;
 
   PrefService* local_state_;
 
@@ skipping 33 matching lines @@
 
   // Cached values of the reporting settings from the device policy.
   bool report_version_info_;
   bool report_activity_times_;
   bool report_boot_mode_;
   bool report_location_;
   bool report_network_interfaces_;
 
   scoped_refptr<Context> context_;
 
+  scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+      version_info_subscription_;
+  scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+      activity_times_subscription_;
+  scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+      boot_mode_subscription_;
+  scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+      location_subscription_;
+  scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
+      network_interfaces_subscription_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_