Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/non_blocking_invalidation_notifier.h

Index: sync/notifier/non_blocking_invalidation_notifier.h
diff --git a/sync/notifier/non_blocking_invalidation_notifier.h b/sync/notifier/non_blocking_invalidation_notifier.h
index 8c2cfafee40b8ef5fede696b29af0bba95752dfc..5289b448c6f2ce497e6f9d5066f20a77b5d83c88 100644
--- a/sync/notifier/non_blocking_invalidation_notifier.h
+++ b/sync/notifier/non_blocking_invalidation_notifier.h
@@ -15,11 +15,10 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "sync/internal_api/public/util/weak_handle.h"
+#include "sync/notifier/invalidation_notifier_base.h"
 #include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/sync_notifier.h"
 #include "sync/notifier/sync_notifier_observer.h"
 
 namespace base {
@@ -29,7 +28,7 @@ class SingleThreadTaskRunner;
 namespace syncer {
 
 class NonBlockingInvalidationNotifier
-    : public SyncNotifier,
+    : public InvalidationNotifierBase,
       // SyncNotifierObserver to "observe" our Core via WeakHandle.
       public SyncNotifierObserver {
  public:
@@ -45,23 +44,23 @@ class NonBlockingInvalidationNotifier
   virtual ~NonBlockingInvalidationNotifier();
 
   // SyncNotifier implementation.
-  virtual void AddObserver(SyncNotifierObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(SyncNotifierObserver* observer) OVERRIDE;
+  virtual void AddHandler(SyncNotifierObserver* observer) OVERRIDE;
+  virtual void RemoveHandler(SyncNotifierObserver* observer) OVERRIDE;
+  virtual void ReloadHandlers() OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
-  virtual void UpdateEnabledTypes(
-      syncer::ModelTypeSet enabled_types) OVERRIDE;
   virtual void SendNotification(
       syncer::ModelTypeSet changed_types) OVERRIDE;
 
   // SyncNotifierObserver implementation.
+  virtual ObjectIdSet GetHandledIds() OVERRIDE;
   virtual void OnNotificationsEnabled() OVERRIDE;
   virtual void OnNotificationsDisabled(
       NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
-      const syncer::ModelTypePayloadMap& type_payloads,
+      const ObjectIdPayloadMap& id_payloads,
       IncomingNotificationSource source) OVERRIDE;
 
  private:
@@ -69,9 +68,6 @@ class NonBlockingInvalidationNotifier
 
   base::WeakPtrFactory<NonBlockingInvalidationNotifier> weak_ptr_factory_;
 
-  // Our observers (which must live on the parent thread).
-  ObserverList<SyncNotifierObserver> observers_;
-
   // The real guts of NonBlockingInvalidationNotifier, which allows
   // this class to live completely on the parent thread.
   scoped_refptr<Core> core_;