[Sync] Move some directory-related things from core/ to syncable/.

components/sync/BUILD.gn

Index: components/sync/BUILD.gn
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
index deae895bd5ef93ad404e962a619c0ded19e8a6ee..bb8ce35924a28ea4fea5a9561a7a1e72db120e89 100644
--- a/components/sync/BUILD.gn
+++ b/components/sync/BUILD.gn
@@ -78,12 +78,6 @@ static_library("sync") {
     "base/weak_handle.h",
     "core/activation_context.cc",
     "core/activation_context.h",
-    "core/base_node.cc",
-    "core/base_node.h",
-    "core/base_transaction.cc",
-    "core/base_transaction.h",
-    "core/change_record.cc",
-    "core/change_record.h",
     "core/configure_reason.h",
     "core/data_batch_impl.cc",
     "core/data_batch_impl.h",
@@ -91,8 +85,6 @@ static_library("sync") {
     "core/data_type_association_stats.h",
     "core/data_type_debug_info_listener.cc",
     "core/data_type_debug_info_listener.h",
-    "core/delete_journal.cc",
-    "core/delete_journal.h",
     "core/internal_components_factory.h",
     "core/internal_components_factory_impl.cc",
     "core/internal_components_factory_impl.h",
@@ -110,10 +102,6 @@ static_library("sync") {
     "core/non_blocking_sync_common.h",
     "core/processor_entity_tracker.cc",
     "core/processor_entity_tracker.h",
-    "core/read_node.cc",
-    "core/read_node.h",
-    "core/read_transaction.cc",
-    "core/read_transaction.h",
     "core/shared_model_type_processor.cc",
     "core/shared_model_type_processor.h",
     "core/shutdown_reason.h",
@@ -127,14 +115,6 @@ static_library("sync") {
     "core/sync_manager.h",
     "core/sync_manager_factory.cc",
     "core/sync_manager_factory.h",
-    "core/user_share.cc",
-    "core/user_share.h",
-    "core/write_node.cc",
-    "core/write_node.h",
-    "core/write_transaction.cc",
-    "core/write_transaction.h",
-    "core_impl/change_reorder_buffer.cc",
-    "core_impl/change_reorder_buffer.h",
     "core_impl/debug_info_event_listener.cc",
     "core_impl/debug_info_event_listener.h",
     "core_impl/js_mutation_event_observer.cc",
@@ -475,6 +455,16 @@ static_library("sync") {
     "protocol/proto_value_conversions.h",
     "protocol/sync_protocol_error.cc",
     "protocol/sync_protocol_error.h",
+    "syncable/base_node.cc",
+    "syncable/base_node.h",
+    "syncable/base_transaction.cc",
+    "syncable/base_transaction.h",
+    "syncable/change_record.cc",
+    "syncable/change_record.h",
+    "syncable/change_reorder_buffer.cc",
+    "syncable/change_reorder_buffer.h",
+    "syncable/delete_journal.cc",
+    "syncable/delete_journal.h",
     "syncable/dir_open_result.h",
     "syncable/directory.cc",
     "syncable/directory.h",
@@ -503,6 +493,10 @@ static_library("sync") {
     "syncable/on_disk_directory_backing_store.h",
     "syncable/parent_child_index.cc",
     "syncable/parent_child_index.h",
+    "syncable/read_node.cc",
+    "syncable/read_node.h",
+    "syncable/read_transaction.cc",
+    "syncable/read_transaction.h",
     "syncable/scoped_kernel_lock.cc",
     "syncable/scoped_kernel_lock.h",
     "syncable/scoped_parent_child_index_updater.cc",
@@ -530,6 +524,12 @@ static_library("sync") {
     "syncable/syncable_write_transaction.cc",
     "syncable/syncable_write_transaction.h",
     "syncable/transaction_observer.h",
+    "syncable/user_share.cc",
+    "syncable/user_share.h",
+    "syncable/write_node.cc",
+    "syncable/write_node.h",
+    "syncable/write_transaction.cc",
+    "syncable/write_transaction.h",
     "syncable/write_transaction_info.cc",
     "syncable/write_transaction_info.h",
   ]
@@ -678,7 +678,6 @@ static_library("test_support_sync_core_impl") {
     "core/test/sync_manager_factory_for_profile_sync_test.h",
     "core/test/test_entry_factory.h",
     "core/test/test_internal_components_factory.h",
-    "core/test/test_user_share.h",
     "core_impl/test/fake_model_type_connector.cc",
     "core_impl/test/fake_model_type_processor.cc",
     "core_impl/test/fake_sync_manager.cc",
@@ -688,9 +687,10 @@ static_library("test_support_sync_core_impl") {
     "core_impl/test/sync_manager_for_profile_sync_test.h",
     "core_impl/test/test_entry_factory.cc",
     "core_impl/test/test_internal_components_factory.cc",
-    "core_impl/test/test_user_share.cc",
     "model/data_type_error_handler_mock.cc",
     "model/data_type_error_handler_mock.h",
+    "syncable/test_user_share.cc",
+    "syncable/test_user_share.h",
   ]
 
   public_deps = [
@@ -801,7 +801,6 @@ source_set("unit_tests") {
     "base/system_encryptor_unittest.cc",
     "base/unique_position_unittest.cc",
     "base/weak_handle_unittest.cc",
-    "core/change_record_unittest.cc",
     "core/data_batch_impl_unittest.cc",
     "core/model_type_store_backend_unittest.cc",
     "core/model_type_store_impl_unittest.cc",
@@ -881,6 +880,7 @@ source_set("unit_tests") {
     "model_impl/attachments/task_queue_unittest.cc",
     "protocol/proto_enum_conversions_unittest.cc",
     "protocol/proto_value_conversions_unittest.cc",
+    "syncable/change_record_unittest.cc",
     "syncable/directory_backing_store_unittest.cc",
     "syncable/directory_unittest.cc",
     "syncable/directory_unittest.h",