Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/sync/sync_prefs.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_SYNC_SYNC_PREFS_H_
 #define CHROME_BROWSER_SYNC_SYNC_PREFS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "chrome/browser/api/prefs/pref_member.h"
-#include "content/public/browser/notification_observer.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 
 class PrefService;
 
 namespace browser_sync {
 
 class SyncPrefObserver {
  public:
   // Called whenever the pref that controls whether sync is managed
@@ skipping 12 matching lines @@
 // passing down a pointer to SyncPrefs to them.  A list of files:
 //
 //   profile_sync_service_startup_unittest.cc
 //   profile_sync_service.cc
 //   sync_setup_flow.cc
 //   sync_setup_wizard.cc
 //   sync_setup_wizard_unittest.cc
 //   two_client_preferences_sync_test.cc
 class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
                   public base::SupportsWeakPtr<SyncPrefs>,
-                  public content::NotificationObserver {
+                  public PrefObserver {
  public:
   // |pref_service| may be NULL (for unit tests), but in that case no
   // setter methods should be called.  Does not take ownership of
   // |pref_service|.
   explicit SyncPrefs(PrefService* pref_service);
 
   virtual ~SyncPrefs();
 
   void AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer);
   void RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer);
@@ skipping 50 matching lines @@
 #if defined(OS_CHROMEOS)
   // Use this spare bootstrap token only when setting up sync for the first
   // time.
   std::string GetSpareBootstrapToken() const;
   void SetSpareBootstrapToken(const std::string& token);
 #endif
 
   // Merges the given set of types with the set of acknowledged types.
   void AcknowledgeSyncedTypes(syncer::ModelTypeSet types);
 
-  // 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;
 
   // For testing.
 
   void SetManagedForTest(bool is_managed);
   syncer::ModelTypeSet GetAcknowledgeSyncedTypesForTest() const;
 
  private:
   void RegisterPrefGroups();
   void RegisterPreferences();
 
@@ skipping 26 matching lines @@
   // etc.
   typedef std::map<syncer::ModelType, syncer::ModelTypeSet> PrefGroupsMap;
   PrefGroupsMap pref_groups_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_PREFS_H_