Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/policy/url_blacklist_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_POLICY_URL_BLACKLIST_MANAGER_H_
 #define CHROME_BROWSER_POLICY_URL_BLACKLIST_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/hash_tables.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 "chrome/common/extensions/matcher/url_matcher.h"
-#include "content/public/browser/notification_observer.h"
 
 class GURL;
 class PrefService;
 
 namespace base {
 class ListValue;
 }
 
 namespace policy {
 
@@ skipping 76 matching lines @@
 // the prefs listeners.
 //
 // 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 URLBlacklistManager : public content::NotificationObserver {
+class URLBlacklistManager : public PrefObserver {
  public:
   // Must be constructed on the UI thread.
   explicit URLBlacklistManager(PrefService* pref_service);
   virtual ~URLBlacklistManager();
 
   // Must be called on the UI thread, before destruction.
   void ShutdownOnUIThread();
 
   // Returns true if |url| is blocked by the current blacklist. Must be called
   // from the IO thread.
@@ skipping 14 matching lines @@
   // Updates the blacklist using the current preference values.
   // Virtual for testing.
   virtual void Update();
 
   // Starts the blacklist update on the IO thread, using the filters in
   // |block| and |allow|. Protected for testing.
   void UpdateOnIO(scoped_ptr<base::ListValue> block,
                   scoped_ptr<base::ListValue> allow);
 
  private:
-  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 post update tasks to the UI thread.
   base::WeakPtrFactory<URLBlacklistManager> ui_weak_ptr_factory_;
 
   // Used to track the policies and update the blacklist on changes.
   PrefChangeRegistrar pref_change_registrar_;
   PrefService* pref_service_;  // Weak.
 
   // ---------
   // IO thread
   // ---------
 
   // Used to get |weak_ptr_| to self on the IO thread.
   base::WeakPtrFactory<URLBlacklistManager> io_weak_ptr_factory_;
 
   // The current blacklist.
   scoped_ptr<URLBlacklist> blacklist_;
 
   DISALLOW_COPY_AND_ASSIGN(URLBlacklistManager);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_URL_BLACKLIST_MANAGER_H_