Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/sync_notifier_registrar.cc

Index: sync/notifier/sync_notifier_registrar.cc
diff --git a/sync/notifier/sync_notifier_registrar.cc b/sync/notifier/sync_notifier_registrar.cc
index 02c00b6d1593c22fe4aa7290d74a5409ca9f93c1..77c394cec10201ea37a7b28e90c11d3adaec3063 100644
--- a/sync/notifier/sync_notifier_registrar.cc
+++ b/sync/notifier/sync_notifier_registrar.cc
@@ -74,7 +74,7 @@ ObjectIdSet SyncNotifierRegistrar::GetAllRegisteredIds() const {
 }
 
 void SyncNotifierRegistrar::DispatchInvalidationsToHandlers(
-    const ObjectIdPayloadMap& id_payloads,
+    const ObjectIdStateMap& id_state_map,
     IncomingNotificationSource source) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // If we have no handlers, there's nothing to do.
@@ -82,10 +82,10 @@ void SyncNotifierRegistrar::DispatchInvalidationsToHandlers(
     return;
   }
 
-  typedef std::map<SyncNotifierObserver*, ObjectIdPayloadMap> DispatchMap;
+  typedef std::map<SyncNotifierObserver*, ObjectIdStateMap> DispatchMap;
   DispatchMap dispatch_map;
-  for (ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
-       it != id_payloads.end(); ++it) {
+  for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
+       it != id_state_map.end(); ++it) {
     SyncNotifierObserver* const handler = ObjectIdToHandler(it->first);
     // Filter out invalidations for IDs with no handler.
     if (handler)