Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/prefs/pref_service.cc

Index: chrome/browser/prefs/pref_service.cc
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 8862f7f4d88788b26632d4146626cabbee2a2467..f99da14c970531d5c2adb577ffeb7e128bae7312 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -769,16 +769,22 @@ const ListValue* PrefService::GetList(const char* path) const {
   return static_cast<const ListValue*>(value);
 }
 
-void PrefService::AddPrefObserver(const char* path,
-                                  content::NotificationObserver* obs) {
+void PrefService::AddPrefObserver(const char* path, PrefObserver* obs) {
   pref_notifier_->AddPrefObserver(path, obs);
 }
 
-void PrefService::RemovePrefObserver(const char* path,
-                                     content::NotificationObserver* obs) {
+void PrefService::RemovePrefObserver(const char* path, PrefObserver* obs) {
   pref_notifier_->RemovePrefObserver(path, obs);
 }
 
+void PrefService::AddPrefInitObserver(PrefInitObserver* obs) {
+  pref_notifier_->AddInitObserver(obs);
+}
+
+void PrefService::RemovePrefInitObserver(PrefInitObserver* obs) {
+  pref_notifier_->RemoveInitObserver(obs);
+}
+
 void PrefService::RegisterPreference(const char* path,
                                      Value* default_value,
                                      PrefSyncStatus sync_status) {