Implement new invalidations ack tracking system

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 6e147fe40853585e196167aa9cd9cf7da0cc827b..47e2f0f0dc7ffbd1036c21647f1bb265072915fa 100644
--- a/sync/notifier/fake_invalidation_state_tracker.cc
+++ b/sync/notifier/fake_invalidation_state_tracker.cc
@@ -18,35 +18,6 @@ FakeInvalidationStateTracker::FakeInvalidationStateTracker() {}
 
 FakeInvalidationStateTracker::~FakeInvalidationStateTracker() {}
 
-int64 FakeInvalidationStateTracker::GetMaxVersion(
-    const invalidation::ObjectId& id) const {
-  InvalidationStateMap::const_iterator it = state_map_.find(id);
-  return (it == state_map_.end()) ? kMinVersion : it->second.version;
-}
-
-InvalidationStateMap
-FakeInvalidationStateTracker::GetAllInvalidationStates() const {
-  return state_map_;
-}
-
-void FakeInvalidationStateTracker::SetMaxVersionAndPayload(
-    const invalidation::ObjectId& id,
-    int64 max_version,
-    const std::string& payload) {
-  InvalidationStateMap::const_iterator it = state_map_.find(id);
-  if ((it != state_map_.end()) && (max_version <= it->second.version)) {
-    ADD_FAILURE();
-    return;
-  }
-  state_map_[id].version = max_version;
-}
-
-void FakeInvalidationStateTracker::Forget(const ObjectIdSet& ids) {
-  for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
-    state_map_.erase(*it);
-  }
-}
-
 void FakeInvalidationStateTracker::SetInvalidatorClientId(
     const std::string& client_id) {
   Clear();
@@ -66,31 +37,19 @@ std::string FakeInvalidationStateTracker::GetBootstrapData() const {
   return bootstrap_data_;
 }
 
-void FakeInvalidationStateTracker::Clear() {
-  invalidator_client_id_ = "";
-  state_map_ = InvalidationStateMap();
-  bootstrap_data_ = "";
+void FakeInvalidationStateTracker::SetSavedInvalidations(
+    const UnackedInvalidationsMap& states) {
+  unacked_invalidations_map_ = states;
 }
 
-void FakeInvalidationStateTracker::GenerateAckHandles(
-    const ObjectIdSet& ids,
-    const scoped_refptr<base::TaskRunner>& task_runner,
-    base::Callback<void(const AckHandleMap&)> callback) {
-  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));
-  }
-  if (!task_runner->PostTask(FROM_HERE, base::Bind(callback, ack_handles)))
-    ADD_FAILURE();
+UnackedInvalidationsMap
+FakeInvalidationStateTracker::GetSavedInvalidations() const {
+  return unacked_invalidations_map_;
 }
 
-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;
+void FakeInvalidationStateTracker::Clear() {
+  invalidator_client_id_.clear();
+  bootstrap_data_.clear();
 }
 
 }  // namespace syncer