Implement new invalidations ack tracking system

sync/notifier/invalidation_notifier.cc

Index: sync/notifier/invalidation_notifier.cc
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index e3c79a44117d97e21edf6fc99aae614cb007c1d9..a509409c76d00c8b912d1333c668a7773599341e 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -20,17 +20,17 @@ namespace syncer {
 InvalidationNotifier::InvalidationNotifier(
     scoped_ptr<notifier::PushClient> push_client,
     const std::string& invalidator_client_id,
-    const InvalidationStateMap& initial_invalidation_state_map,
+    const UnackedInvalidationsMap& saved_invalidations,
     const std::string& invalidation_bootstrap_data,
     const WeakHandle<InvalidationStateTracker>& invalidation_state_tracker,
     const std::string& client_info)
     : state_(STOPPED),
-      initial_invalidation_state_map_(initial_invalidation_state_map),
+      saved_invalidations_(saved_invalidations),
       invalidation_state_tracker_(invalidation_state_tracker),
       client_info_(client_info),
       invalidator_client_id_(invalidator_client_id),
       invalidation_bootstrap_data_(invalidation_bootstrap_data),
-      invalidation_listener_(&tick_clock_, push_client.Pass()) {
+      invalidation_listener_(push_client.Pass()) {
 }
 
 InvalidationNotifier::~InvalidationNotifier() {
@@ -54,12 +54,6 @@ void InvalidationNotifier::UnregisterHandler(InvalidationHandler* handler) {
   registrar_.UnregisterHandler(handler);
 }
 
-void InvalidationNotifier::Acknowledge(const invalidation::ObjectId& id,
-                                       const AckHandle& ack_handle) {
-  DCHECK(CalledOnValidThread());
-  invalidation_listener_.Acknowledge(id, ack_handle);
-}
-
 InvalidatorState InvalidationNotifier::GetInvalidatorState() const {
   DCHECK(CalledOnValidThread());
   return registrar_.GetInvalidatorState();
@@ -71,7 +65,7 @@ void InvalidationNotifier::UpdateCredentials(
     invalidation_listener_.Start(
         base::Bind(&invalidation::CreateInvalidationClient),
         invalidator_client_id_, client_info_, invalidation_bootstrap_data_,
-        initial_invalidation_state_map_,
+        saved_invalidations_,
         invalidation_state_tracker_,
         this);
     state_ = STARTED;