[Sync] Rework Invalidator-related unit tests

sync/notifier/invalidator.h

Index: sync/notifier/invalidator.h
diff --git a/sync/notifier/invalidator.h b/sync/notifier/invalidator.h
index 2765a67cc79424ec085e65c07ef090ad3703fc56..de33f190cb2337d4a10f0540a71dae6bbda673f3 100644
--- a/sync/notifier/invalidator.h
+++ b/sync/notifier/invalidator.h
@@ -13,6 +13,7 @@
 
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/invalidation_util.h"
+#include "sync/notifier/object_id_state_map.h"
 
 namespace syncer {
 class InvalidationHandler;
@@ -82,7 +83,7 @@ class Invalidator {
   // which is still used by sync integration tests.
   // TODO(akalin): Remove this once we move the integration tests off p2p
   // notifications.
-  virtual void SendNotification(ModelTypeSet changed_types) = 0;
+  virtual void SendNotification(const ObjectIdStateMap& id_state_map) = 0;
 };
 }  // namespace syncer