Implement Invalidator::Acknowledge

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 41ef5b23a15bba7d3803ec120e6ee38182d5a368..3f018b645ebe749cadd14915a99ccde256b5e452 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -633,6 +633,13 @@ void SyncManagerImpl::UnregisterInvalidationHandler(
   invalidator_->UnregisterHandler(handler);
 }
 
+void SyncManagerImpl::AcknowledgeInvalidation(
+    const invalidation::ObjectId& id, const syncer::AckHandle& ack_handle) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(initialized_);
+  invalidator_->Acknowledge(id, ack_handle);
+}
+
 void SyncManagerImpl::AddObserver(SyncManager::Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.AddObserver(observer);
@@ -1237,6 +1244,14 @@ void SyncManagerImpl::OnInvalidatorStateChange(InvalidatorState state) {
 void SyncManagerImpl::OnIncomingInvalidation(
     const ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(thread_checker_.CalledOnValidThread());
+
+  // TODO(dcheng): Acknowledge immediately for now. Fix this logic eventually.

[rlarocque, 2013/02/12 21:48:04]

Could you add a comment to remind us not to remove this until the invalidator
doesn't repeatedly ping us when we don't immediately acknowledge?  Otherwise,
this would interfere with our scheduler's backoff algorithms.  

(I blame this on some unnecessary complexity in the scheduler more than the
invalidator code, but it's a problem nonetheless.)

[dcheng, 2013/02/12 22:39:28]

Done.

+  // crbug.com/124149
+  for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+       it != invalidation_map.end(); ++it) {
+    invalidator_->Acknowledge(it->first, it->second.ack_handle);
+  }
+
   const ModelTypeInvalidationMap& type_invalidation_map =
       ObjectIdInvalidationMapToModelTypeInvalidationMap(invalidation_map);
   if (type_invalidation_map.empty()) {