Add version field to syncer::Invalidation.

sync/notifier/p2p_invalidator_unittest.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/p2p_invalidator.h"
 
 #include <cstddef>
 
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 162 matching lines @@
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 // Make sure the P2PNotificationData <-> string conversions work for a
 // non-default-constructed P2PNotificationData.
 TEST_F(P2PInvalidatorTest, P2PNotificationDataNonDefault) {
   const ObjectIdInvalidationMap& invalidation_map =
       ObjectIdSetToInvalidationMap(
           ModelTypeSetToObjectIdSet(ModelTypeSet(BOOKMARKS, THEMES)),
+          Invalidation::kUnknownVersion,
           std::string());
   const P2PNotificationData notification_data(
       "sender", NOTIFY_ALL, invalidation_map);
   EXPECT_TRUE(notification_data.IsTargeted("sender"));
   EXPECT_TRUE(notification_data.IsTargeted("other1"));
   EXPECT_TRUE(notification_data.IsTargeted("other2"));
   EXPECT_THAT(invalidation_map,
               Eq(notification_data.GetIdInvalidationMap()));
   const std::string& notification_data_str = notification_data.ToString();
   EXPECT_EQ(
       "{\"idInvalidationMap\":["
       "{\"objectId\":{\"name\":\"BOOKMARK\",\"source\":1004},"
       "\"state\":{\"ackHandle\":{\"state\":\"\",\"timestamp\":\"0\"},"
-      "\"payload\":\"\"}},"
+      "\"payload\":\"\",\"version\":\"-1\"}},"
       "{\"objectId\":{\"name\":\"THEME\",\"source\":1004},"
       "\"state\":{\"ackHandle\":{\"state\":\"\",\"timestamp\":\"0\"},"
-      "\"payload\":\"\"}}"
+      "\"payload\":\"\",\"version\":\"-1\"}}"
       "],\"notificationType\":\"notifyAll\","
       "\"senderId\":\"sender\"}", notification_data_str);
 
   P2PNotificationData notification_data_parsed;
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 // Set up the P2PInvalidator, simulate a successful connection, and send
 // a notification with the default target (NOTIFY_OTHERS).  The
@@ skipping 32 matching lines @@
       ModelTypeInvalidationMapToObjectIdInvalidationMap(
           MakeInvalidationMap(enabled_types)),
       Eq(fake_handler_.GetLastInvalidationMap()));
 
   // Sent with target NOTIFY_OTHERS so should not be propagated to
   // |fake_handler_|.
   {
     const ObjectIdInvalidationMap& invalidation_map =
         ObjectIdSetToInvalidationMap(
             ModelTypeSetToObjectIdSet(ModelTypeSet(THEMES, APPS)),
+            Invalidation::kUnknownVersion,
             std::string());
     invalidator->SendInvalidation(invalidation_map);
   }
 
   ReflectSentNotifications();
   EXPECT_EQ(1, fake_handler_.GetInvalidationCount());
 }
 
 // Set up the P2PInvalidator and send out notifications with various
 // target settings.  The notifications received by the observer should
 // be consistent with the target settings.
 TEST_F(P2PInvalidatorTest, SendNotificationData) {
   const ModelTypeSet enabled_types(BOOKMARKS, PREFERENCES, THEMES);
   const ModelTypeSet changed_types(THEMES, APPS);
   const ModelTypeSet expected_types(THEMES);
 
   const ObjectIdInvalidationMap& invalidation_map =
       ObjectIdSetToInvalidationMap(ModelTypeSetToObjectIdSet(changed_types),
+                                   Invalidation::kUnknownVersion,
                                    std::string());
 
   P2PInvalidator* const invalidator = delegate_.GetInvalidator();
   notifier::FakePushClient* const push_client = delegate_.GetPushClient();
 
   invalidator->UpdateRegisteredIds(&fake_handler_,
                                    ModelTypeSetToObjectIdSet(enabled_types));
 
   invalidator->UpdateCredentials("foo@bar.com", "fake_token");
 
@@ skipping 76 matching lines @@
   EXPECT_EQ(5, fake_handler_.GetInvalidationCount());
 }
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     P2PInvalidatorTest, InvalidatorTest,
     P2PInvalidatorTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer