Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/policy/cloud_policy_subsystem.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_CLOUD_POLICY_SUBSYSTEM_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
-#include "content/public/browser/notification_observer.h"
+#include "base/prefs/public/pref_observer.h"
 #include "net/base/network_change_notifier.h"
 
 class PrefService;
 
 namespace policy {
 
 class CloudPolicyCacheBase;
 class CloudPolicyController;
 class CloudPolicyDataStore;
 class DeviceManagementService;
 class DeviceTokenFetcher;
 class PolicyNotifier;
 
 // This class is a container for the infrastructure required to support cloud
 // policy. It glues together the backend, the policy controller and manages the
 // life cycle of the policy providers.
 class CloudPolicySubsystem
-    : public content::NotificationObserver,
+    : public PrefObserver,
       public net::NetworkChangeNotifier::IPAddressObserver {
  public:
   enum PolicySubsystemState {
     UNENROLLED,     // No enrollment attempt has been performed yet.
     BAD_GAIA_TOKEN, // The server rejected the GAIA auth token.
     UNMANAGED,      // This device is unmanaged.
     NETWORK_ERROR,  // A network error occurred, retrying makes sense.
     LOCAL_ERROR,    // Retrying is futile.
     TOKEN_FETCHED,  // Device has been successfully registered.
     SUCCESS         // Policy has been fetched successfully and is in effect.
@@ skipping 85 matching lines @@
 
   // Returns a weak pointer to this subsystem's PolicyNotifier.
   PolicyNotifier* notifier() {
     return notifier_.get();
   }
 
   // Factory methods that may be overridden in tests.
   virtual void CreateDeviceTokenFetcher();
   virtual void CreateCloudPolicyController();
 
-  // content::NotificationObserver overrides.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver overrides.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
   // net::NetworkChangeNotifier::IPAddressObserver:
   virtual void OnIPAddressChanged() OVERRIDE;
 
   // Name of the preference to read the refresh rate from.
   const char* refresh_pref_name_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   CloudPolicyDataStore* data_store_;
 
   // Cloud policy infrastructure stuff.
   scoped_ptr<PolicyNotifier> notifier_;
   scoped_ptr<DeviceManagementService> device_management_service_;
   scoped_ptr<DeviceTokenFetcher> device_token_fetcher_;
   scoped_ptr<CloudPolicyCacheBase> cloud_policy_cache_;
   scoped_ptr<CloudPolicyController> cloud_policy_controller_;
 
   std::string device_management_url_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicySubsystem);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_