Refactor common invalidation framework types

sync/internal_api/public/base/object_id_invalidation_map_test_util.h

Index: sync/internal_api/public/base/object_id_invalidation_map_test_util.h
diff --git a/sync/notifier/object_id_invalidation_map_test_util.h b/sync/internal_api/public/base/object_id_invalidation_map_test_util.h
similarity index 69%
rename from sync/notifier/object_id_invalidation_map_test_util.h
rename to sync/internal_api/public/base/object_id_invalidation_map_test_util.h
index 0217da8d65ceb457e2d6190d39324d0270d23cc5..1b2fde119f7075803805f8d20c5f133ba18e38af 100644
--- a/sync/notifier/object_id_invalidation_map_test_util.h
+++ b/sync/internal_api/public/base/object_id_invalidation_map_test_util.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_TEST_UTILH_
-#define SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_TEST_UTILH_
+#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
+#define SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
 
 // Convince googletest to use the correct overload for PrintTo().
 #include "sync/internal_api/public/base/invalidation_test_util.h"
-#include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -18,4 +17,4 @@ namespace syncer {
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_TEST_UTILH_
+#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_