Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

chrome/browser/sync/profile_sync_service_unittest.cc

Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 1a2fe90cbe7d9470732d7bb7c286e64aaa8aa700..1a94bcca7affb8cf5acc43e9803cade3c7a2d30f 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -379,13 +379,13 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIds) {
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(1, "id1"));
   ids.insert(invalidation::ObjectId(2, "id2"));
-  const syncer::ObjectIdPayloadMap& payloads =
-      syncer::ObjectIdSetToPayloadMap(ids, "payload");
+  const syncer::ObjectIdStateMap& states =
+      syncer::ObjectIdSetToStateMap(ids, "payload");
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer, OnNotificationsEnabled());
   EXPECT_CALL(observer, OnIncomingNotification(
-      payloads, syncer::REMOTE_NOTIFICATION));
+      states, syncer::REMOTE_NOTIFICATION));
   EXPECT_CALL(observer, OnNotificationsDisabled(
       syncer::TRANSIENT_NOTIFICATION_ERROR));
 
@@ -396,7 +396,7 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIds) {
       service_->GetBackendForTest();
 
   backend->EmitOnNotificationsEnabled();
-  backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
+  backend->EmitOnIncomingNotification(states, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 
   Mock::VerifyAndClearExpectations(&observer);
@@ -404,7 +404,7 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIds) {
   service_->UnregisterInvalidationHandler(&observer);
 
   backend->EmitOnNotificationsEnabled();
-  backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
+  backend->EmitOnIncomingNotification(states, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 }
 
@@ -416,13 +416,13 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIdsPersistence) {
 
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(3, "id3"));
-  const syncer::ObjectIdPayloadMap& payloads =
-      syncer::ObjectIdSetToPayloadMap(ids, "payload");
+  const syncer::ObjectIdStateMap& states =
+      syncer::ObjectIdSetToStateMap(ids, "payload");
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
   EXPECT_CALL(observer, OnNotificationsEnabled());
   EXPECT_CALL(observer, OnIncomingNotification(
-      payloads, syncer::REMOTE_NOTIFICATION));
+      states, syncer::REMOTE_NOTIFICATION));
   // This may get called more than once, as a real notifier is
   // created.
   EXPECT_CALL(observer, OnNotificationsDisabled(
@@ -438,7 +438,7 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIdsPersistence) {
       service_->GetBackendForTest();
 
   backend->EmitOnNotificationsEnabled();
-  backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
+  backend->EmitOnIncomingNotification(states, syncer::REMOTE_NOTIFICATION);
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
 }