Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/extensions/api/font_settings/font_settings_api.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.
 
 // Defines the classes to realize the Font Settings Extension API as specified
 // in the extension API JSON.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H__
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/prefs/pref_service.h"
 
 namespace extensions {
 
 // This class observes pref changed events on a profile and dispatches the
 // corresponding extension API events to extensions.
-class FontSettingsEventRouter : public content::NotificationObserver {
+class FontSettingsEventRouter : public PrefObserver {
  public:
   // Constructor for observing pref changed events on |profile|. Stores a
   // pointer to |profile| but does not take ownership. |profile| must be
   // non-NULL and remain alive for the lifetime of the instance. Init() must be
   // called to start observing pref changed events.
   explicit FontSettingsEventRouter(Profile* profile);
   virtual ~FontSettingsEventRouter();
 
   // Starts observing pref changed events on the profile. Must not be called
   // more than once.
   void Init();
 
  private:
   typedef std::pair<std::string, std::string> EventAndKeyPair;
   // Map of pref name to a pair of event name and key (defined in the extension
   // API) for dispatching a pref changed event. For example,
   // "webkit.webprefs.default_font_size" to ("onDefaultFontSizedChanged",
   // "pixelSize").
   typedef std::map<std::string, EventAndKeyPair> PrefEventMap;
 
   // Observes browser pref |pref_name|. When a change is observed, dispatches
   // event |event_name| to extensions. A JavaScript object is passed to the
   // extension event function with the new value of the pref in property |key|.
   void AddPrefToObserve(const char* pref_name,
                         const char* event_name,
                         const char* key);
 
-  // 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;
 
   // Dispatches a changed event for the font setting for |generic_family| and
   // |script| to extensions. The new value of the setting is the value of
   // browser pref |pref_name|. If the pref changed on the incognito profile,
   // |incognito| must be set to true for extensions to get the appropriate
   // event.
-  void OnFontNamePrefChanged(PrefService* pref_service,
+  void OnFontNamePrefChanged(PrefServiceBase* pref_service,
                              const std::string& pref_name,
                              const std::string& generic_family,
                              const std::string& script,
                              bool incognito);
 
   // Dispatches the setting changed event |event_name| to extensions. The new
   // value of the setting is the value of browser pref |pref_name|. This value
   // is passed in the JavaScript object argument to the extension event function
   // under the key |key|. If the pref changed on the incognito profile,
   // |incognito| must be set to true for extensions to get the appropriate
   // event.
-  void OnFontPrefChanged(PrefService* pref_service,
+  void OnFontPrefChanged(PrefServiceBase* pref_service,
                          const std::string& pref_name,
                          const std::string& event_name,
                          const std::string& key,
                          bool incognito);
 
   // Manages pref observation registration.
   PrefChangeRegistrar registrar_;
 
   // Maps browser pref names to extension API <event name, key> pairs.
   PrefEventMap pref_event_map_;
@@ skipping 210 matching lines @@
   virtual ~SetMinimumFontSizeFunction() {}
 
   // SetFontPrefExtensionFunction:
   virtual const char* GetPrefName() OVERRIDE;
   virtual const char* GetKey() OVERRIDE;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H__