Draft: InvalidationService

sync/notifier/p2p_invalidator.h

Index: sync/notifier/p2p_invalidator.h
diff --git a/sync/notifier/p2p_invalidator.h b/sync/notifier/p2p_invalidator.h
index a56521e09c25249590fc22c8f9a62ebda9222b74..e99637b60bd246a63f94a9c72a6b78ed322fcc38 100644
--- a/sync/notifier/p2p_invalidator.h
+++ b/sync/notifier/p2p_invalidator.h
@@ -23,6 +23,10 @@
 #include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/invalidator_state.h"
 
+// FIXME: These are included only for the sake of p2p_invalidation_service...
+#include "jingle/notifier/base/notifier_options.h"
+#include "jingle/notifier/listener/push_client.h"
+
 namespace notifier {
 class PushClient;
 }  // namespace notifier
@@ -108,8 +112,6 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
-  virtual void SendInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
 
   // PushClientObserver implementation.
   virtual void OnNotificationsEnabled() OVERRIDE;
@@ -118,6 +120,9 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
   virtual void OnIncomingNotification(
       const notifier::Notification& notification) OVERRIDE;
 
+  virtual void SendInvalidation(
+      const ObjectIdInvalidationMap& invalidation_map);
+
   void SendNotificationDataForTest(
       const P2PNotificationData& notification_data);