Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/content_settings/cookie_settings.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_CONTENT_SETTINGS_COOKIE_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service_factory.h"
 #include "chrome/common/content_settings.h"
-#include "content/public/browser/notification_observer.h"
 
 class ContentSettingsPattern;
 class CookieSettingsWrapper;
 class GURL;
 class PrefService;
 class Profile;
 
 // A frontend to the cookie settings of |HostContentSettingsMap|. Handles
 // cookie-specific logic such as blocking third-party cookies. Written on the UI
 // thread and read on any thread. One instance per profile.
 
 class CookieSettings
-    : public content::NotificationObserver,
+    : public PrefObserver,
       public RefcountedProfileKeyedService {
  public:
   CookieSettings(
       HostContentSettingsMap* host_content_settings_map,
       PrefService* prefs);
 
   // Returns the default content setting (CONTENT_SETTING_ALLOW,
   // CONTENT_SETTING_BLOCK, or CONTENT_SETTING_SESSION_ONLY) for cookies. If
   // |provider_id| is not NULL, the id of the provider which provided the
   // default setting is assigned to it.
@@ skipping 41 matching lines @@
   void SetCookieSetting(const ContentSettingsPattern& primary_pattern,
                         const ContentSettingsPattern& secondary_pattern,
                         ContentSetting setting);
 
   // Resets the cookie setting for the given patterns.
   //
   // This should only be called on the UI thread.
   void ResetCookieSetting(const ContentSettingsPattern& primary_pattern,
                           const ContentSettingsPattern& secondary_pattern);
 
-  // |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;
 
   // Detaches the |CookieSettings| from all |Profile|-related objects like
   // |PrefService|. This methods needs to be called before destroying the
   // |Profile|. Afterwards, only const methods can be called.
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // A helper for applying third party cookie blocking rules.
   ContentSetting GetCookieSetting(
       const GURL& url,
       const GURL& first_party_url,
@@ skipping 36 matching lines @@
   PrefChangeRegistrar pref_change_registrar_;
 
   // Used around accesses to |block_third_party_cookies_| to guarantee thread
   // safety.
   mutable base::Lock lock_;
 
   bool block_third_party_cookies_;
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_