Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/speech/chrome_speech_recognition_preferences.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_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.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 "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
-#include "content/public/browser/notification_observer.h"
 #include "content/public/browser/speech_recognition_preferences.h"
 
 class PrefService;
 
 namespace base {
 class ListValue;
 }
 
 // Utility class that handles persistent storage of speech recognition
 // preferences. Instances of this class must be obtained exclusively through the
 // method ChromeSpeechRecognitionPreferences::GetForProfile(...), so that
 // preferences are handled within the Profile (if not NULL). The internal
 // factory class also handles ownership and lifetime of the
 // ChromeSpeechRecognitionPreferences instances (through the inner Service
 // class), allowing them to be used in a detached mode (no persistent storage)
 // even when a Profile is not available (or has been shutdown).
 
 class ChromeSpeechRecognitionPreferences
     : public content::SpeechRecognitionPreferences,
-      public content::NotificationObserver {
+      public PrefObserver {
  public:
   static void InitializeFactory();
   static scoped_refptr<ChromeSpeechRecognitionPreferences> GetForProfile(
       Profile* profile);
 
-  // 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;
 
 
   // content::SpeechRecognitionPreferences implementation.
   // Called by both Content (on IO thread) and Chrome (on UI thread).
   virtual bool FilterProfanities() const OVERRIDE;
 
   // Called only by Chrome (on UI thread).
   void SetFilterProfanities(bool filter_profanities);
   void ToggleFilterProfanities();
   bool ShouldShowSecurityNotification(const std::string& context_name) const;
@@ skipping 63 matching lines @@
   scoped_ptr<base::ListValue> notifications_shown_;
 
   // Lock used to ensure exclusive access to preference variables that are
   // accessed by both threads (note: mutable is required to keep getters const).
   mutable base::Lock preferences_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences);
 };
 
 #endif  // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_