Add version field to syncer::Invalidation.

sync/notifier/object_id_invalidation_map.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/notifier/object_id_invalidation_map.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/values.h"
 
 namespace syncer {
 
 ObjectIdSet ObjectIdInvalidationMapToSet(
     const ObjectIdInvalidationMap& invalidation_map) {
   ObjectIdSet ids;
   for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
        it != invalidation_map.end(); ++it) {
     ids.insert(it->first);
   }
   return ids;
 }
 
 ObjectIdInvalidationMap ObjectIdSetToInvalidationMap(
-    const ObjectIdSet& ids, const std::string& payload) {
+    const ObjectIdSet& ids, int64 version, const std::string& payload) {
   ObjectIdInvalidationMap invalidation_map;
   for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
     // TODO(dcheng): Do we need to provide a way to set AckHandle?
+    invalidation_map[*it].version = version;
     invalidation_map[*it].payload = payload;
   }
   return invalidation_map;
 }
 
 namespace {
 
 struct ObjectIdInvalidationMapValueEquals {
   bool operator()(const ObjectIdInvalidationMap::value_type& value1,
                   const ObjectIdInvalidationMap::value_type& value2) const {
@@ skipping 75 matching lines @@
     if (!RealModelTypeToObjectId(it->first, &id)) {
       DLOG(WARNING) << "Invalid model type " << it->first;
       continue;
     }
     id_invalidation_map[id] = it->second;
   }
   return id_invalidation_map;
 }
 
 }  // namespace syncer