Invalidation trickles mega-patch

chrome/browser/drive/drive_notification_manager.cc

Index: chrome/browser/drive/drive_notification_manager.cc
diff --git a/chrome/browser/drive/drive_notification_manager.cc b/chrome/browser/drive/drive_notification_manager.cc
index 198c0148ecb35690202e1c99743bd46bd230c328..9d1788250a495645d125f9d4b1aa2acc66018190 100644
--- a/chrome/browser/drive/drive_notification_manager.cc
+++ b/chrome/browser/drive/drive_notification_manager.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/invalidation/invalidation_service.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "google/cacheinvalidation/types.pb.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 namespace drive {
 
@@ -68,19 +69,15 @@ void DriveNotificationManager::OnInvalidatorStateChange(
 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));
-
-  // 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);
+  DCHECK_EQ(1U, ids.count(object_id));
 
+  // TODO: Acknowledge only after fetch completes.
+  invalidation_map.AcknowledgeAll();
   NotifyObserversToUpdate(NOTIFICATION_XMPP);
 }