Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/plugins/plugin_prefs.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_PLUGINS_PLUGIN_PREFS_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
-#include "content/public/browser/notification_observer.h"
 
 class Profile;
 
 namespace base {
 class ListValue;
 }
 
 namespace webkit {
 struct WebPluginInfo;
 namespace npapi {
 class PluginList;
 }
 }
 
 // This class stores information about whether a plug-in or a plug-in group is
 // enabled or disabled.
 // Except where otherwise noted, it can be used on every thread.
 class PluginPrefs : public RefcountedProfileKeyedService,
-                    public content::NotificationObserver {
+                    public PrefObserver {
  public:
   enum PolicyStatus {
     NO_POLICY = 0,  // Neither enabled or disabled by policy.
     POLICY_ENABLED,
     POLICY_DISABLED,
   };
 
   // Returns the instance associated with |profile|, creating it if necessary.
   static scoped_refptr<PluginPrefs> GetForProfile(Profile* profile);
 
@@ skipping 29 matching lines @@
   PolicyStatus PolicyStatusForPlugin(const string16& name) const;
 
   // Returns whether the plugin is enabled or not.
   bool IsPluginEnabled(const webkit::WebPluginInfo& plugin) const;
 
   void set_profile(Profile* profile) { profile_ = profile; }
 
   // RefCountedProfileKeyedBase method override.
   virtual void ShutdownOnUIThread() OVERRIDE;
 
-  // content::NotificationObserver method override.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver method override.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<PluginPrefs>;
   friend class PluginPrefsTest;
 
   // PluginState stores a mapping from plugin path to enable/disable state. We
   // don't simply use a std::map, because we would like to keep the state of
   // some plugins in sync with each other.
   class PluginState {
    public:
@@ skipping 73 matching lines @@
   // PluginList to use for testing. If this is NULL, defaults to the global
   // singleton.
   webkit::npapi::PluginList* plugin_list_;
 
   PrefChangeRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginPrefs);
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_