Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc

Index: chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc
index 1b45bd1b319f0214503950c4a6a8fc11143f7d22..0d81b65001cccd252b6520e3d9487131e3d0c956 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc
@@ -126,17 +126,17 @@ void PushMessagingInvalidationHandler::OnNotificationsDisabled(
 }
 
 void PushMessagingInvalidationHandler::OnIncomingNotification(
-    const syncer::ObjectIdPayloadMap& id_payloads,
+    const syncer::ObjectIdStateMap& id_state_map,
     syncer::IncomingNotificationSource source) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  for (syncer::ObjectIdPayloadMap::const_iterator it = id_payloads.begin();
-       it != id_payloads.end(); ++it) {
+  for (syncer::ObjectIdStateMap::const_iterator it = id_state_map.begin();
+       it != id_state_map.end(); ++it) {
     std::string extension_id;
     int subchannel;
     if (ObjectIdToExtensionAndSubchannel(it->first,
                                          &extension_id,
                                          &subchannel)) {
-      delegate_->OnMessage(extension_id, subchannel, it->second);
+      delegate_->OnMessage(extension_id, subchannel, it->second.payload);
     }
   }
 }