Invalidation trickles mega-patch

chrome/browser/invalidation/invalidation_service_android.cc

Index: chrome/browser/invalidation/invalidation_service_android.cc
diff --git a/chrome/browser/invalidation/invalidation_service_android.cc b/chrome/browser/invalidation/invalidation_service_android.cc
index 7e03cc2bc5d1ff363ad305ba162dc2b53cae8a28..4516626c4e02239e8c3145c6d818f2f292003777 100644
--- a/chrome/browser/invalidation/invalidation_service_android.cc
+++ b/chrome/browser/invalidation/invalidation_service_android.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_controller_android.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 namespace invalidation {
 
@@ -44,13 +45,6 @@ void InvalidationServiceAndroid::UnregisterInvalidationHandler(
   invalidator_registrar_.UnregisterHandler(handler);
 }
 
-void InvalidationServiceAndroid::AcknowledgeInvalidation(
-    const invalidation::ObjectId& id,
-    const syncer::AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
-  // Do nothing.  The Android invalidator does not support ack tracking.
-}
-
 syncer::InvalidatorState
 InvalidationServiceAndroid::GetInvalidatorState() const {
   DCHECK(CalledOnValidThread());
@@ -77,11 +71,9 @@ void InvalidationServiceAndroid::Observe(
 
   // An empty map implies that we should invalidate all.
   const syncer::ObjectIdInvalidationMap& effective_invalidation_map =
-      object_invalidation_map.empty() ?
-      ObjectIdSetToInvalidationMap(
-          invalidator_registrar_.GetAllRegisteredIds(),
-          syncer::Invalidation::kUnknownVersion,
-          std::string()) :
+      object_invalidation_map.Empty() ?
+      syncer::ObjectIdInvalidationMap::InvalidateAll(
+          invalidator_registrar_.GetAllRegisteredIds()) :
       object_invalidation_map;
 
   invalidator_registrar_.DispatchInvalidationsToHandlers(