Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/invalidation_notifier.h

Index: sync/notifier/invalidation_notifier.h
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index e00a5240568e51b588bd0a1bb79e40f1772c37c4..1411ee5d2f15ef138e7048b5f54dfddab8f3c32a 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -18,13 +18,12 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/chrome_invalidation_client.h"
+#include "sync/notifier/invalidation_notifier_base.h"
 #include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/sync_notifier.h"
 
 namespace notifier {
 class PushClient;
@@ -34,7 +33,7 @@ namespace syncer {
 
 // This class must live on the IO thread.
 class InvalidationNotifier
-    : public SyncNotifier,
+    : public InvalidationNotifierBase,
       public ChromeInvalidationClient::Listener,
       public base::NonThreadSafe {
  public:
@@ -50,14 +49,13 @@ class InvalidationNotifier
   virtual ~InvalidationNotifier();
 
   // 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;
 
@@ -89,9 +87,6 @@ class InvalidationNotifier
   // Passed to |invalidation_client_|.
   const std::string client_info_;
 
-  // Our observers (which must live on the same thread).
-  ObserverList<SyncNotifierObserver> observers_;
-
   // The client ID to pass to |chrome_invalidation_client_|.
   std::string invalidation_client_id_;