Remove content::NotificationObserver dependency from most Prefs code.

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

Index: chrome/browser/ui/webui/options/core_options_handler.h
diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h
index aff1ee7d4aba487e0640da62fde3b942805d9769..8cf06f5347f60f1a03367cf936730d060ce78587 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.h
+++ b/chrome/browser/ui/webui/options/core_options_handler.h
@@ -10,6 +10,7 @@
 
 #include "base/callback.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/values.h"
 #include "chrome/browser/plugins/plugin_status_pref_setter.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -19,7 +20,8 @@ namespace options {
 
 // Core options UI handler.
 // Handles resource and JS calls common to all options sub-pages.
-class CoreOptionsHandler : public OptionsPageUIHandler {
+class CoreOptionsHandler : public OptionsPageUIHandler,
+                           public PrefObserver {
  public:
   CoreOptionsHandler();
   virtual ~CoreOptionsHandler();
@@ -30,10 +32,9 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   virtual void InitializePage() OVERRIDE;
   virtual void Uninitialize() 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;
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;