Invalidation trickles mega-patch

sync/sessions/nudge_tracker_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/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"
 
 namespace syncer {
 
 namespace {
 
 testing::AssertionResult ModelTypeSetEquals(ModelTypeSet a, ModelTypeSet b) {
   if (a.Equals(b)) {
     return testing::AssertionSuccess();
@@ skipping 86 matching lines @@
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::NOTIFICATION,
             nudge_tracker.updates_source());
   nudge_tracker.RecordLocalRefreshRequest(ModelTypeSet(TYPED_URLS));
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::NOTIFICATION,
             nudge_tracker.updates_source());
 }
 
 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 =
         BuildInvalidationMap(BOOKMARKS, 1, "bm_hint_1");
     nudge_tracker.RecordRemoteInvalidation(invalidation_map);
 
     sync_pb::GetUpdateTriggers gu_trigger;
     nudge_tracker.FillProtoMessage(BOOKMARKS, &gu_trigger);
     ASSERT_EQ(1, gu_trigger.notification_hint_size());
     EXPECT_EQ("bm_hint_1", gu_trigger.notification_hint(0));
@@ skipping 35 matching lines @@
     sync_pb::GetUpdateTriggers pw_gu_trigger;
     nudge_tracker.FillProtoMessage(PASSWORDS, &pw_gu_trigger);
     ASSERT_EQ(1, pw_gu_trigger.notification_hint_size());
     EXPECT_EQ("pw_hint_1", pw_gu_trigger.notification_hint(0));
     EXPECT_FALSE(pw_gu_trigger.client_dropped_hints());
   }
 }
 
 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);
     EXPECT_EQ(GetHintBufferSize(),
               static_cast<size_t>(gu_trigger.notification_hint_size()));
     EXPECT_FALSE(gu_trigger.client_dropped_hints());
   }
 
   // Force an overflow.
   ObjectIdInvalidationMap invalidation_map2 =
@@ skipping 276 matching lines @@
   EXPECT_EQ(throttle2_length - throttle1_length,
             nudge_tracker.GetTimeUntilNextUnthrottle(t1));
 
   // Expire the second interval.
   nudge_tracker.UpdateTypeThrottlingState(t2);
   EXPECT_TRUE(nudge_tracker.GetThrottledTypes().Empty());
 }
 
 }  // namespace sessions
 }  // namespace syncer