Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/string_number_conversions.h"
@@ skipping 108 matching lines @@
   // Nothing to do.
 }
 
 void PushMessagingInvalidationHandler::OnNotificationsDisabled(
     syncer::NotificationsDisabledReason reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Nothing to do.
 }
 
 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);
     }
   }
 }
 
 void PushMessagingInvalidationHandler::UpdateRegistrations() {
   syncer::ObjectIdSet ids;
   for (std::set<std::string>::const_iterator it =
        registered_extensions_.begin(); it != registered_extensions_.end();
        ++it) {
     const syncer::ObjectIdSet& object_ids = ExtensionIdToObjectIds(*it);
     ids.insert(object_ids.begin(), object_ids.end());
   }
   service_->UpdateRegisteredInvalidationIds(this, ids);
 }
 
 }  // namespace extensions