Implement features needed for local ack handling in InvalidationStateTracker.

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 176 matching lines @@
       "sender", NOTIFY_ALL, invalidation_map, LOCAL_INVALIDATION);
   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\":{},\"payload\":\"\"}},"
+      "\"state\":{\"ackHandle\":{\"state\":\"\"},\"payload\":\"\"}},"
       "{\"objectId\":{\"name\":\"THEME\",\"source\":1004},"
-      "\"state\":{\"ackHandle\":{},\"payload\":\"\"}}"
+      "\"state\":{\"ackHandle\":{\"state\":\"\"},\"payload\":\"\"}}"
       "],\"notificationType\":\"notifyAll\","
       "\"senderId\":\"sender\",\"source\":1}", 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 159 matching lines @@
   EXPECT_EQ(5, fake_handler_.GetInvalidationCount());
 }
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     P2PInvalidatorTest, InvalidatorTest,
     P2PInvalidatorTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer