Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index bc62ff53043183133dd897364659a38a86a89d27..2fdc5c5d00ffd0a8cf68309ee34cf43b8b05faa1 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -15,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/browser/webdata/web_data_service.h"
@@ -67,6 +68,7 @@ struct URLVisitedDetails;
 class TemplateURLService : public WebDataServiceConsumer,
                            public ProfileKeyedService,
                            public content::NotificationObserver,
+                           public PrefObserver,
                            public syncer::SyncableService {
  public:
   typedef std::map<std::string, std::string> QueryTerms;
@@ -264,6 +266,9 @@ class TemplateURLService : public WebDataServiceConsumer,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 

[Mattias Nissler (ping if slow), 2012/10/31 13:29:36]

// PrefChangeObserver:

[Jói, 2012/10/31 14:56:26]

Done.

+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // syncer::SyncableService implementation.
 
   // Returns all syncable TemplateURLs from this model as SyncData. This should