Index: components/sync/BUILD.gn |
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn |
index 1274afa3ac116f48d65617c7114c1a7186c367cc..c6e3cb94e27be50f763fb9fd0aca9a7f6bd5131b 100644 |
--- a/components/sync/BUILD.gn |
+++ b/components/sync/BUILD.gn |
@@ -9,59 +9,6 @@ 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/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", |
- "api/local_change_observer.h", |
- "api/metadata_batch.cc", |
- "api/metadata_batch.h", |
- "api/metadata_change_list.h", |
- "api/model_type_change_processor.cc", |
- "api/model_type_change_processor.h", |
- "api/model_type_service.cc", |
- "api/model_type_service.h", |
- "api/model_type_store.cc", |
- "api/model_type_store.h", |
- "api/string_ordinal.h", |
- "api/sync_change.cc", |
- "api/sync_change.h", |
- "api/sync_change_processor.cc", |
- "api/sync_change_processor.h", |
- "api/sync_data.cc", |
- "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.h", |
"base/attachment_id_proto.cc", |
"base/attachment_id_proto.h", |
"base/bind_to_task_runner.h", |
@@ -469,6 +416,59 @@ static_library("sync") { |
"js/js_event_handler.h", |
"js/sync_js_controller.cc", |
"js/sync_js_controller.h", |
+ "model/attachments/attachment.cc", |
+ "model/attachments/attachment.h", |
+ "model/attachments/attachment_id.cc", |
+ "model/attachments/attachment_id.h", |
+ "model/attachments/attachment_metadata.cc", |
+ "model/attachments/attachment_metadata.h", |
+ "model/attachments/attachment_service.cc", |
+ "model/attachments/attachment_service.h", |
+ "model/attachments/attachment_service_proxy.cc", |
+ "model/attachments/attachment_service_proxy.h", |
+ "model/attachments/attachment_service_proxy_for_test.cc", |
+ "model/attachments/attachment_service_proxy_for_test.h", |
+ "model/attachments/attachment_store.cc", |
+ "model/attachments/attachment_store.h", |
+ "model/conflict_resolution.cc", |
+ "model/conflict_resolution.h", |
+ "model/data_batch.h", |
+ "model/data_type_error_handler.h", |
+ "model/data_type_error_handler_impl.cc", |
+ "model/data_type_error_handler_impl.h", |
+ "model/entity_change.cc", |
+ "model/entity_change.h", |
+ "model/entity_data.cc", |
+ "model/entity_data.h", |
+ "model/local_change_observer.h", |
+ "model/metadata_batch.cc", |
+ "model/metadata_batch.h", |
+ "model/metadata_change_list.h", |
+ "model/model_type_change_processor.cc", |
+ "model/model_type_change_processor.h", |
+ "model/model_type_service.cc", |
+ "model/model_type_service.h", |
+ "model/model_type_store.cc", |
+ "model/model_type_store.h", |
+ "model/string_ordinal.h", |
+ "model/sync_change.cc", |
+ "model/sync_change.h", |
+ "model/sync_change_processor.cc", |
+ "model/sync_change_processor.h", |
+ "model/sync_data.cc", |
+ "model/sync_data.h", |
+ "model/sync_error.cc", |
+ "model/sync_error.h", |
+ "model/sync_error_factory.cc", |
+ "model/sync_error_factory.h", |
+ "model/sync_merge_result.cc", |
+ "model/sync_merge_result.h", |
+ "model/syncable_service.cc", |
+ "model/syncable_service.h", |
+ "model/time.h", |
+ "model_impl/attachments/attachment_service_impl.cc", |
+ "model_impl/attachments/attachment_service_impl.h", |
+ "model_impl/attachments/task_queue.h", |
"protocol/proto_enum_conversions.cc", |
"protocol/proto_enum_conversions.h", |
"protocol/proto_value_conversions.cc", |
@@ -671,8 +671,6 @@ static_library("test_support_sync_core") { |
static_library("test_support_sync_core_impl") { |
testonly = true |
sources = [ |
- "api/data_type_error_handler_mock.cc", |
- "api/data_type_error_handler_mock.h", |
"core/test/fake_model_type_connector.h", |
"core/test/fake_model_type_processor.h", |
"core/test/fake_sync_manager.h", |
@@ -691,6 +689,8 @@ static_library("test_support_sync_core_impl") { |
"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", |
] |
public_deps = [ |
@@ -704,25 +704,25 @@ static_library("test_support_sync_core_impl") { |
configs += [ "//build/config/compiler:wexit_time_destructors" ] |
} |
-static_library("test_support_sync_api") { |
+static_library("test_support_sync_model") { |
testonly = true |
sources = [ |
- "api/fake_model_type_change_processor.cc", |
- "api/fake_model_type_change_processor.h", |
- "api/fake_model_type_service.cc", |
- "api/fake_model_type_service.h", |
- "api/fake_sync_change_processor.cc", |
- "api/fake_sync_change_processor.h", |
- "api/fake_syncable_service.cc", |
- "api/fake_syncable_service.h", |
- "api/mock_model_type_store.cc", |
- "api/mock_model_type_store.h", |
- "api/stub_model_type_service.cc", |
- "api/stub_model_type_service.h", |
- "api/sync_change_processor_wrapper_for_test.cc", |
- "api/sync_change_processor_wrapper_for_test.h", |
- "api/sync_error_factory_mock.cc", |
- "api/sync_error_factory_mock.h", |
+ "model/fake_model_type_change_processor.cc", |
+ "model/fake_model_type_change_processor.h", |
+ "model/fake_model_type_service.cc", |
+ "model/fake_model_type_service.h", |
+ "model/fake_sync_change_processor.cc", |
+ "model/fake_sync_change_processor.h", |
+ "model/fake_syncable_service.cc", |
+ "model/fake_syncable_service.h", |
+ "model/mock_model_type_store.cc", |
+ "model/mock_model_type_store.h", |
+ "model/stub_model_type_service.cc", |
+ "model/stub_model_type_service.h", |
+ "model/sync_change_processor_wrapper_for_test.cc", |
+ "model/sync_change_processor_wrapper_for_test.h", |
+ "model/sync_error_factory_mock.cc", |
+ "model/sync_error_factory_mock.h", |
] |
defines = [ "SYNC_TEST" ] |
@@ -784,18 +784,6 @@ static_library("test_support_sync_driver") { |
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", |
@@ -879,6 +867,18 @@ source_set("unit_tests") { |
"engine_impl/worker_entity_tracker_unittest.cc", |
"js/js_event_details_unittest.cc", |
"js/sync_js_controller_unittest.cc", |
+ "model/attachments/attachment_id_unittest.cc", |
+ "model/attachments/attachment_metadata_unittest.cc", |
+ "model/attachments/attachment_service_proxy_unittest.cc", |
+ "model/attachments/attachment_unittest.cc", |
+ "model/entity_data_unittest.cc", |
+ "model/model_type_service_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", |
"protocol/proto_enum_conversions_unittest.cc", |
"protocol/proto_value_conversions_unittest.cc", |
"syncable/directory_backing_store_unittest.cc", |
@@ -906,10 +906,10 @@ source_set("unit_tests") { |
] |
deps = [ |
- ":test_support_sync_api", |
":test_support_sync_core", |
":test_support_sync_core_impl", |
":test_support_sync_driver", |
+ ":test_support_sync_model", |
"//base", |
"//base/test:test_support", |
"//components/invalidation/impl", |