Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/protector/protected_prefs_watcher.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_PROTECTOR_PROTECTED_PREFS_WATCHER_H_
 #define CHROME_BROWSER_PROTECTOR_PROTECTED_PREFS_WATCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "content/public/browser/notification_observer.h"
 
 class PrefService;
 class Profile;
 
 namespace base {
 class Value;
 }
 
 namespace protector {
 
-class ProtectedPrefsWatcher : public content::NotificationObserver {
+class ProtectedPrefsWatcher : public PrefObserver {
  public:
   // Current backup version.
   static const int kCurrentVersionNumber;
 
   explicit ProtectedPrefsWatcher(Profile* profile);
   virtual ~ProtectedPrefsWatcher();
 
   // Registers prefs on a new Profile instance.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns true if pref named |path| has changed and the backup is valid.
   bool DidPrefChange(const std::string& path) const;
 
   // Returns the backup value for pref named |path| or |NULL| if the pref is not
   // protected, does not exist or the backup is invalid. The returned Value
   // instance is owned by the PrefService.
   const base::Value* GetBackupForPref(const std::string& path) const;
 
   // Forces a valid backup, matching actual preferences (overwriting any
   // previous data). Should only be when protector service is disabled.
   void ForceUpdateBackup();
 
   // True if the backup was valid at the profile load time.
   bool is_backup_valid() { return is_backup_valid_; }
 
  private:
   friend class ProtectedPrefsWatcherTest;
 
-  // 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;
 
   // Makes sure that all protected prefs have been migrated before starting to
   // observe them.
   void EnsurePrefsMigration();
 
   // Updates cached prefs from their actual values and returns |true| if there
   // were any changes.
   bool UpdateCachedPrefs();
 
   // Returns |false| if profile does not have a backup yet (needs to be
@@ skipping 31 matching lines @@
   bool is_backup_valid_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtectedPrefsWatcher);
 };
 
 }  // namespace protector
 
 #endif  // CHROME_BROWSER_PROTECTOR_PROTECTED_PREFS_WATCHER_H_