Chromium Code Reviews| Index: components/sync/BUILD.gn |
| diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn |
| index b2e5f60e0fa4bc71e8d5a401e11ceac9dc7d4bff..c1a7b59d5008dccb00d49c946264d2861b93bc9e 100644 |
| --- a/components/sync/BUILD.gn |
| +++ b/components/sync/BUILD.gn |
| @@ -15,10 +15,14 @@ static_library("sync") { |
| "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", |
| @@ -55,6 +59,10 @@ static_library("sync") { |
| "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
|
| + "api_impl/attachments/task_queue.h", |
| "base/attachment_id_proto.cc", |
| "base/attachment_id_proto.h", |
| "base/bind_to_task_runner.h", |
| @@ -124,20 +132,6 @@ static_library("sync") { |
| "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", |
| @@ -200,21 +194,6 @@ static_library("sync") { |
| "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", |
| @@ -334,6 +313,24 @@ static_library("sync") { |
| "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", |
| @@ -380,6 +377,10 @@ static_library("sync") { |
| "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", |
| @@ -537,7 +538,7 @@ static_library("sync") { |
| 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
maxbogue
2016/10/07 19:21:50
It's a proto only used for persisting to disk. It'
skym
2016/10/07 20:43:22
Why is it in public_deps then?
|
| "//components/sync/protocol", |
| ] |
| deps = [ |
| @@ -786,6 +787,7 @@ source_set("unit_tests") { |
| 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", |
| @@ -793,6 +795,8 @@ source_set("unit_tests") { |
| "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", |
| @@ -818,17 +822,6 @@ source_set("unit_tests") { |
| "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", |
| @@ -861,9 +854,17 @@ source_set("unit_tests") { |
| "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", |