Implement Invalidator::Acknowledge

sync/notifier/fake_invalidation_state_tracker.cc

Index: sync/notifier/fake_invalidation_state_tracker.cc
diff --git a/sync/notifier/fake_invalidation_state_tracker.cc b/sync/notifier/fake_invalidation_state_tracker.cc
index a64079b1e56a6b68c45781e1d518dfd1f0ce703f..aeff565f1a658808ff54ade24f08f986fe15a7ad 100644
--- a/sync/notifier/fake_invalidation_state_tracker.cc
+++ b/sync/notifier/fake_invalidation_state_tracker.cc
@@ -4,10 +4,24 @@
 
 #include "sync/notifier/fake_invalidation_state_tracker.h"
 
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/location.h"
+#include "base/task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
+namespace {
+
+void GenerateAckHandlesReplyHelper(
+    base::Callback<void(const syncer::AckHandleMap&)> callback,
+    const syncer::AckHandleMap& ack_handles) {
+  callback.Run(ack_handles);
+}
+
+}  // namespace
+
 const int64 FakeInvalidationStateTracker::kMinVersion = kint64min;
 
 FakeInvalidationStateTracker::FakeInvalidationStateTracker() {}
@@ -16,28 +30,27 @@ FakeInvalidationStateTracker::~FakeInvalidationStateTracker() {}
 
 int64 FakeInvalidationStateTracker::GetMaxVersion(
     const invalidation::ObjectId& id) const {
-  InvalidationVersionMap::const_iterator it = versions_.find(id);
-  return (it == versions_.end()) ? kMinVersion : it->second;
+  InvalidationStateMap::const_iterator it = state_map_.find(id);
+  return (it == state_map_.end()) ? kMinVersion : it->second.version;
 }
 
-InvalidationVersionMap
-FakeInvalidationStateTracker::GetAllMaxVersions() const {
-  return versions_;
+InvalidationStateMap FakeInvalidationStateTracker::GetStateMap() const {
+  return state_map_;
 }
 
 void FakeInvalidationStateTracker::SetMaxVersion(
     const invalidation::ObjectId& id, int64 max_version) {
-  InvalidationVersionMap::const_iterator it = versions_.find(id);
-  if ((it != versions_.end()) && (max_version <= it->second)) {
+  InvalidationStateMap::const_iterator it = state_map_.find(id);
+  if ((it != state_map_.end()) && (max_version <= it->second.version)) {
     ADD_FAILURE();
     return;
   }
-  versions_[id] = max_version;
+  state_map_[id].version = max_version;
 }
 
 void FakeInvalidationStateTracker::Forget(const ObjectIdSet& ids) {
   for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
-    versions_.erase(*it);
+    state_map_.erase(*it);
   }
 }
 
@@ -50,4 +63,29 @@ std::string FakeInvalidationStateTracker::GetBootstrapData() const {
   return bootstrap_data_;
 }
 
+void FakeInvalidationStateTracker::GenerateAckHandles(
+    const ObjectIdSet& ids,
+    const scoped_refptr<base::TaskRunner>& task_runner,
+    base::Callback<void(const AckHandleMap&)> callback) {
+  // TODO(dcheng): Properly implement. We probably want a CreateForTest()
+  // method.
+  AckHandleMap ack_handles;
+  for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
+    state_map_[*it].expected = AckHandle::CreateUnique();
+    ack_handles.insert(std::make_pair(*it, state_map_[*it].expected));
+  }
+  task_runner->PostTask(FROM_HERE,
+                        base::Bind(&GenerateAckHandlesReplyHelper,
+                                   callback,
+                                   ack_handles));
+}
+
+void FakeInvalidationStateTracker::Acknowledge(const invalidation::ObjectId& id,
+                                               const AckHandle& ack_handle) {
+  InvalidationStateMap::iterator it = state_map_.find(id);
+  if (it == state_map_.end())
+    ADD_FAILURE();
+  it->second.current = ack_handle;
+}
+
 }  // namespace syncer