Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/engine/sync_scheduler_whitebox_unittest.cc

Index: sync/engine/sync_scheduler_whitebox_unittest.cc
diff --git a/sync/engine/sync_scheduler_whitebox_unittest.cc b/sync/engine/sync_scheduler_whitebox_unittest.cc
index f6f88c2a47da75e201bbd58bae9503578ff4a9bb..107c0ed432661fb250483bd0e9329d7863cb3b87 100644
--- a/sync/engine/sync_scheduler_whitebox_unittest.cc
+++ b/sync/engine/sync_scheduler_whitebox_unittest.cc
@@ -150,10 +150,10 @@ TEST_F(SyncSchedulerWhiteboxTest, SaveNudgeWhileTypeThrottled) {
   context()->throttled_data_type_tracker()->SetUnthrottleTime(
       types, base::TimeTicks::Now() + base::TimeDelta::FromHours(2));
 
-  ModelTypePayloadMap types_with_payload;
-  types_with_payload[BOOKMARKS] = "";
+  ModelTypeStateMap type_state_map;
+  type_state_map.insert(std::make_pair(BOOKMARKS, InvalidationState()));
 
-  SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, types_with_payload);
+  SyncSourceInfo info(GetUpdatesCallerInfo::LOCAL, type_state_map);
   SyncSession* s = scheduler_->CreateSyncSession(info);
 
   // Now schedule a nudge with just bookmarks and the change is local.