Remove content::NotificationObserver dependency from most Prefs code.

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

Index: chrome/browser/ui/webui/options/content_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h
index 63a83aead2d6c0c5a8f8bec7e7bdc66b9dd1839e..eb4d6acab73bd36f8510f222e7f80fb654a9b876 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.h
+++ b/chrome/browser/ui/webui/options/content_settings_handler.h
@@ -10,6 +10,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/common/content_settings.h"
@@ -22,8 +23,10 @@ class ProtocolHandlerRegistry;
 
 namespace options {
 
-class ContentSettingsHandler : public OptionsPageUIHandler,
-                               public PepperFlashSettingsManager::Client {

[Mattias Nissler (ping if slow), 2012/10/31 13:29:36]

Any reasons to reformat this? I think this is legal per the style guide.

[Jói, 2012/10/31 14:56:26]

I don't have to reformat it (or the others where it changed).  I'm changing them
back.

+class ContentSettingsHandler
+    : public OptionsPageUIHandler,
+      public PepperFlashSettingsManager::Client,
+      public PrefObserver {
  public:
   ContentSettingsHandler();
   virtual ~ContentSettingsHandler();
@@ -40,6 +43,10 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // PrefObserver implementation.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // PepperFlashSettingsManager::Client implementation.
   virtual void OnGetPermissionSettingsCompleted(
       uint32 request_id,