Remove most remaining sync/notifier dependencies

sync/internal_api/public/base/model_type_test_util.h

Index: sync/internal_api/public/base/model_type_test_util.h
diff --git a/sync/internal_api/public/base/model_type_test_util.h b/sync/internal_api/public/base/model_type_test_util.h
index 1412f6653a77206c391009b16293636ea13ec01e..cd347cbd7ab8e75ec8be3562159420d66d82ef36 100644
--- a/sync/internal_api/public/base/model_type_test_util.h
+++ b/sync/internal_api/public/base/model_type_test_util.h
@@ -8,26 +8,10 @@
 #include <ostream>
 
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/notifier/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
 
-// Builds an invaliation map that contains a single invalidation with specified
-// type, version, and payload.  The type will be converted from a ModelType to
-// and ObjectId.
-ObjectIdInvalidationMap BuildInvalidationMap(
-    ModelType type,
-    int version,
-    const std::string& payload);
-
-// Builds an invalidation.  Similar to Invalidation::Init, but its first
-// parameter is a ModelType rather than an ObjectId.
-syncer::Invalidation BuildInvalidation(
-    ModelType type,
-    int version,
-    const std::string& payload);
-
 // Defined for googletest.  Forwards to ModelTypeSetToString().
 void PrintTo(ModelTypeSet model_types, ::std::ostream* os);