Implement features needed for local ack handling in InvalidationStateTracker.

sync/notifier/sync_invalidation_listener.cc

Index: sync/notifier/sync_invalidation_listener.cc
diff --git a/sync/notifier/sync_invalidation_listener.cc b/sync/notifier/sync_invalidation_listener.cc
index 1b235010bf598e924ef9607c410da7b94b64e1fc..e84bc3893b20c633e93c092c4a6e0c6071f9380a 100644
--- a/sync/notifier/sync_invalidation_listener.cc
+++ b/sync/notifier/sync_invalidation_listener.cc
@@ -148,19 +148,20 @@ void SyncInvalidationListener::Invalidate(
     client->Acknowledge(ack_handle);
     return;
   }
-  DVLOG(2) << "Setting max invalidation version for " << ObjectIdToString(id)
-           << " to " << invalidation.version();
-  invalidation_state_map_[id].version = invalidation.version();
-  invalidation_state_tracker_.Call(
-      FROM_HERE,
-      &InvalidationStateTracker::SetMaxVersion,
-      id, invalidation.version());
 
   std::string payload;
   // payload() CHECK()'s has_payload(), so we must check it ourselves first.
   if (invalidation.has_payload())
     payload = invalidation.payload();
 
+  DVLOG(2) << "Setting max invalidation version for " << ObjectIdToString(id)
+           << " to " << invalidation.version();
+  invalidation_state_map_[id].version = invalidation.version();
+  invalidation_state_tracker_.Call(
+      FROM_HERE,
+      &InvalidationStateTracker::SetMaxVersionAndPayload,
+      id, invalidation.version(), payload);
+
   ObjectIdInvalidationMap invalidation_map;
   invalidation_map[id].payload = payload;
   EmitInvalidation(invalidation_map);