Refactor common invalidation framework types

chrome/browser/drive/drive_notification_manager.cc

 // Copyright 2013 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/drive/drive_notification_manager.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/drive/drive_notification_observer.h"
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
@@ skipping 50 matching lines @@
   } else {
     DVLOG(1) << "XMPP Notifications disabled (state=" << state << ")";
   }
   FOR_EACH_OBSERVER(DriveNotificationObserver, observers_,
                     OnPushNotificationEnabled(push_notification_enabled_));
 }
 
 void DriveNotificationManager::OnIncomingInvalidation(
     const syncer::ObjectIdInvalidationMap& invalidation_map) {
   DVLOG(2) << "XMPP Drive Notification Received";
-  DCHECK_EQ(1U, invalidation_map.size());
+  syncer::ObjectIdSet ids = invalidation_map.GetObjectIds();
+  DCHECK_EQ(1U, ids.size());
   const invalidation::ObjectId object_id(
       ipc::invalidation::ObjectSource::COSMO_CHANGELOG,
       kDriveInvalidationObjectId);
-  DCHECK_EQ(1U, invalidation_map.count(object_id));
+  DCHECK_EQ(1U, ids.count(object_id));
 
   // TODO(dcheng): Only acknowledge the invalidation once the fetch has
   // completed. http://crbug.com/156843
   DCHECK(invalidation_service_);
-  invalidation_service_->AcknowledgeInvalidation(
-      invalidation_map.begin()->first,
-      invalidation_map.begin()->second.ack_handle);
+  syncer::Invalidation inv = invalidation_map.ForObject(object_id).back();
+  invalidation_service_->AcknowledgeInvalidation(object_id, inv.ack_handle());
 
   NotifyObserversToUpdate(NOTIFICATION_XMPP);
 }
 
 void DriveNotificationManager::AddObserver(
     DriveNotificationObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DriveNotificationManager::RemoveObserver(
@@ skipping 58 matching lines @@
       return "NOTIFICATION_XMPP";
     case NOTIFICATION_POLLING:
       return "NOTIFICATION_POLLING";
   }
 
   NOTREACHED();
   return "";
 }
 
 }  // namespace drive