sync: Remove ModelTypeInvalidationMap

sync/internal_api/sync_manager_impl_unittest.cc

 // Copyright 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.
 
 // Unit tests for the SyncApi. Note that a lot of the underlying
 // functionality is provided by the Syncable layer, which has its own
 // unit tests. We'll test SyncApi specific things in this harness.
 
 #include <cstddef>
 #include <map>
@@ skipping 964 matching lines @@
         GetEncryptedTypes(trans->GetWrappedTrans());
   }
 
   void SimulateInvalidatorStateChangeForTest(InvalidatorState state) {
     DCHECK(sync_manager_.thread_checker_.CalledOnValidThread());
     sync_manager_.OnInvalidatorStateChange(state);
   }
 
   void TriggerOnIncomingNotificationForTest(ModelTypeSet model_types) {
     DCHECK(sync_manager_.thread_checker_.CalledOnValidThread());
-    ModelTypeInvalidationMap invalidation_map =
-        ModelTypeSetToInvalidationMap(model_types, std::string());
-    sync_manager_.OnIncomingInvalidation(
-        ModelTypeInvalidationMapToObjectIdInvalidationMap(
-            invalidation_map));
+    ObjectIdSet id_set = ModelTypeSetToObjectIdSet(model_types);
+    ObjectIdInvalidationMap invalidation_map =
+        ObjectIdSetToInvalidationMap(id_set,
+                                     Invalidation::kUnknownVersion,
+                                     std::string());
+    sync_manager_.OnIncomingInvalidation(invalidation_map);
   }
 
   void SetProgressMarkerForType(ModelType type, bool set) {
     if (set) {
       sync_pb::DataTypeProgressMarker marker;
       marker.set_token("token");
       marker.set_data_type_id(GetSpecificsFieldNumberFromModelType(type));
       sync_manager_.directory()->SetDownloadProgress(type, marker);
     } else {
       sync_pb::DataTypeProgressMarker marker;
@@ skipping 2507 matching lines @@
   size_t folder_b_pos =
       FindChangeInList(folder_b_id, ChangeRecord::ACTION_DELETE);
   size_t child_pos = FindChangeInList(child_id, ChangeRecord::ACTION_DELETE);
 
   // Deletes should appear before updates.
   EXPECT_LT(child_pos, folder_a_pos);
   EXPECT_LT(folder_b_pos, folder_a_pos);
 }
 
 }  // namespace