Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/components_tests.gyp

Issue 2186733002: [Sync] Merge sync_unit_tests into components_unit_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc
Patch Set: Remove from chromium.memory.full.json Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/BUILD.gn ('k') | components/sync/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index c9db7f5b30503b0608645d61beb8cef9a7f92a36..419e512cedfe191e0c27faaaa2209c93029003bd 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -831,6 +831,90 @@
'supervised_user_error_page_unittest_sources': [
'supervised_user_error_page/supervised_user_error_page_unittest.cc',
],
+ 'sync_unittest_sources': [
+ 'sync/api/attachments/attachment_id_unittest.cc',
+ 'sync/api/attachments/attachment_metadata_unittest.cc',
+ 'sync/api/attachments/attachment_unittest.cc',
+ 'sync/api/entity_data_unittest.cc',
+ 'sync/api/model_type_service_unittest.cc',
+ 'sync/api/sync_change_unittest.cc',
+ 'sync/api/sync_data_unittest.cc',
+ 'sync/api/sync_error_unittest.cc',
+ 'sync/api/sync_merge_result_unittest.cc',
+ 'sync/engine_impl/apply_control_data_updates_unittest.cc',
+ 'sync/engine_impl/backoff_delay_provider_unittest.cc',
+ 'sync/engine_impl/directory_commit_contribution_unittest.cc',
+ 'sync/engine_impl/directory_update_handler_unittest.cc',
+ 'sync/engine_impl/get_updates_processor_unittest.cc',
+ 'sync/engine_impl/model_type_worker_unittest.cc',
+ 'sync/engine_impl/sync_scheduler_unittest.cc',
+ 'sync/engine_impl/syncer_proto_util_unittest.cc',
+ 'sync/engine_impl/syncer_unittest.cc',
+ 'sync/engine_impl/syncer_util_unittest.cc',
+ 'sync/engine_impl/worker_entity_tracker_unittest.cc',
+ 'sync/core_impl/attachments/attachment_downloader_impl_unittest.cc',
+ 'sync/core_impl/attachments/attachment_service_impl_unittest.cc',
+ 'sync/core_impl/attachments/attachment_service_proxy_unittest.cc',
+ 'sync/core_impl/attachments/attachment_store_frontend_unittest.cc',
+ 'sync/core_impl/attachments/attachment_store_test_template.h',
+ 'sync/core_impl/attachments/attachment_uploader_impl_unittest.cc',
+ 'sync/core_impl/attachments/fake_attachment_downloader_unittest.cc',
+ 'sync/core_impl/attachments/fake_attachment_uploader_unittest.cc',
+ 'sync/core_impl/attachments/in_memory_attachment_store_unittest.cc',
+ 'sync/core_impl/attachments/on_disk_attachment_store_unittest.cc',
+ 'sync/core_impl/attachments/task_queue_unittest.cc',
+ 'sync/core_impl/debug_info_event_listener_unittest.cc',
+ 'sync/core/http_bridge_unittest.cc',
+ 'sync/core_impl/js_mutation_event_observer_unittest.cc',
+ 'sync/core_impl/js_sync_encryption_handler_observer_unittest.cc',
+ 'sync/core_impl/js_sync_manager_observer_unittest.cc',
+ 'sync/core_impl/model_type_connector_proxy_unittest.cc',
+ 'sync/core/model_type_store_backend_unittest.cc',
+ 'sync/core/model_type_store_impl_unittest.cc',
+ 'sync/core/processor_entity_tracker_unittest.cc',
+ 'sync/core_impl/protocol_event_buffer_unittest.cc',
+ 'sync/base/attachment_id_proto_unittest.cc',
+ 'sync/base/cancelation_signal_unittest.cc',
+ 'sync/base/enum_set_unittest.cc',
+ 'sync/base/node_ordinal_unittest.cc',
+ 'sync/base/ordinal_unittest.cc',
+ 'sync/base/unique_position_unittest.cc',
+ 'sync/core/change_record_unittest.cc',
+ 'sync/core/data_batch_impl_unittest.cc',
+ 'sync/engine/model_safe_worker_unittest.cc',
+ 'sync/sessions/sync_session_snapshot_unittest.cc',
+ 'sync/core/simple_metadata_change_list_unittest.cc',
+ 'sync/base/immutable_unittest.cc',
+ 'sync/base/proto_value_ptr_unittest.cc',
+ 'sync/base/weak_handle_unittest.cc',
+ 'sync/core/shared_model_type_processor_unittest.cc',
+ 'sync/core_impl/sync_encryption_handler_impl_unittest.cc',
+ 'sync/core_impl/sync_manager_impl_unittest.cc',
+ 'sync/core_impl/syncapi_server_connection_manager_unittest.cc',
+ 'sync/js/js_event_details_unittest.cc',
+ 'sync/js/sync_js_controller_unittest.cc',
+ 'sync/protocol/proto_enum_conversions_unittest.cc',
+ 'sync/protocol/proto_value_conversions_unittest.cc',
+ 'sync/sessions_impl/model_type_registry_unittest.cc',
+ 'sync/sessions_impl/nudge_tracker_unittest.cc',
+ 'sync/sessions_impl/status_controller_unittest.cc',
+ 'sync/syncable/directory_backing_store_unittest.cc',
+ 'sync/syncable/directory_unittest.cc',
+ 'sync/syncable/directory_unittest.h',
+ 'sync/syncable/entry_kernel_unittest.cc',
+ 'sync/syncable/model_type_unittest.cc',
+ 'sync/syncable/nigori_util_unittest.cc',
+ 'sync/syncable/parent_child_index_unittest.cc',
+ 'sync/syncable/syncable_enum_conversions_unittest.cc',
+ 'sync/syncable/syncable_id_unittest.cc',
+ 'sync/syncable/syncable_unittest.cc',
+ 'sync/syncable/syncable_util_unittest.cc',
+ 'sync/base/cryptographer_unittest.cc',
+ 'sync/base/data_type_histogram_unittest.cc',
+ 'sync/base/get_session_name_unittest.cc',
+ 'sync/base/nigori_unittest.cc',
+ 'sync/base/protobuf_unittest.cc',
+ ],
'sync_bookmarks_unittest_sources': [
'sync_bookmarks/bookmark_data_type_controller_unittest.cc',
],
@@ -1100,6 +1184,7 @@
'<@(subresource_filter_core_common_unittest_sources)',
'<@(suggestions_unittest_sources)',
'<@(supervised_user_error_page_unittest_sources)',
+ '<@(sync_unittest_sources)',
'<@(sync_bookmarks_unittest_sources)',
'<@(sync_driver_unittest_sources)',
'<@(sync_sessions_unittest_sources)',
@@ -1126,8 +1211,6 @@
'../jingle/jingle.gyp:notifier_test_util',
'../net/net.gyp:net_test_support',
'../sql/sql.gyp:test_support_sql',
- '../components/sync.gyp:sync',
- '../components/sync.gyp:test_support_sync_api',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/icu/icu.gyp:icui18n',
@@ -1273,6 +1356,10 @@
'mime_util/mime_util.gyp:mime_util',
'prefs/prefs.gyp:prefs',
'prefs/prefs.gyp:prefs_test_support',
+ 'sync.gyp:sync',
+ 'sync.gyp:test_support_sync_api',
+ 'sync.gyp:test_support_sync_core',
+ 'sync.gyp:test_support_sync_core_impl',
'url_formatter/url_formatter.gyp:url_formatter',
],
'conditions': [
@@ -1442,6 +1529,9 @@
# component directory structure).
['exclude', '^[^/]*/content/'],
],
+ 'sources!': [
+ 'core/http_bridge_unittest.cc',
+ ],
'mac_bundle_resources': [
'<(PRODUCT_DIR)/ui_test.pak',
],
« no previous file with comments | « components/BUILD.gn ('k') | components/sync/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698