Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/webui/options/password_manager_handler.h

Index: chrome/browser/ui/webui/options/password_manager_handler.h
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h
index f7b7fc9e42c93cd650bcd74c30f9c44be2f09311..6f3b34a93effa30294c2e87bf4378b6b53018e17 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.h
+++ b/chrome/browser/ui/webui/options/password_manager_handler.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
@@ -20,8 +21,10 @@ struct PasswordForm;
 
 namespace options {
 
-class PasswordManagerHandler : public OptionsPageUIHandler,
-                               public PasswordStore::Observer {
+class PasswordManagerHandler
+    : public OptionsPageUIHandler,
+      public PasswordStore::Observer,
+      public PrefObserver {
  public:
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
@@ -34,10 +37,9 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
   // PasswordStore::Observer implementation.
   virtual void OnLoginsChanged() OVERRIDE;
 
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver implementation.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
  private:
   // The password store associated with the currently active profile.