Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/prefs/prefs_tab_helper.h

Index: chrome/browser/ui/prefs/prefs_tab_helper.h
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h
index cfb808b2c3d77096beb5d062367dcab1249004e1..5dc8c981bcacee8ff44a5bb86b2917161ee790e9 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.h
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h
@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -21,6 +22,7 @@ class WebContents;
 
 // Per-tab class to handle user preferences.
 class PrefsTabHelper : public content::NotificationObserver,
+                       public PrefObserver,
                        public content::WebContentsUserData<PrefsTabHelper> {
  public:
   virtual ~PrefsTabHelper();
@@ -41,6 +43,10 @@ class PrefsTabHelper : public content::NotificationObserver,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // PrefObserver overrides:
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // Update the WebContents's RendererPreferences.
   void UpdateRendererPreferences();