[Sync] Move some things from core/ to model(_impl)/.

components/sync/BUILD.gn

Index: components/sync/BUILD.gn
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
index 38742eff5c93b345b6d1afef642624ce2bc8ec8c..58c0eeff777cd843e633b91329845962d0ae1e20 100644
--- a/components/sync/BUILD.gn
+++ b/components/sync/BUILD.gn
@@ -79,8 +79,6 @@ static_library("sync") {
     "core/activation_context.cc",
     "core/activation_context.h",
     "core/configure_reason.h",
-    "core/data_batch_impl.cc",
-    "core/data_batch_impl.h",
     "core/data_type_association_stats.cc",
     "core/data_type_association_stats.h",
     "core/data_type_debug_info_listener.cc",
@@ -94,15 +92,9 @@ static_library("sync") {
     "core/model_type_processor.h",
     "core/model_type_processor_proxy.cc",
     "core/model_type_processor_proxy.h",
-    "core/model_type_store_backend.cc",
-    "core/model_type_store_backend.h",
-    "core/model_type_store_impl.cc",
-    "core/model_type_store_impl.h",
     "core/non_blocking_sync_common.cc",
     "core/non_blocking_sync_common.h",
     "core/shutdown_reason.h",
-    "core/simple_metadata_change_list.cc",
-    "core/simple_metadata_change_list.h",
     "core/sync_auth_provider.h",
     "core/sync_db_util.cc",
     "core/sync_encryption_handler.cc",
@@ -428,6 +420,10 @@ static_library("sync") {
     "model/model_type_service.h",
     "model/model_type_store.cc",
     "model/model_type_store.h",
+    "model/mutable_data_batch.cc",
+    "model/mutable_data_batch.h",
+    "model/simple_metadata_change_list.cc",
+    "model/simple_metadata_change_list.h",
     "model/string_ordinal.h",
     "model/sync_change.cc",
     "model/sync_change.h",
@@ -447,6 +443,10 @@ static_library("sync") {
     "model_impl/attachments/attachment_service_impl.cc",
     "model_impl/attachments/attachment_service_impl.h",
     "model_impl/attachments/task_queue.h",
+    "model_impl/model_type_store_backend.cc",
+    "model_impl/model_type_store_backend.h",
+    "model_impl/model_type_store_impl.cc",
+    "model_impl/model_type_store_impl.h",
     "model_impl/processor_entity_tracker.cc",
     "model_impl/processor_entity_tracker.h",
     "model_impl/shared_model_type_processor.cc",
@@ -676,14 +676,12 @@ static_library("test_support_sync_core_impl") {
     "core/test/fake_model_type_connector.h",
     "core/test/fake_model_type_processor.h",
     "core/test/fake_sync_manager.h",
-    "core/test/model_type_store_test_util.h",
     "core/test/sync_manager_factory_for_profile_sync_test.h",
     "core/test/test_entry_factory.h",
     "core/test/test_internal_components_factory.h",
     "core_impl/test/fake_model_type_connector.cc",
     "core_impl/test/fake_model_type_processor.cc",
     "core_impl/test/fake_sync_manager.cc",
-    "core_impl/test/model_type_store_test_util.cc",
     "core_impl/test/sync_manager_factory_for_profile_sync_test.cc",
     "core_impl/test/sync_manager_for_profile_sync_test.cc",
     "core_impl/test/sync_manager_for_profile_sync_test.h",
@@ -691,6 +689,8 @@ static_library("test_support_sync_core_impl") {
     "core_impl/test/test_internal_components_factory.cc",
     "model/data_type_error_handler_mock.cc",
     "model/data_type_error_handler_mock.h",
+    "model/model_type_store_test_util.cc",
+    "model/model_type_store_test_util.h",
     "syncable/test_user_share.cc",
     "syncable/test_user_share.h",
   ]
@@ -803,10 +803,6 @@ source_set("unit_tests") {
     "base/system_encryptor_unittest.cc",
     "base/unique_position_unittest.cc",
     "base/weak_handle_unittest.cc",
-    "core/data_batch_impl_unittest.cc",
-    "core/model_type_store_backend_unittest.cc",
-    "core/model_type_store_impl_unittest.cc",
-    "core/simple_metadata_change_list_unittest.cc",
     "core_impl/debug_info_event_listener_unittest.cc",
     "core_impl/js_mutation_event_observer_unittest.cc",
     "core_impl/js_sync_encryption_handler_observer_unittest.cc",
@@ -871,12 +867,16 @@ source_set("unit_tests") {
     "model/attachments/attachment_unittest.cc",
     "model/entity_data_unittest.cc",
     "model/model_type_service_unittest.cc",
+    "model/mutable_data_batch_unittest.cc",
+    "model/simple_metadata_change_list_unittest.cc",
     "model/sync_change_unittest.cc",
     "model/sync_data_unittest.cc",
     "model/sync_error_unittest.cc",
     "model/sync_merge_result_unittest.cc",
     "model_impl/attachments/attachment_service_impl_unittest.cc",
     "model_impl/attachments/task_queue_unittest.cc",
+    "model_impl/model_type_store_backend_unittest.cc",
+    "model_impl/model_type_store_impl_unittest.cc",
     "model_impl/processor_entity_tracker_unittest.cc",
     "model_impl/shared_model_type_processor_unittest.cc",
     "protocol/proto_enum_conversions_unittest.cc",