Implement Invalidator::Acknowledge

chrome/browser/sync/invalidations/invalidator_storage.h

Index: chrome/browser/sync/invalidations/invalidator_storage.h
diff --git a/chrome/browser/sync/invalidations/invalidator_storage.h b/chrome/browser/sync/invalidations/invalidator_storage.h
index e720ce808df6a1902ff300eff59baef7c907f451..7bc3f42de7813a6267f64e50022d7e98ab9d0189 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage.h
+++ b/chrome/browser/sync/invalidations/invalidator_storage.h
@@ -41,7 +41,7 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
   void Clear();
 
   // InvalidationStateTracker implementation.
-  virtual syncer::InvalidationVersionMap GetAllMaxVersions() const
+  virtual syncer::InvalidationStateMap GetStateMap() const
       OVERRIDE;
   virtual void SetMaxVersion(const invalidation::ObjectId& id,
                              int64 max_version) OVERRIDE;
@@ -49,6 +49,12 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
   // TODO(tim): These are not yet used. Bug 124140.
   virtual void SetBootstrapData(const std::string& data) OVERRIDE;
   virtual std::string GetBootstrapData() const OVERRIDE;
+  virtual void GenerateAckHandles(
+      const syncer::ObjectIdSet& ids,
+      const scoped_refptr<base::TaskRunner>& task_runner,
+      base::Callback<void(const syncer::AckHandleMap&)> callback) OVERRIDE;
+  virtual void Acknowledge(const invalidation::ObjectId& id,
+                           const syncer::AckHandle& ack_handle) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(InvalidatorStorageTest, SerializeEmptyMap);
@@ -70,19 +76,19 @@ class InvalidatorStorage : public base::SupportsWeakPtr<InvalidatorStorage>,
 
   base::ThreadChecker thread_checker_;
 
-  // Helpers to convert between InvalidationVersionMap <--> ListValue.
+  // Helpers to convert between InvalidationStateMap <--> ListValue.
   static void DeserializeFromList(
-      const base::ListValue& max_versions_list,
-      syncer::InvalidationVersionMap* max_versions_map);
+      const base::ListValue& state_map_list,
+      syncer::InvalidationStateMap* state_map);
   static void SerializeToList(
-      const syncer::InvalidationVersionMap& max_versions_map,
-      base::ListValue* max_versions_list);
+      const syncer::InvalidationStateMap& state_map,
+      base::ListValue* state_map_list);
 
   // Code for migrating from old MaxInvalidationVersions pref, which was a map
   // from sync types to max invalidation versions.
   void MigrateMaxInvalidationVersionsPref();
   static void DeserializeMap(const base::DictionaryValue* max_versions_dict,
-                             syncer::InvalidationVersionMap* map);
+                             syncer::InvalidationStateMap* map);
 
   // May be NULL.
   PrefService* const pref_service_;