Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/chromeos/proxy_config_service_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/values.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 
 namespace chromeos {
 
 // Implementation of proxy config service for chromeos that:
 // - extends PrefProxyConfigTrackerImpl (and so lives and runs entirely on UI
 //   thread) to handle proxy from prefs (via PrefProxyConfigTrackerImpl) and
@@ skipping 179 matching lines @@
     UIMakeActiveNetworkCurrent();
     if (test_config) {
       std::string value;
       test_config->SerializeForNetwork(&value);
       SetProxyConfigForNetwork(active_network_, value, false);
     }
   }
 #endif  // defined(UNIT_TEST)
 
  private:
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver implementation.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
   // Called from the various UISetProxyConfigTo*.
   void OnUISetProxyConfig();
 
   // Called from OnNetworkManagerChanged and OnNetworkChanged for currently
   // active network, to handle previously active network, new active network,
   // and if necessary, migrates device settings to shill and/or activates
   // proxy setting of new network.
   void OnActiveNetworkChanged(NetworkLibrary* cros,
                               const Network* active_network);
@@ skipping 66 matching lines @@
   std::vector<base::Closure> callbacks_;
 
   base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_