Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/net/pref_proxy_config_tracker_impl.cc

Index: chrome/browser/net/pref_proxy_config_tracker_impl.cc
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
index 9760f02e0e7bf61af796aba0e021b214118b21ab..2c60ec0005f175153e69f5daf30d495d060b07af 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
@@ -287,13 +287,11 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
   return false;
 }
 
-void PrefProxyConfigTrackerImpl::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+void PrefProxyConfigTrackerImpl::OnPreferenceChanged(
+    PrefServiceBase* service,
+    const std::string& pref_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (type == chrome::NOTIFICATION_PREF_CHANGED &&
-      content::Source<PrefService>(source).ptr() == pref_service_) {
+  if (service == pref_service_) {

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

I think this check is unnecessary. Remove or convert to DCHECK?

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

I agree this should be unnecessary.  I would like to keep it in for this
revision, to keep it closer to a "safe" refactoring, but this is one of the
things that should go away everywhere in the next round, where we'll probably
remove the 'service' pointer altogether.

     net::ProxyConfig new_config;
     ProxyPrefs::ConfigState config_state = ReadPrefConfig(&new_config);
     if (config_state_ != config_state ||
@@ -307,7 +305,7 @@ void PrefProxyConfigTrackerImpl::Observe(
     if (update_pending_)
       OnProxyConfigChanged(config_state, new_config);
   } else {
-    NOTREACHED() << "Unexpected notification of type " << type;
+    NOTREACHED() << "Unexpected prefs service.";

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

nit: s/prefs service/PrefService/

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

Done.

   }
 }