Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/chromeos/proxy_config_service_impl.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/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 554 matching lines @@
 void ProxyConfigServiceImpl::RegisterPrefs(PrefService* pref_service) {
   // Use shared proxies default to off.  GetUseSharedProxies will return the
   // correct value based on pre-login and login.
   pref_service->RegisterBooleanPref(prefs::kUseSharedProxies,
                                     true,
                                     PrefService::UNSYNCABLE_PREF);
 }
 
 //------------------ ProxyConfigServiceImpl: private methods -------------------
 
-void ProxyConfigServiceImpl::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_PREF_CHANGED &&
-      *(content::Details<std::string>(details).ptr()) ==
-          prefs::kUseSharedProxies) {
-    if (content::Source<PrefService>(source).ptr() == prefs()) {
-      VLOG(1) << "New use-shared-proxies = " << GetUseSharedProxies();
-      // Determine new proxy config which may have changed because of new
-      // use-shared-proxies. If necessary, activate it.
-      Network* network = NULL;
-      if (!active_network_.empty()) {
-        network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
-            active_network_);
-        if (!network)
-          LOG(WARNING) << "Can't find requested network " << active_network_;
-      }
-      DetermineEffectiveConfig(network, true);
-    }
-    return;
+void ProxyConfigServiceImpl::OnPreferenceChanged(PrefServiceBase* service,
+                                                 const std::string& pref_name) {
+  DCHECK(service == prefs());
+  DCHECK(pref_name == prefs::kUseSharedProxies);
+  VLOG(1) << "New use-shared-proxies = " << GetUseSharedProxies();
+
+  // Determine new proxy config which may have changed because of new
+  // use-shared-proxies. If necessary, activate it.
+  Network* network = NULL;
+  if (!active_network_.empty()) {
+    network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
+        active_network_);
+    if (!network)
+      LOG(WARNING) << "Can't find requested network " << active_network_;
   }
-  PrefProxyConfigTrackerImpl::Observe(type, source, details);

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

I think this breaks, the parent class also needs to observe prefs.

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

You're right, this was caught by a tryjob and is fixed in the newer patch.  It's
interesting that the DCHECK I put on line 578 did not fire though, yet chaining
to the parent class did fix the problem.

+  DetermineEffectiveConfig(network, true);
 }
 
 void ProxyConfigServiceImpl::OnUISetProxyConfig() {
   if (current_ui_network_.empty())
     return;
   // Update config to shill.
   std::string value;
   if (current_ui_config_.SerializeForNetwork(&value)) {
     VLOG(1) << "Set proxy (mode=" << current_ui_config_.mode
             << ") for " << current_ui_network_;
@@ skipping 230 matching lines @@
     device_config_.clear();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
 
 }  // namespace chromeos