Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/spellchecker/spellcheck_profile.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_SPELLCHECKER_SPELLCHECK_PROFILE_H_
 #define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_PROFILE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/spellchecker/spellcheck_profile_provider.h"
 #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h"
 #include "chrome/common/spellcheck_common.h"
-#include "content/public/browser/notification_observer.h"
 
 class Profile;
 class SpellCheckHost;
 class SpellCheckHostMetrics;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // A facade of spell-check related objects in the browser process.
 // This class is responsible for managing a life-cycle of:
 // * SpellCheckHost object (instantiation, deletion, reset)
 // * SpellCheckHostMetrics object (only initiate when metrics is enabled)
 //
 // The class is intended to be owned and managed by SpellCheckFactory
 // internally.  Any usable APIs are provided by SpellCheckHost interface, which
 // can be retrieved from SpellCheckFactory::GetHostForProfile();
 class SpellCheckProfile : public SpellCheckProfileProvider,
                           public ProfileKeyedService,
-                          public content::NotificationObserver {
+                          public PrefObserver {
  public:
   explicit SpellCheckProfile(Profile* profile);
   virtual ~SpellCheckProfile();
 
   // Retrieves SpellCheckHost object.
   // This can return NULL when the spell-checking is disabled
   // or the host object is not ready yet.
   SpellCheckHost* GetHost();
 
   // If |force| is false, and the spellchecker is already initialized (or is in
@@ skipping 12 matching lines @@
   virtual const chrome::spellcheck_common::WordList&
       GetCustomWords() const OVERRIDE;
   virtual void CustomWordAddedLocally(const std::string& word) OVERRIDE;
   virtual void LoadCustomDictionary(
       chrome::spellcheck_common::WordList* custom_words) OVERRIDE;
   virtual void WriteWordToCustomDictionary(const std::string& word) OVERRIDE;
 
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
-  // 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;
 
  protected:
   // Only tests should override this.
   virtual SpellCheckHost* CreateHost(
       SpellCheckProfileProvider* provider,
       const std::string& language,
       net::URLRequestContextGetter* request_context,
       SpellCheckHostMetrics* metrics);
 
   virtual bool IsTesting() const;
@@ skipping 49 matching lines @@
 
   // A directory path of profile.
   FilePath profile_dir_;
 
   scoped_ptr<SpellcheckCustomDictionary> custom_dictionary_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellCheckProfile);
 };
 
 #endif  // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_PROFILE_H_