Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/prefs/pref_notifier_impl.h

Index: chrome/browser/prefs/pref_notifier_impl.h
diff --git a/chrome/browser/prefs/pref_notifier_impl.h b/chrome/browser/prefs/pref_notifier_impl.h
index 38255ba3be03e7640e13aa1f2ad7e02d668eaede..41e1ebfb959ddd47f992fc60bae00d55ec9fedc8 100644
--- a/chrome/browser/prefs/pref_notifier_impl.h
+++ b/chrome/browser/prefs/pref_notifier_impl.h
@@ -10,14 +10,12 @@
 #include "base/hash_tables.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_notifier.h"
+#include "base/prefs/public/pref_init_observer.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/threading/non_thread_safe.h"
 
 class PrefService;
 
-namespace content {
-class NotificationObserver;
-}
-
 // The PrefNotifier implementation used by the PrefService.
 class PrefNotifierImpl : public PrefNotifier,
                          public base::NonThreadSafe {
@@ -26,24 +24,30 @@ class PrefNotifierImpl : public PrefNotifier,
   explicit PrefNotifierImpl(PrefService* pref_service);
   virtual ~PrefNotifierImpl();
 
-  // If the pref at the given path changes, we call the observer's Observe
-  // method with PREF_CHANGED.
-  void AddPrefObserver(const char* path, content::NotificationObserver* obs);
-  void RemovePrefObserver(const char* path, content::NotificationObserver* obs);
+  // If the pref at the given path changes, we call the observer's
+  // OnPreferenceChanged method.
+  void AddPrefObserver(const char* path, PrefObserver* observer);
+  void RemovePrefObserver(const char* path, PrefObserver* observer);
 
-  // PrefNotifier overrides.
-  virtual void OnPreferenceChanged(const std::string& pref_name) OVERRIDE;
-  virtual void OnInitializationCompleted(bool succeeded) OVERRIDE;
+  // We call the observer's OnInitializationCompleted when
+  // initialization completes.
+  void AddInitObserver(PrefInitObserver* observer);
+  void RemoveInitObserver(PrefInitObserver* observer);
 
   void SetPrefService(PrefService* pref_service);
 
  protected:
+  // PrefNotifier overrides.
+  virtual void OnPreferenceChanged(const std::string& pref_name) OVERRIDE;
+  virtual void OnInitializationCompleted(bool succeeded) OVERRIDE;
+
   // A map from pref names to a list of observers. Observers get fired in the
   // order they are added. These should only be accessed externally for unit
   // testing.
-  typedef ObserverList<content::NotificationObserver> NotificationObserverList;
-  typedef base::hash_map<std::string, NotificationObserverList*>
-      PrefObserverMap;
+  typedef ObserverList<PrefObserver> PrefObserverList;
+  typedef base::hash_map<std::string, PrefObserverList*> PrefObserverMap;
+
+  typedef ObserverList<PrefInitObserver> PrefInitObserverList;
 
   const PrefObserverMap* pref_observers() const { return &pref_observers_; }
 
@@ -56,6 +60,7 @@ class PrefNotifierImpl : public PrefNotifier,
   PrefService* pref_service_;
 
   PrefObserverMap pref_observers_;
+  PrefInitObserverList init_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefNotifierImpl);
 };