Move sync/notifier to components/invalidation

components/invalidation/object_id_invalidation_map_test_util.h

Index: components/invalidation/object_id_invalidation_map_test_util.h
diff --git a/sync/internal_api/public/base/object_id_invalidation_map_test_util.h b/components/invalidation/object_id_invalidation_map_test_util.h
similarity index 62%
rename from sync/internal_api/public/base/object_id_invalidation_map_test_util.h
rename to components/invalidation/object_id_invalidation_map_test_util.h
index 5d71979d1fdcaed4c7923f547039e53d45288686..13f6275d3d6e311de4f8f1dab706d07016ae158d 100644
--- a/sync/internal_api/public/base/object_id_invalidation_map_test_util.h
+++ b/components/invalidation/object_id_invalidation_map_test_util.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#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_
+#ifndef COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
+#define COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
 
 // Convince googletest to use the correct overload for PrintTo().
+#include "components/invalidation/object_id_invalidation_map.h"
 #include "sync/internal_api/public/base/invalidation_test_util.h"
-#include "sync/notifier/object_id_invalidation_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncer {
@@ -17,4 +17,4 @@ namespace syncer {
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_
+#endif  // COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_