Invalidation trickles mega-patch

sync/internal_api/public/base/model_type_test_util.cc

Index: sync/internal_api/public/base/model_type_test_util.cc
diff --git a/sync/internal_api/public/base/model_type_test_util.cc b/sync/internal_api/public/base/model_type_test_util.cc
index 242b398bc0bfeeb99977804b937cf97efee6d28d..d9621bbbab9ab0e01df65413a889009e7908cc5c 100644
--- a/sync/internal_api/public/base/model_type_test_util.cc
+++ b/sync/internal_api/public/base/model_type_test_util.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "sync/internal_api/public/base/model_type_test_util.h"
+#include "sync/internal_api/public/base/ack_handle.h"
 
 namespace syncer {
 
@@ -12,16 +13,9 @@ ObjectIdInvalidationMap BuildInvalidationMap(
     const std::string& payload) {
   ObjectIdInvalidationMap map;
   invalidation::ObjectId id;
-  Invalidation invalidation;
-
   bool result = RealModelTypeToObjectId(type, &id);
-  DCHECK(result)
-      << "Conversion of model type to object id failed: "
-      << ModelTypeToString(type);
-  invalidation.version = version;
-  invalidation.payload = payload;
-
-  map.insert(std::make_pair(id, invalidation));
+  DCHECK(result);
+  map.Insert(Invalidation::Init(id, version, payload));
   return map;
 }