Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/net/pref_proxy_config_tracker_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_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #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/prefs/proxy_config_dictionary.h"
-#include "content/public/browser/notification_observer.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 
 class PrefService;
 
 // A net::ProxyConfigService implementation that applies preference proxy
 // settings (pushed from PrefProxyConfigTrackerImpl) as overrides to the proxy
 // configuration determined by a baseline delegate ProxyConfigService on
 // non-ChromeOS platforms. ChromeOS has its own implementation of overrides in
 // chromeos::ProxyConfigServiceImpl.
@@ skipping 46 matching lines @@
 
   // Indicates whether the base service registration is done.
   bool registered_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeProxyConfigService);
 };
 
 // A class that tracks proxy preferences. It translates the configuration
 // to net::ProxyConfig and pushes the result over to the IO thread for
 // ChromeProxyConfigService::UpdateProxyConfig to use.
-class PrefProxyConfigTrackerImpl : public content::NotificationObserver {
+class PrefProxyConfigTrackerImpl : public PrefObserver {
  public:
   explicit PrefProxyConfigTrackerImpl(PrefService* pref_service);
   virtual ~PrefProxyConfigTrackerImpl();
 
   // Sets the proxy config service to push the preference proxy to.
   void SetChromeProxyConfigService(
       ChromeProxyConfigService* proxy_config_service);
 
   // Notifies the tracker that the pref service passed upon construction is
   // about to go away. This must be called from the UI thread.
@@ skipping 33 matching lines @@
   // Status is indicated in the return value.
   // Writes the configuration to |config| unless the return value is
   // CONFIG_UNSET, in which case |config| and |config_source| are not touched.
   ProxyPrefs::ConfigState GetProxyConfig(net::ProxyConfig* config);
 
   // Called when there's a change in prefs proxy config.
   // Subclasses can extend it for changes in other sources of proxy config.
   virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
                                     const net::ProxyConfig& config);
 
-  // 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;
 
 
   const PrefService* prefs() const { return pref_service_; }
   bool update_pending() const { return update_pending_; }
 
  private:
   // Creates a proxy configuration from proxy-related preferences. Configuration
   // is stored in |config|, return value indicates whether the configuration is
   // valid.
   ProxyPrefs::ConfigState ReadPrefConfig(net::ProxyConfig* config);
 
   // Tracks configuration state. |pref_config_| is valid only if |config_state_|
   // is not CONFIG_UNSET.
   ProxyPrefs::ConfigState config_state_;
 
   // Configuration as defined by prefs.
   net::ProxyConfig pref_config_;
 
   PrefService* pref_service_;
   ChromeProxyConfigService* chrome_proxy_config_service_;  // Weak ptr.
   bool update_pending_;  // True if config has not been pushed to network stack.
   PrefChangeRegistrar proxy_prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTrackerImpl);
 };
 
 #endif  // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_TRACKER_IMPL_H_