Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/prefs/pref_service.cc

 // 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.
 
 #include "chrome/browser/prefs/pref_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 751 matching lines @@
     return NULL;
   }
   const Value* value = pref->GetValue();
   if (value->GetType() != Value::TYPE_LIST) {
     NOTREACHED();
     return NULL;
   }
   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) {
   DCHECK(CalledOnValidThread());
 
   // The main code path takes ownership, but most don't. We'll be safe.
   scoped_ptr<Value> scoped_value(default_value);
 
   if (FindPreference(path)) {
     NOTREACHED() << "Tried to register duplicate pref " << path;
@@ skipping 268 matching lines @@
   return pref_value_store()->PrefValueFromDefaultStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsUserModifiable() const {
   return pref_value_store()->PrefValueUserModifiable(name_.c_str());
 }
 
 bool PrefService::Preference::IsExtensionModifiable() const {
   return pref_value_store()->PrefValueExtensionModifiable(name_.c_str());
 }