Refactor common invalidation framework types

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/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "google/cacheinvalidation/types.pb.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 namespace extensions {
 
 namespace {
 
 const int kNumberOfSubchannels = 4;
 
 // Chrome push messaging object IDs currently have the following format:
 // <format type>/<GAIA ID>/<extension ID>/<subchannel>
 // <format type> must be 'U', and <GAIA ID> is handled server-side so the client
@@ skipping 91 matching lines @@
 
 void PushMessagingInvalidationHandler::OnInvalidatorStateChange(
     syncer::InvalidatorState state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Nothing to do.
 }
 
 void PushMessagingInvalidationHandler::OnIncomingInvalidation(
     const syncer::ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  for (syncer::ObjectIdInvalidationMap::const_iterator it =
-           invalidation_map.begin(); it != invalidation_map.end(); ++it) {
-    service_->AcknowledgeInvalidation(it->first, it->second.ack_handle);
+  syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
+  for (syncer::ObjectIdSet::const_iterator it = ids.begin();
+       it != ids.end(); ++it) {
+    const syncer::OrderedInvalidationList& list =
+        invalidation_map.ForObject(*it);
+    const syncer::Invalidation& invalidation = list.back();
+    service_->AcknowledgeInvalidation(*it, invalidation.GetAckHandle());
+
+    std::string payload;
+    if (invalidation.IsUnknownVersion()) {
+      payload = std::string();
+    } else {
+      payload = list.back().GetPayload();
+    }
 
     syncer::ObjectIdSet::iterator suppressed_id =
-        suppressed_ids_.find(it->first);
+        suppressed_ids_.find(*it);
     if (suppressed_id != suppressed_ids_.end()) {
       suppressed_ids_.erase(suppressed_id);
       continue;
     }
     DVLOG(2) << "Incoming push message, id is: "
-             << syncer::ObjectIdToString(it->first)
-             << " and payload is:" << it->second.payload;
+             << syncer::ObjectIdToString(*it)
+             << " and payload is:" << payload;
 
     std::string extension_id;
     int subchannel;
-    if (ObjectIdToExtensionAndSubchannel(it->first,
-                                         &extension_id,
-                                         &subchannel)) {
+    if (ObjectIdToExtensionAndSubchannel(*it, &extension_id, &subchannel)) {
       DVLOG(2) << "Sending push message to reciever, extension is "
                << extension_id << ", subchannel is " << subchannel
-               << ", and payload is " << it->second.payload;
-      delegate_->OnMessage(extension_id, subchannel, it->second.payload);
+               << ", and payload is " << payload;
+      delegate_->OnMessage(extension_id, subchannel, 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