[Sync] Rework Invalidator-related unit tests

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index a0fa57cca51cb690ca4210c6943e0a75422f049c..87e6e69441964857a70fde5d0cd78a516ce1eb64 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -1009,9 +1009,9 @@ void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
         (event.snapshot.model_neutral_state().num_successful_commits > 0);
     if (is_notifiable_commit) {
       if (invalidator_.get()) {
-        const ModelTypeSet changed_types =
-            ModelTypeStateMapToSet(event.snapshot.source().types);
-        invalidator_->SendNotification(changed_types);
+        const ObjectIdStateMap& id_state_map =
+            ModelTypeStateMapToObjectIdStateMap(event.snapshot.source().types);
+        invalidator_->SendNotification(id_state_map);
       } else {
         DVLOG(1) << "Not sending notification: invalidator_ is NULL";
       }