Invalidation trickles mega-patch

sync/sessions/nudge_tracker_unittest.cc

Index: sync/sessions/nudge_tracker_unittest.cc
diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc
index ea7f4c7476584c43f5315034f4f82e0d5be649c5..833ad79a72e81c77625c61373fc46b248e846dfd 100644
--- a/sync/sessions/nudge_tracker_unittest.cc
+++ b/sync/sessions/nudge_tracker_unittest.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "sync/internal_api/public/base/model_type_test_util.h"
+#include "sync/notifier/invalidation_util.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/sessions/nudge_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -109,6 +111,11 @@ TEST_F(NudgeTrackerTest, SourcePriorities) {
 TEST_F(NudgeTrackerTest, HintCoalescing) {
   NudgeTracker nudge_tracker;
 
+  invalidation::ObjectId bookmarks_id;
+  ASSERT_TRUE(RealModelTypeToObjectId(BOOKMARKS, &bookmarks_id));
+  invalidation::ObjectId passwords_id;
+  ASSERT_TRUE(RealModelTypeToObjectId(PASSWORDS, &passwords_id));
+
   // Easy case: record one hint.
   {
     ObjectIdInvalidationMap invalidation_map =
@@ -164,12 +171,16 @@ TEST_F(NudgeTrackerTest, HintCoalescing) {
 
 TEST_F(NudgeTrackerTest, DropHintsLocally) {
   NudgeTracker nudge_tracker;
-  ObjectIdInvalidationMap invalidation_map =
-      BuildInvalidationMap(BOOKMARKS, 1, "hint");
 
+  invalidation::ObjectId bookmarks_id;
+  ASSERT_TRUE(RealModelTypeToObjectId(BOOKMARKS, &bookmarks_id));
+
+  ObjectIdInvalidationMap invalidation_map;
   for (size_t i = 0; i < GetHintBufferSize(); ++i) {
-    nudge_tracker.RecordRemoteInvalidation(invalidation_map);
+    invalidation_map.Insert(Invalidation::Init(bookmarks_id, i, "hint"));
   }
+  nudge_tracker.RecordRemoteInvalidation(invalidation_map);
+
   {
     sync_pb::GetUpdateTriggers gu_trigger;
     nudge_tracker.FillProtoMessage(BOOKMARKS, &gu_trigger);