[Sync] Move attachments code out of core/.

components/sync/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//components/sync/protocol/protocol_sources.gni")
 import("//testing/test.gni")
 
 static_library("sync") {
   sources = [
     "api/attachments/attachment.cc",
     "api/attachments/attachment.h",
     "api/attachments/attachment_id.cc",
     "api/attachments/attachment_id.h",
     "api/attachments/attachment_metadata.cc",
     "api/attachments/attachment_metadata.h",
+    "api/attachments/attachment_service.cc",
+    "api/attachments/attachment_service.h",
+    "api/attachments/attachment_service_proxy.cc",
+    "api/attachments/attachment_service_proxy.h",
+    "api/attachments/attachment_service_proxy_for_test.cc",
+    "api/attachments/attachment_service_proxy_for_test.h",
     "api/attachments/attachment_store.cc",
     "api/attachments/attachment_store.h",
-    "api/attachments/attachment_store_backend.cc",
-    "api/attachments/attachment_store_backend.h",
     "api/conflict_resolution.cc",
     "api/conflict_resolution.h",
     "api/data_batch.h",
     "api/data_type_error_handler.h",
     "api/data_type_error_handler_impl.cc",
     "api/data_type_error_handler_impl.h",
     "api/entity_change.cc",
     "api/entity_change.h",
     "api/entity_data.cc",
     "api/entity_data.h",
@@ skipping 16 matching lines @@
     "api/sync_data.h",
     "api/sync_error.cc",
     "api/sync_error.h",
     "api/sync_error_factory.cc",
     "api/sync_error_factory.h",
     "api/sync_merge_result.cc",
     "api/sync_merge_result.h",
     "api/syncable_service.cc",
     "api/syncable_service.h",
     "api/time.h",
+    "api_impl/attachments/attachment_service_impl.cc",
+    "api_impl/attachments/attachment_service_impl.h",
+    "api_impl/attachments/task_queue.cc",

[skym, 2016/10/07 18:22:16]

I'm still skeptical this is needed.

[maxbogue, 2016/10/07 19:21:50]

Damn it you're right, it worked this time. Maybe I hadn't actually saved the
BUILD.gn change or something last time -_-

+    "api_impl/attachments/task_queue.h",
     "base/attachment_id_proto.cc",
     "base/attachment_id_proto.h",
     "base/bind_to_task_runner.h",
     "base/cancelation_observer.cc",
     "base/cancelation_observer.h",
     "base/cancelation_signal.cc",
     "base/cancelation_signal.h",
     "base/cryptographer.cc",
     "base/cryptographer.h",
     "base/data_type_histogram.cc",
@@ skipping 49 matching lines @@
     "base/time.h",
     "base/unique_position.cc",
     "base/unique_position.h",
     "base/unrecoverable_error_handler.h",
     "base/unrecoverable_error_info.cc",
     "base/unrecoverable_error_info.h",
     "base/weak_handle.cc",
     "base/weak_handle.h",
     "core/activation_context.cc",
     "core/activation_context.h",
-    "core/attachments/attachment_downloader.h",
-    "core/attachments/attachment_downloader_impl.h",
-    "core/attachments/attachment_service.h",
-    "core/attachments/attachment_service_impl.h",
-    "core/attachments/attachment_service_proxy.h",
-    "core/attachments/attachment_service_proxy_for_test.h",
-    "core/attachments/attachment_store_frontend.h",
-    "core/attachments/attachment_uploader.h",
-    "core/attachments/attachment_uploader_impl.h",
-    "core/attachments/attachment_util.h",
-    "core/attachments/fake_attachment_downloader.h",
-    "core/attachments/fake_attachment_uploader.h",
-    "core/attachments/in_memory_attachment_store.h",
-    "core/attachments/on_disk_attachment_store.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",
     "core/data_type_association_stats.cc",
@@ skipping 42 matching lines @@
     "core/sync_manager.cc",
     "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/attachments/attachment_downloader.cc",
-    "core_impl/attachments/attachment_downloader_impl.cc",
-    "core_impl/attachments/attachment_service.cc",
-    "core_impl/attachments/attachment_service_impl.cc",
-    "core_impl/attachments/attachment_service_proxy.cc",
-    "core_impl/attachments/attachment_service_proxy_for_test.cc",
-    "core_impl/attachments/attachment_store_frontend.cc",
-    "core_impl/attachments/attachment_uploader.cc",
-    "core_impl/attachments/attachment_uploader_impl.cc",
-    "core_impl/attachments/attachment_util.cc",
-    "core_impl/attachments/fake_attachment_downloader.cc",
-    "core_impl/attachments/fake_attachment_uploader.cc",
-    "core_impl/attachments/in_memory_attachment_store.cc",
-    "core_impl/attachments/on_disk_attachment_store.cc",
-    "core_impl/attachments/task_queue.cc",
     "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",
     "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",
@@ skipping 99 matching lines @@
     "driver/sync_service_utils.cc",
     "driver/sync_service_utils.h",
     "driver/sync_stopped_reporter.cc",
     "driver/sync_stopped_reporter.h",
     "driver/sync_type_preference_provider.h",
     "driver/sync_util.cc",
     "driver/sync_util.h",
     "driver/ui_data_type_controller.cc",
     "driver/ui_data_type_controller.h",
     "driver/user_selectable_sync_type.h",
+    "engine/attachments/attachment_downloader.cc",
+    "engine/attachments/attachment_downloader.h",
+    "engine/attachments/attachment_store_backend.cc",
+    "engine/attachments/attachment_store_backend.h",
+    "engine/attachments/attachment_store_frontend.cc",
+    "engine/attachments/attachment_store_frontend.h",
+    "engine/attachments/attachment_uploader.cc",
+    "engine/attachments/attachment_uploader.h",
+    "engine/attachments/attachment_util.cc",
+    "engine/attachments/attachment_util.h",
+    "engine/attachments/fake_attachment_downloader.cc",
+    "engine/attachments/fake_attachment_downloader.h",
+    "engine/attachments/fake_attachment_uploader.cc",
+    "engine/attachments/fake_attachment_uploader.h",
+    "engine/attachments/in_memory_attachment_store.cc",
+    "engine/attachments/in_memory_attachment_store.h",
+    "engine/attachments/on_disk_attachment_store.cc",
+    "engine/attachments/on_disk_attachment_store.h",
     "engine/commit_queue.cc",
     "engine/commit_queue.h",
     "engine/cycle/commit_counters.cc",
     "engine/cycle/commit_counters.h",
     "engine/cycle/model_neutral_state.cc",
     "engine/cycle/model_neutral_state.h",
     "engine/cycle/status_counters.cc",
     "engine/cycle/status_counters.h",
     "engine/cycle/sync_cycle_snapshot.cc",
     "engine/cycle/sync_cycle_snapshot.h",
@@ skipping 26 matching lines @@
     "engine/polling_constants.cc",
     "engine/polling_constants.h",
     "engine/sync_status.cc",
     "engine/sync_status.h",
     "engine/sync_string_conversions.cc",
     "engine/sync_string_conversions.h",
     "engine_impl/all_status.cc",
     "engine_impl/all_status.h",
     "engine_impl/apply_control_data_updates.cc",
     "engine_impl/apply_control_data_updates.h",
+    "engine_impl/attachments/attachment_downloader_impl.cc",
+    "engine_impl/attachments/attachment_downloader_impl.h",
+    "engine_impl/attachments/attachment_uploader_impl.cc",
+    "engine_impl/attachments/attachment_uploader_impl.h",
     "engine_impl/backoff_delay_provider.cc",
     "engine_impl/backoff_delay_provider.h",
     "engine_impl/clear_server_data.cc",
     "engine_impl/clear_server_data.h",
     "engine_impl/commit.cc",
     "engine_impl/commit.h",
     "engine_impl/commit_contribution.cc",
     "engine_impl/commit_contribution.h",
     "engine_impl/commit_contributor.cc",
     "engine_impl/commit_contributor.h",
@@ skipping 137 matching lines @@
     "syncable/syncable_write_transaction.cc",
     "syncable/syncable_write_transaction.h",
     "syncable/transaction_observer.h",
     "syncable/write_transaction_info.cc",
     "syncable/write_transaction_info.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
 
   public_deps = [
-    "//components/sync/core_impl/attachments/proto",
+    "//components/sync/engine_impl/attachments/proto",

[skym, 2016/10/07 18:22:16]

...Shouldn't the proto get moved out of an *_impl area?

[maxbogue, 2016/10/07 19:21:50]

It's a proto only used for persisting to disk. It's not part of any interfaces.

[skym, 2016/10/07 20:43:22]

Why is it in public_deps then?

     "//components/sync/protocol",
   ]
   deps = [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//components/data_use_measurement/core",
     "//components/invalidation/public",
     "//components/metrics",
     "//components/os_crypt",
@@ skipping 228 matching lines @@
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 source_set("unit_tests") {
   testonly = true
   sources = [
     "api/attachments/attachment_id_unittest.cc",
     "api/attachments/attachment_metadata_unittest.cc",
+    "api/attachments/attachment_service_proxy_unittest.cc",
     "api/attachments/attachment_unittest.cc",
     "api/entity_data_unittest.cc",
     "api/model_type_service_unittest.cc",
     "api/sync_change_unittest.cc",
     "api/sync_data_unittest.cc",
     "api/sync_error_unittest.cc",
     "api/sync_merge_result_unittest.cc",
+    "api_impl/attachments/attachment_service_impl_unittest.cc",
+    "api_impl/attachments/task_queue_unittest.cc",
     "base/attachment_id_proto_unittest.cc",
     "base/bind_to_task_runner_unittest.cc",
     "base/cancelation_signal_unittest.cc",
     "base/cryptographer_unittest.cc",
     "base/data_type_histogram_unittest.cc",
     "base/enum_set_unittest.cc",
     "base/get_session_name_unittest.cc",
     "base/immutable_unittest.cc",
     "base/nigori_unittest.cc",
     "base/node_ordinal_unittest.cc",
     "base/ordinal_unittest.cc",
     "base/proto_value_ptr_unittest.cc",
     "base/protobuf_unittest.cc",
     "base/sync_prefs_unittest.cc",
     "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/http_bridge_unittest.cc",
     "core/model_type_store_backend_unittest.cc",
     "core/model_type_store_impl_unittest.cc",
     "core/processor_entity_tracker_unittest.cc",
     "core/shared_model_type_processor_unittest.cc",
     "core/simple_metadata_change_list_unittest.cc",
-    "core_impl/attachments/attachment_downloader_impl_unittest.cc",
-    "core_impl/attachments/attachment_service_impl_unittest.cc",
-    "core_impl/attachments/attachment_service_proxy_unittest.cc",
-    "core_impl/attachments/attachment_store_frontend_unittest.cc",
-    "core_impl/attachments/attachment_store_test_template.h",
-    "core_impl/attachments/attachment_uploader_impl_unittest.cc",
-    "core_impl/attachments/fake_attachment_downloader_unittest.cc",
-    "core_impl/attachments/fake_attachment_uploader_unittest.cc",
-    "core_impl/attachments/in_memory_attachment_store_unittest.cc",
-    "core_impl/attachments/on_disk_attachment_store_unittest.cc",
-    "core_impl/attachments/task_queue_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/model_type_connector_proxy_unittest.cc",
     "core_impl/protocol_event_buffer_unittest.cc",
     "core_impl/sync_encryption_handler_impl_unittest.cc",
     "core_impl/sync_manager_impl_unittest.cc",
     "core_impl/syncapi_server_connection_manager_unittest.cc",
     "device_info/device_count_metrics_provider_unittest.cc",
@@ skipping 12 matching lines @@
     "driver/glue/sync_backend_registrar_unittest.cc",
     "driver/glue/ui_model_worker_unittest.cc",
     "driver/model_association_manager_unittest.cc",
     "driver/model_type_controller_unittest.cc",
     "driver/non_ui_data_type_controller_unittest.cc",
     "driver/shared_change_processor_unittest.cc",
     "driver/startup_controller_unittest.cc",
     "driver/sync_stopped_reporter_unittest.cc",
     "driver/sync_util_unittest.cc",
     "driver/ui_data_type_controller_unittest.cc",
+    "engine/attachments/attachment_store_frontend_unittest.cc",
+    "engine/attachments/attachment_store_test_template.h",
+    "engine/attachments/fake_attachment_downloader_unittest.cc",
+    "engine/attachments/fake_attachment_uploader_unittest.cc",
+    "engine/attachments/in_memory_attachment_store_unittest.cc",
+    "engine/attachments/on_disk_attachment_store_unittest.cc",
     "engine/cycle/sync_cycle_snapshot_unittest.cc",
     "engine/model_safe_worker_unittest.cc",
     "engine_impl/apply_control_data_updates_unittest.cc",
+    "engine_impl/attachments/attachment_downloader_impl_unittest.cc",
+    "engine_impl/attachments/attachment_uploader_impl_unittest.cc",
     "engine_impl/backoff_delay_provider_unittest.cc",
     "engine_impl/cycle/nudge_tracker_unittest.cc",
     "engine_impl/cycle/status_controller_unittest.cc",
     "engine_impl/directory_commit_contribution_unittest.cc",
     "engine_impl/directory_update_handler_unittest.cc",
     "engine_impl/get_updates_processor_unittest.cc",
     "engine_impl/model_type_registry_unittest.cc",
     "engine_impl/model_type_worker_unittest.cc",
     "engine_impl/sync_scheduler_impl_unittest.cc",
     "engine_impl/syncer_proto_util_unittest.cc",
@@ skipping 213 matching lines @@
     deps = [
       ":fake_server_jni",
       ":sync",
       ":test_support_sync_fake_server",
       "//base",
       "//testing/gtest",
       "//url:url",
     ]
   }
 }