Remove most remaining sync/notifier dependencies

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 58939223ff2b9096ac5f761969ae815164a95198..8c1164bec2bf0246815d2a0ca6249b2337c1e2ba 100644
--- a/sync/internal_api/public/base/model_type_test_util.cc
+++ b/sync/internal_api/public/base/model_type_test_util.cc
@@ -6,25 +6,6 @@
 
 namespace syncer {
 
-syncer::Invalidation BuildInvalidation(
-    ModelType type,
-    int version,
-    const std::string& payload) {
-  invalidation::ObjectId id;
-  bool result = RealModelTypeToObjectId(type, &id);
-  DCHECK(result);
-  return Invalidation::Init(id, version, payload);
-}
-
-ObjectIdInvalidationMap BuildInvalidationMap(
-    ModelType type,
-    int version,
-    const std::string& payload) {
-  ObjectIdInvalidationMap map;
-  map.Insert(BuildInvalidation(type, version, payload));
-  return map;
-}
-
 void PrintTo(ModelTypeSet model_types, ::std::ostream* os) {
   *os << ModelTypeSetToString(model_types);
 }