Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

sync/notifier/p2p_notifier.h

Index: sync/notifier/p2p_notifier.h
diff --git a/sync/notifier/p2p_notifier.h b/sync/notifier/p2p_notifier.h
index 4457c6f64905afc60b406e09badce908b4a93d46..6b98077d383e741a58c84da6f261ef16a28e3de6 100644
--- a/sync/notifier/p2p_notifier.h
+++ b/sync/notifier/p2p_notifier.h
@@ -18,9 +18,9 @@
 #include "base/threading/thread_checker.h"
 #include "jingle/notifier/listener/push_client_observer.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/notifier/invalidator.h"
+#include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/notifications_disabled_reason.h"
-#include "sync/notifier/sync_notifier.h"
-#include "sync/notifier/sync_notifier_registrar.h"
 
 namespace notifier {
 class PushClient;
@@ -82,7 +82,7 @@ class P2PNotificationData {
   ModelTypeSet changed_types_;
 };
 
-class P2PNotifier : public SyncNotifier,
+class P2PNotifier : public Invalidator,

[akalin, 2012/08/27 22:38:31]

How about P2PInvalidator?

[dcheng, 2012/08/28 00:20:22]

Done.

                     public notifier::PushClientObserver {
  public:
   // The |send_notification_target| parameter was added to allow us to send
@@ -95,11 +95,11 @@ class P2PNotifier : public SyncNotifier,
 
   virtual ~P2PNotifier();
 
-  // SyncNotifier implementation
-  virtual void RegisterHandler(SyncNotifierObserver* handler) OVERRIDE;
-  virtual void UpdateRegisteredIds(SyncNotifierObserver* handler,
+  // Invalidator implementation
+  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
+  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    const ObjectIdSet& ids) OVERRIDE;
-  virtual void UnregisterHandler(SyncNotifierObserver* handler) OVERRIDE;
+  virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
@@ -121,7 +121,7 @@ class P2PNotifier : public SyncNotifier,
 
   base::ThreadChecker thread_checker_;
 
-  SyncNotifierRegistrar registrar_;
+  InvalidatorRegistrar registrar_;
 
   // The push client.
   scoped_ptr<notifier::PushClient> push_client_;