[Sync] Move the last things out of core/.

components/sync/BUILD.gn

Index: components/sync/BUILD.gn
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
index 58c0eeff777cd843e633b91329845962d0ae1e20..fbcf49494dd8185020fa3062fd979b772ab20d3d 100644
--- a/components/sync/BUILD.gn
+++ b/components/sync/BUILD.gn
@@ -60,7 +60,6 @@ static_library("sync") {
     "base/report_unrecoverable_error.cc",
     "base/report_unrecoverable_error.h",
     "base/stop_source.h",
-    "base/sync_db_util.h",
     "base/sync_prefs.cc",
     "base/sync_prefs.h",
     "base/syncer_error.cc",
@@ -76,51 +75,6 @@ static_library("sync") {
     "base/unrecoverable_error_info.h",
     "base/weak_handle.cc",
     "base/weak_handle.h",
-    "core/activation_context.cc",
-    "core/activation_context.h",
-    "core/configure_reason.h",
-    "core/data_type_association_stats.cc",
-    "core/data_type_association_stats.h",
-    "core/data_type_debug_info_listener.cc",
-    "core/data_type_debug_info_listener.h",
-    "core/internal_components_factory.h",
-    "core/internal_components_factory_impl.cc",
-    "core/internal_components_factory_impl.h",
-    "core/model_type_connector.cc",
-    "core/model_type_connector.h",
-    "core/model_type_processor.cc",
-    "core/model_type_processor.h",
-    "core/model_type_processor_proxy.cc",
-    "core/model_type_processor_proxy.h",
-    "core/non_blocking_sync_common.cc",
-    "core/non_blocking_sync_common.h",
-    "core/shutdown_reason.h",
-    "core/sync_auth_provider.h",
-    "core/sync_db_util.cc",
-    "core/sync_encryption_handler.cc",
-    "core/sync_encryption_handler.h",
-    "core/sync_manager.cc",
-    "core/sync_manager.h",
-    "core/sync_manager_factory.cc",
-    "core/sync_manager_factory.h",
-    "core_impl/debug_info_event_listener.cc",
-    "core_impl/debug_info_event_listener.h",
-    "core_impl/js_mutation_event_observer.cc",
-    "core_impl/js_mutation_event_observer.h",
-    "core_impl/js_sync_encryption_handler_observer.cc",
-    "core_impl/js_sync_encryption_handler_observer.h",
-    "core_impl/js_sync_manager_observer.cc",
-    "core_impl/js_sync_manager_observer.h",
-    "core_impl/model_type_connector_proxy.cc",
-    "core_impl/model_type_connector_proxy.h",
-    "core_impl/protocol_event_buffer.cc",
-    "core_impl/protocol_event_buffer.h",
-    "core_impl/sync_encryption_handler_impl.cc",
-    "core_impl/sync_encryption_handler_impl.h",
-    "core_impl/sync_manager_impl.cc",
-    "core_impl/sync_manager_impl.h",
-    "core_impl/syncapi_internal.cc",
-    "core_impl/syncapi_internal.h",
     "device_info/device_count_metrics_provider.cc",
     "device_info/device_count_metrics_provider.h",
     "device_info/device_info.cc",
@@ -218,6 +172,8 @@ static_library("sync") {
     "driver/ui_data_type_controller.cc",
     "driver/ui_data_type_controller.h",
     "driver/user_selectable_sync_type.h",
+    "engine/activation_context.cc",
+    "engine/activation_context.h",
     "engine/attachments/attachment_downloader.cc",
     "engine/attachments/attachment_downloader.h",
     "engine/attachments/attachment_store_backend.cc",
@@ -238,6 +194,7 @@ static_library("sync") {
     "engine/attachments/on_disk_attachment_store.h",
     "engine/commit_queue.cc",
     "engine/commit_queue.h",
+    "engine/configure_reason.h",
     "engine/cycle/commit_counters.cc",
     "engine/cycle/commit_counters.h",
     "engine/cycle/model_neutral_state.cc",
@@ -250,6 +207,15 @@ static_library("sync") {
     "engine/cycle/type_debug_info_observer.h",
     "engine/cycle/update_counters.cc",
     "engine/cycle/update_counters.h",
+    "engine/data_type_association_stats.cc",
+    "engine/data_type_association_stats.h",
+    "engine/data_type_debug_info_listener.cc",
+    "engine/data_type_debug_info_listener.h",
+    "engine/engine_components_factory.h",
+    "engine/engine_components_factory_impl.cc",
+    "engine/engine_components_factory_impl.h",
+    "engine/engine_util.cc",
+    "engine/engine_util.h",
     "engine/events/clear_server_data_request_event.cc",
     "engine/events/clear_server_data_request_event.h",
     "engine/events/clear_server_data_response_event.cc",
@@ -270,6 +236,12 @@ static_library("sync") {
     "engine/events/protocol_event.h",
     "engine/model_safe_worker.cc",
     "engine/model_safe_worker.h",
+    "engine/model_type_connector.cc",
+    "engine/model_type_connector.h",
+    "engine/model_type_processor.cc",
+    "engine/model_type_processor.h",
+    "engine/model_type_processor_proxy.cc",
+    "engine/model_type_processor_proxy.h",
     "engine/net/http_bridge.cc",
     "engine/net/http_bridge.h",
     "engine/net/http_bridge_network_resources.cc",
@@ -277,10 +249,20 @@ static_library("sync") {
     "engine/net/http_post_provider_factory.h",
     "engine/net/http_post_provider_interface.h",
     "engine/net/network_resources.h",
+    "engine/non_blocking_sync_common.cc",
+    "engine/non_blocking_sync_common.h",
     "engine/passive_model_worker.cc",
     "engine/passive_model_worker.h",
     "engine/polling_constants.cc",
     "engine/polling_constants.h",
+    "engine/shutdown_reason.h",
+    "engine/sync_auth_provider.h",
+    "engine/sync_encryption_handler.cc",
+    "engine/sync_encryption_handler.h",
+    "engine/sync_manager.cc",
+    "engine/sync_manager.h",
+    "engine/sync_manager_factory.cc",
+    "engine/sync_manager_factory.h",
     "engine/sync_status.cc",
     "engine/sync_status.h",
     "engine/sync_string_conversions.cc",
@@ -324,18 +306,30 @@ static_library("sync") {
     "engine_impl/cycle/sync_cycle.h",
     "engine_impl/cycle/sync_cycle_context.cc",
     "engine_impl/cycle/sync_cycle_context.h",
+    "engine_impl/debug_info_event_listener.cc",
+    "engine_impl/debug_info_event_listener.h",
     "engine_impl/directory_commit_contribution.cc",
     "engine_impl/directory_commit_contribution.h",
     "engine_impl/directory_commit_contributor.cc",
     "engine_impl/directory_commit_contributor.h",
     "engine_impl/directory_update_handler.cc",
     "engine_impl/directory_update_handler.h",
+    "engine_impl/events/protocol_event_buffer.cc",
+    "engine_impl/events/protocol_event_buffer.h",
     "engine_impl/get_commit_ids.cc",
     "engine_impl/get_commit_ids.h",
     "engine_impl/get_updates_delegate.cc",
     "engine_impl/get_updates_delegate.h",
     "engine_impl/get_updates_processor.cc",
     "engine_impl/get_updates_processor.h",
+    "engine_impl/js_mutation_event_observer.cc",
+    "engine_impl/js_mutation_event_observer.h",
+    "engine_impl/js_sync_encryption_handler_observer.cc",
+    "engine_impl/js_sync_encryption_handler_observer.h",
+    "engine_impl/js_sync_manager_observer.cc",
+    "engine_impl/js_sync_manager_observer.h",
+    "engine_impl/model_type_connector_proxy.cc",
+    "engine_impl/model_type_connector_proxy.h",
     "engine_impl/model_type_registry.cc",
     "engine_impl/model_type_registry.h",
     "engine_impl/model_type_worker.cc",
@@ -356,8 +350,12 @@ static_library("sync") {
     "engine_impl/process_updates_util.h",
     "engine_impl/sync_cycle_event.cc",
     "engine_impl/sync_cycle_event.h",
+    "engine_impl/sync_encryption_handler_impl.cc",
+    "engine_impl/sync_encryption_handler_impl.h",
     "engine_impl/sync_engine_event_listener.cc",
     "engine_impl/sync_engine_event_listener.h",
+    "engine_impl/sync_manager_impl.cc",
+    "engine_impl/sync_manager_impl.h",
     "engine_impl/sync_scheduler.cc",
     "engine_impl/sync_scheduler.h",
     "engine_impl/sync_scheduler_impl.cc",
@@ -503,6 +501,8 @@ static_library("sync") {
     "syncable/scoped_kernel_lock.h",
     "syncable/scoped_parent_child_index_updater.cc",
     "syncable/scoped_parent_child_index_updater.h",
+    "syncable/sync_db_util.cc",
+    "syncable/sync_db_util.h",
     "syncable/syncable_base_transaction.cc",
     "syncable/syncable_base_transaction.h",
     "syncable/syncable_base_write_transaction.cc",
@@ -600,6 +600,7 @@ static_library("sync") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
+# TODO(maxbogue): Refactor the test support targets to remove core references.
 static_library("test_support_sync_core") {
   testonly = true
   sources = [
@@ -670,23 +671,24 @@ static_library("test_support_sync_core") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
 
+# TODO(maxbogue): Refactor the test support targets to remove core references.
 static_library("test_support_sync_core_impl") {
   testonly = true
   sources = [
-    "core/test/fake_model_type_connector.h",
-    "core/test/fake_model_type_processor.h",
-    "core/test/fake_sync_manager.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/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",
-    "core_impl/test/test_entry_factory.cc",
-    "core_impl/test/test_internal_components_factory.cc",
+    "engine/fake_model_type_connector.cc",
+    "engine/fake_model_type_connector.h",
+    "engine/fake_model_type_processor.cc",
+    "engine/fake_model_type_processor.h",
+    "engine/fake_sync_manager.cc",
+    "engine/fake_sync_manager.h",
+    "engine/sync_manager_factory_for_profile_sync_test.cc",
+    "engine/sync_manager_factory_for_profile_sync_test.h",
+    "engine/test_engine_components_factory.cc",
+    "engine/test_engine_components_factory.h",
+    "engine_impl/sync_manager_for_profile_sync_test.cc",
+    "engine_impl/sync_manager_for_profile_sync_test.h",
+    "engine_impl/test_entry_factory.cc",
+    "engine_impl/test_entry_factory.h",
     "model/data_type_error_handler_mock.cc",
     "model/data_type_error_handler_mock.h",
     "model/model_type_store_test_util.cc",
@@ -803,13 +805,6 @@ source_set("unit_tests") {
     "base/system_encryptor_unittest.cc",
     "base/unique_position_unittest.cc",
     "base/weak_handle_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",
-    "core_impl/js_sync_manager_observer_unittest.cc",
-    "core_impl/protocol_event_buffer_unittest.cc",
-    "core_impl/sync_encryption_handler_impl_unittest.cc",
-    "core_impl/sync_manager_impl_unittest.cc",
     "device_info/device_count_metrics_provider_unittest.cc",
     "device_info/device_info_data_type_controller_unittest.cc",
     "device_info/device_info_service_unittest.cc",
@@ -848,12 +843,19 @@ source_set("unit_tests") {
     "engine_impl/backoff_delay_provider_unittest.cc",
     "engine_impl/cycle/nudge_tracker_unittest.cc",
     "engine_impl/cycle/status_controller_unittest.cc",
+    "engine_impl/debug_info_event_listener_unittest.cc",
     "engine_impl/directory_commit_contribution_unittest.cc",
     "engine_impl/directory_update_handler_unittest.cc",
+    "engine_impl/events/protocol_event_buffer_unittest.cc",
     "engine_impl/get_updates_processor_unittest.cc",
+    "engine_impl/js_mutation_event_observer_unittest.cc",
+    "engine_impl/js_sync_encryption_handler_observer_unittest.cc",
+    "engine_impl/js_sync_manager_observer_unittest.cc",
     "engine_impl/model_type_registry_unittest.cc",
     "engine_impl/model_type_worker_unittest.cc",
     "engine_impl/net/sync_server_connection_manager_unittest.cc",
+    "engine_impl/sync_encryption_handler_impl_unittest.cc",
+    "engine_impl/sync_manager_impl_unittest.cc",
     "engine_impl/sync_scheduler_impl_unittest.cc",
     "engine_impl/syncer_proto_util_unittest.cc",
     "engine_impl/syncer_unittest.cc",