Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/net/http_server_properties_manager.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_HTTP_SERVER_PROPERTIES_MANAGER_H_
 #define CHROME_BROWSER_NET_HTTP_SERVER_PROPERTIES_MANAGER_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/timer.h"
 #include "base/values.h"
-#include "content/public/browser/notification_observer.h"
 #include "net/base/host_port_pair.h"
 #include "net/http/http_pipelined_host_capability.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_server_properties_impl.h"
 
 class PrefService;
 
 namespace chrome_browser_net {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
 // ShutdownOnUIThread must be called from UI before destruction, to release
 // the prefs listeners on the UI thread. This is done from ProfileIOData.
 //
 // Update tasks from the UI thread can post safely to the IO thread, since the
 // destruction order of Profile and ProfileIOData guarantees that if this
 // exists in UI, then a potential destruction on IO will come after any task
 // posted to IO from that method on UI. This is used to go through IO before
 // the actual update starts, and grab a WeakPtr.
 class HttpServerPropertiesManager
     : public net::HttpServerProperties,
-      public content::NotificationObserver {
+      public PrefObserver {
  public:
   // Create an instance of the HttpServerPropertiesManager. The lifetime of the
   // PrefService objects must be longer than that of the
   // HttpServerPropertiesManager object. Must be constructed on the UI thread.
   explicit HttpServerPropertiesManager(PrefService* pref_service);
   virtual ~HttpServerPropertiesManager();
 
   // Initialize |http_server_properties_impl_| and |io_method_factory_| on IO
   // thread. It also posts a task to UI thread to get SPDY Server preferences
   // from |pref_service_|.
@@ skipping 118 matching lines @@
   // Update prefs::kHttpServerProperties preferences on UI thread. Protected for
   // testing.
   void UpdatePrefsOnUI(
       base::ListValue* spdy_server_list,
       net::SpdySettingsMap* spdy_settings_map,
       net::AlternateProtocolMap* alternate_protocol_map,
       net::PipelineCapabilityMap* pipeline_capability_map);
 
  private:
   // Callback for preference changes.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
   // ---------
   // UI thread
   // ---------
 
   // Used to get |weak_ptr_| to self on the UI thread.
   scoped_ptr<base::WeakPtrFactory<HttpServerPropertiesManager> >
       ui_weak_ptr_factory_;
 
   base::WeakPtr<HttpServerPropertiesManager> ui_weak_ptr_;
@@ skipping 16 matching lines @@
       io_prefs_update_timer_;
 
   scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager);
 };
 
 }  // namespace chrome_browser_net
 
 #endif  // CHROME_BROWSER_NET_HTTP_SERVER_PROPERTIES_MANAGER_H_