Invalidation trickles mega-patch

chrome/browser/invalidation/ticl_invalidation_service.cc

Index: chrome/browser/invalidation/ticl_invalidation_service.cc
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc
index 2d11a0db5d88c9c74a351aa012844f0f90a40fd1..fc96ca0a79bce9a2254b9f5f307340defa4d1a59 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -140,15 +140,6 @@ void TiclInvalidationService::UnregisterInvalidationHandler(
   }
 }
 
-void TiclInvalidationService::AcknowledgeInvalidation(
-    const invalidation::ObjectId& id,
-    const syncer::AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
-  if (invalidator_) {
-    invalidator_->Acknowledge(id, ack_handle);
-  }
-}
-
 syncer::InvalidatorState TiclInvalidationService::GetInvalidatorState() const {
   DCHECK(CalledOnValidThread());
   if (invalidator_) {
@@ -297,8 +288,8 @@ void TiclInvalidationService::OnInvalidatorStateChange(
 }
 
 void TiclInvalidationService::OnIncomingInvalidation(
-    const syncer::ObjectIdInvalidationMap& invalidation_map) {
-  invalidator_registrar_->DispatchInvalidationsToHandlers(invalidation_map);
+    const syncer::ObjectIdInvalidationMap& invalidations) {
+  invalidator_registrar_->DispatchInvalidationsToHandlers(invalidations);
 }
 
 void TiclInvalidationService::Shutdown() {
@@ -361,7 +352,7 @@ void TiclInvalidationService::StartInvalidator() {
   invalidator_.reset(new syncer::NonBlockingInvalidator(
           options,
           invalidator_storage_->GetInvalidatorClientId(),
-          invalidator_storage_->GetAllInvalidationStates(),
+          invalidator_storage_->GetSavedInvalidations(),
           invalidator_storage_->GetBootstrapData(),
           syncer::WeakHandle<syncer::InvalidationStateTracker>(
               invalidator_storage_->AsWeakPtr()),