sync: Remove ModelTypeInvalidationMap

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/sessions/nudge_tracker.h"
-
-#include "sync/internal_api/public/base/model_type_invalidation_map.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();
   } else {
@@ skipping 67 matching lines @@
   nudge_tracker.RecordLocalRefreshRequest(ModelTypeSet(TYPED_URLS));
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::DATATYPE_REFRESH,
             nudge_tracker.updates_source());
 
   // Another local nudge will not be enough to change it.
   nudge_tracker.RecordLocalChange(ModelTypeSet(BOOKMARKS));
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::DATATYPE_REFRESH,
             nudge_tracker.updates_source());
 
   // An invalidation will override the refresh request source.
-  ModelTypeInvalidationMap invalidation_map =
-      ModelTypeSetToInvalidationMap(ModelTypeSet(PREFERENCES),
-                                    std::string("hint"));
+  ObjectIdInvalidationMap invalidation_map =
+      BuildInvalidationMap(PREFERENCES, 1, "hint");
   nudge_tracker.RecordRemoteInvalidation(invalidation_map);
   EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::NOTIFICATION,
             nudge_tracker.updates_source());
 
   // Neither local nudges nor refresh requests will override it.
   nudge_tracker.RecordLocalChange(ModelTypeSet(BOOKMARKS));
   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;
 
   // Easy case: record one hint.
   {
-    ModelTypeInvalidationMap invalidation_map =
-        ModelTypeSetToInvalidationMap(ModelTypeSet(BOOKMARKS),
-                                      std::string("bm_hint_1"));
+    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));
     EXPECT_FALSE(gu_trigger.client_dropped_hints());
   }
 
   // Record a second hint for the same type.
   {
-    ModelTypeInvalidationMap invalidation_map =
-        ModelTypeSetToInvalidationMap(ModelTypeSet(BOOKMARKS),
-                                      std::string("bm_hint_2"));
+    ObjectIdInvalidationMap invalidation_map =
+        BuildInvalidationMap(BOOKMARKS, 2, "bm_hint_2");
     nudge_tracker.RecordRemoteInvalidation(invalidation_map);
 
     sync_pb::GetUpdateTriggers gu_trigger;
     nudge_tracker.FillProtoMessage(BOOKMARKS, &gu_trigger);
     ASSERT_EQ(2, gu_trigger.notification_hint_size());
 
     // Expect the most hint recent is last in the list.
     EXPECT_EQ("bm_hint_1", gu_trigger.notification_hint(0));
     EXPECT_EQ("bm_hint_2", gu_trigger.notification_hint(1));
     EXPECT_FALSE(gu_trigger.client_dropped_hints());
   }
 
   // Record a hint for a different type.
   {
-    ModelTypeInvalidationMap invalidation_map =
-        ModelTypeSetToInvalidationMap(ModelTypeSet(PASSWORDS),
-                                      std::string("pw_hint_1"));
+    ObjectIdInvalidationMap invalidation_map =
+        BuildInvalidationMap(PASSWORDS, 1, "pw_hint_1");
     nudge_tracker.RecordRemoteInvalidation(invalidation_map);
 
     // Re-verify the bookmarks to make sure they're unaffected.
     sync_pb::GetUpdateTriggers bm_gu_trigger;
     nudge_tracker.FillProtoMessage(BOOKMARKS, &bm_gu_trigger);
     ASSERT_EQ(2, bm_gu_trigger.notification_hint_size());
     EXPECT_EQ("bm_hint_1", bm_gu_trigger.notification_hint(0));
     EXPECT_EQ("bm_hint_2",
               bm_gu_trigger.notification_hint(1)); // most recent last.
     EXPECT_FALSE(bm_gu_trigger.client_dropped_hints());
 
     // Verify the new type, too.
     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;
-  ModelTypeInvalidationMap invalidation_map =
-      ModelTypeSetToInvalidationMap(ModelTypeSet(BOOKMARKS),
-                                    std::string("hint"));
+  ObjectIdInvalidationMap invalidation_map =
+      BuildInvalidationMap(BOOKMARKS, 1, "hint");
 
   for (size_t i = 0; i < GetHintBufferSize(); ++i) {
     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.
-  ModelTypeInvalidationMap invalidation_map2 =
-      ModelTypeSetToInvalidationMap(ModelTypeSet(BOOKMARKS),
-                                    std::string("new_hint"));
+  ObjectIdInvalidationMap invalidation_map2 =
+      BuildInvalidationMap(BOOKMARKS, 1000, "new_hint");
   nudge_tracker.RecordRemoteInvalidation(invalidation_map2);
 
   {
     sync_pb::GetUpdateTriggers gu_trigger;
     nudge_tracker.FillProtoMessage(BOOKMARKS, &gu_trigger);
     EXPECT_EQ(GetHintBufferSize(),
               static_cast<size_t>(gu_trigger.notification_hint_size()));
     EXPECT_TRUE(gu_trigger.client_dropped_hints());
 
     // Verify the newest hint was not dropped and is the last in the list.
@@ skipping 82 matching lines @@
   nudge_tracker.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker.IsSyncRequired());
 
   // Refresh requests.
   nudge_tracker.RecordLocalRefreshRequest(ModelTypeSet(SESSIONS));
   EXPECT_TRUE(nudge_tracker.IsSyncRequired());
   nudge_tracker.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker.IsSyncRequired());
 
   // Invalidations.
-  ModelTypeInvalidationMap invalidation_map =
-      ModelTypeSetToInvalidationMap(ModelTypeSet(PREFERENCES),
-                                    std::string("hint"));
+  ObjectIdInvalidationMap invalidation_map =
+      BuildInvalidationMap(PREFERENCES, 1, "hint");
   nudge_tracker.RecordRemoteInvalidation(invalidation_map);
   EXPECT_TRUE(nudge_tracker.IsSyncRequired());
   nudge_tracker.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker.IsSyncRequired());
 }
 
 // Basic tests for the IsGetUpdatesRequired() flag.
 TEST_F(NudgeTrackerTest, IsGetUpdatesRequired) {
   NudgeTracker nudge_tracker;
   EXPECT_FALSE(nudge_tracker.IsGetUpdatesRequired());
 
   // Local changes.
   nudge_tracker.RecordLocalChange(ModelTypeSet(SESSIONS));
   EXPECT_FALSE(nudge_tracker.IsGetUpdatesRequired());
   nudge_tracker.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker.IsGetUpdatesRequired());
 
   // Refresh requests.
   nudge_tracker.RecordLocalRefreshRequest(ModelTypeSet(SESSIONS));
   EXPECT_TRUE(nudge_tracker.IsGetUpdatesRequired());
   nudge_tracker.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker.IsGetUpdatesRequired());
 
   // Invalidations.
-  ModelTypeInvalidationMap invalidation_map =
-      ModelTypeSetToInvalidationMap(ModelTypeSet(PREFERENCES),
-                                    std::string("hint"));
+  ObjectIdInvalidationMap invalidation_map =
+      BuildInvalidationMap(PREFERENCES, 1, "hint");
   nudge_tracker.RecordRemoteInvalidation(invalidation_map);
   EXPECT_TRUE(nudge_tracker.IsGetUpdatesRequired());
   nudge_tracker.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker.IsGetUpdatesRequired());
 }
 
 // Test IsSyncRequired() responds correctly to data type throttling.
 TEST_F(NudgeTrackerTest, IsSyncRequired_Throttling) {
   NudgeTracker nudge_tracker;
   const base::TimeTicks t0 = base::TimeTicks::FromInternalValue(1234);
@@ skipping 135 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