[Sync] Rework Invalidator-related unit tests

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 9fb7eb4933e048d2091a8c49f6fc96936aaa4013..bc28f73a843319133bae80d601d78750ceddf955 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -651,9 +651,12 @@ void SyncTest::EnableNotifications() {
 void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   const std::string& data =
-      syncer::P2PNotificationData("from_server",
-                                         syncer::NOTIFY_ALL,
-                                         changed_types).ToString();
+      syncer::P2PNotificationData(
+          "from_server",
+          syncer::NOTIFY_ALL,
+          syncer::ObjectIdSetToStateMap(
+              syncer::ModelTypeSetToObjectIdSet(changed_types), ""),
+          syncer::REMOTE_NOTIFICATION).ToString();
   const std::string& path =
       std::string("chromiumsync/sendnotification?channel=") +
       syncer::kSyncP2PNotificationChannel + "&data=" + data;