| Index: components/sync.gyp
|
| diff --git a/components/sync.gyp b/components/sync.gyp
|
| index 6f658ebba221403c61794e8d699991afa7d9c259..b04de1b889f0aa1677f1325d990da115d04aa9bc 100644
|
| --- a/components/sync.gyp
|
| +++ b/components/sync.gyp
|
| @@ -7,16 +7,16 @@
|
| 'chromium_code': 1,
|
| # Setting these two variables allows other targets to use the
|
| # sync_proto_sources variable as the list of sync protocol buffer files.
|
| - 'sync_proto_sources_dir': 'protocol',
|
| + 'sync_proto_sources_dir': 'sync/protocol',
|
| 'sync_proto_sources': [
|
| '<@(sync_proto_source_paths)',
|
| ],
|
| },
|
|
|
| 'includes': [
|
| - 'protocol/protocol.gypi',
|
| - 'sync_android.gypi',
|
| - 'sync_tests.gypi',
|
| + 'sync/protocol/protocol.gypi',
|
| + 'sync/sync_android.gypi',
|
| + 'sync/sync_tests.gypi',
|
| ],
|
|
|
| 'targets': [
|
| @@ -68,417 +68,417 @@
|
| 'sync_proto',
|
| ],
|
| '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_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/entity_change.cc',
|
| - 'api/entity_change.h',
|
| - 'api/entity_data.cc',
|
| - 'api/entity_data.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',
|
| - 'base/sync_export.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/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',
|
| - 'engine_impl/commit_processor.cc',
|
| - 'engine_impl/commit_processor.h',
|
| - 'engine_impl/commit_queue.cc',
|
| - 'engine_impl/commit_queue.h',
|
| - 'engine_impl/commit_util.cc',
|
| - 'engine_impl/commit_util.h',
|
| - 'engine_impl/conflict_resolver.cc',
|
| - 'engine_impl/conflict_resolver.h',
|
| - 'engine_impl/conflict_util.cc',
|
| - 'engine_impl/conflict_util.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/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/model_type_worker.cc',
|
| - 'engine_impl/model_type_worker.h',
|
| - 'engine_impl/net/server_connection_manager.cc',
|
| - 'engine_impl/net/server_connection_manager.h',
|
| - 'engine_impl/net/url_translator.cc',
|
| - 'engine_impl/net/url_translator.h',
|
| - 'engine_impl/non_blocking_type_commit_contribution.cc',
|
| - 'engine_impl/non_blocking_type_commit_contribution.h',
|
| - 'engine_impl/nudge_handler.cc',
|
| - 'engine_impl/nudge_handler.h',
|
| - 'engine_impl/nudge_source.cc',
|
| - 'engine_impl/nudge_source.h',
|
| - 'engine_impl/process_updates_util.cc',
|
| - 'engine_impl/process_updates_util.h',
|
| - 'engine_impl/sync_cycle_event.cc',
|
| - 'engine_impl/sync_cycle_event.h',
|
| - 'engine_impl/sync_engine_event_listener.cc',
|
| - 'engine_impl/sync_engine_event_listener.h',
|
| - 'engine_impl/sync_scheduler.cc',
|
| - 'engine_impl/sync_scheduler.h',
|
| - 'engine_impl/sync_scheduler_impl.cc',
|
| - 'engine_impl/sync_scheduler_impl.h',
|
| - 'engine_impl/syncer.cc',
|
| - 'engine_impl/syncer.h',
|
| - 'engine_impl/syncer_proto_util.cc',
|
| - 'engine_impl/syncer_proto_util.h',
|
| - 'engine_impl/syncer_types.h',
|
| - 'engine_impl/syncer_util.cc',
|
| - 'engine_impl/syncer_util.h',
|
| - 'engine_impl/traffic_logger.cc',
|
| - 'engine_impl/traffic_logger.h',
|
| - 'engine_impl/update_applicator.cc',
|
| - 'engine_impl/update_applicator.h',
|
| - 'engine_impl/update_handler.cc',
|
| - 'engine_impl/update_handler.h',
|
| - 'engine_impl/worker_entity_tracker.cc',
|
| - 'engine_impl/worker_entity_tracker.h',
|
| - 'core/activation_context.cc',
|
| - 'internal_api/attachments/attachment_downloader.cc',
|
| - 'internal_api/attachments/attachment_downloader_impl.cc',
|
| - 'internal_api/attachments/attachment_service.cc',
|
| - 'internal_api/attachments/attachment_service_impl.cc',
|
| - 'internal_api/attachments/attachment_service_proxy.cc',
|
| - 'internal_api/attachments/attachment_service_proxy_for_test.cc',
|
| - 'internal_api/attachments/attachment_store_frontend.cc',
|
| - 'internal_api/attachments/attachment_uploader.cc',
|
| - 'internal_api/attachments/attachment_uploader_impl.cc',
|
| - 'internal_api/attachments/attachment_util.cc',
|
| - 'internal_api/attachments/fake_attachment_downloader.cc',
|
| - 'internal_api/attachments/fake_attachment_uploader.cc',
|
| - 'internal_api/attachments/in_memory_attachment_store.cc',
|
| - 'internal_api/attachments/on_disk_attachment_store.cc',
|
| - 'internal_api/attachments/task_queue.cc',
|
| - 'core/base_node.cc',
|
| - 'core/base_transaction.cc',
|
| - 'core/change_record.cc',
|
| - 'internal_api/change_reorder_buffer.cc',
|
| - 'internal_api/change_reorder_buffer.h',
|
| - 'internal_api/debug_info_event_listener.cc',
|
| - 'internal_api/debug_info_event_listener.h',
|
| - 'core/delete_journal.cc',
|
| - 'engine/events/clear_server_data_request_event.cc',
|
| - 'engine/events/clear_server_data_response_event.cc',
|
| - 'engine/events/commit_request_event.cc',
|
| - 'engine/events/commit_response_event.cc',
|
| - 'engine/events/configure_get_updates_request_event.cc',
|
| - 'engine/events/get_updates_response_event.cc',
|
| - 'engine/events/normal_get_updates_request_event.cc',
|
| - 'engine/events/poll_get_updates_request_event.cc',
|
| - 'engine/events/protocol_event.cc',
|
| - 'core/http_bridge.cc',
|
| - 'core/http_bridge_network_resources.cc',
|
| - 'core/internal_components_factory_impl.cc',
|
| - 'internal_api/js_mutation_event_observer.cc',
|
| - 'internal_api/js_mutation_event_observer.h',
|
| - 'internal_api/js_sync_encryption_handler_observer.cc',
|
| - 'internal_api/js_sync_encryption_handler_observer.h',
|
| - 'internal_api/js_sync_manager_observer.cc',
|
| - 'internal_api/js_sync_manager_observer.h',
|
| - 'core/model_type_connector.cc',
|
| - 'internal_api/model_type_connector_proxy.cc',
|
| - 'core/model_type_store_backend.cc',
|
| - 'core/model_type_store_impl.cc',
|
| - 'core/processor_entity_tracker.cc',
|
| - 'internal_api/protocol_event_buffer.cc',
|
| - 'internal_api/protocol_event_buffer.h',
|
| - '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/attachments/task_queue.h',
|
| - 'base/attachment_id_proto.cc',
|
| - 'base/attachment_id_proto.h',
|
| - 'base/cancelation_observer.cc',
|
| - 'base/cancelation_observer.h',
|
| - 'base/cancelation_signal.cc',
|
| - 'base/cancelation_signal.h',
|
| - 'base/enum_set.h',
|
| - 'base/enum_set.h',
|
| - 'base/invalidation_interface.cc',
|
| - 'base/invalidation_interface.h',
|
| - 'base/model_type.h',
|
| - 'base/node_ordinal.cc',
|
| - 'base/node_ordinal.h',
|
| - 'base/ordinal.h',
|
| - 'base/progress_marker_map.cc',
|
| - 'base/progress_marker_map.h',
|
| - 'base/stop_source.h',
|
| - 'base/unique_position.cc',
|
| - 'base/unique_position.h',
|
| - 'core/base_node.h',
|
| - 'core/base_transaction.h',
|
| - 'core/change_record.h',
|
| - 'core/configure_reason.h',
|
| - 'core/connection_status.h',
|
| - 'core/data_batch_impl.h',
|
| - 'core/data_batch_impl.cc',
|
| - '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/data_type_error_handler.h',
|
| - 'core/delete_journal.h',
|
| - 'engine/model_safe_worker.cc',
|
| - 'engine/model_safe_worker.h',
|
| - 'engine/passive_model_worker.cc',
|
| - 'engine/passive_model_worker.h',
|
| - 'engine/polling_constants.cc',
|
| - 'engine/polling_constants.h',
|
| - 'engine/sync_status.cc',
|
| - 'engine/sync_status.h',
|
| - 'engine/events/clear_server_data_request_event.h',
|
| - 'engine/events/clear_server_data_response_event.h',
|
| - 'engine/events/commit_request_event.h',
|
| - 'engine/events/commit_response_event.h',
|
| - 'engine/events/configure_get_updates_request_event.h',
|
| - 'engine/events/get_updates_response_event.h',
|
| - 'engine/events/normal_get_updates_request_event.h',
|
| - 'engine/events/poll_get_updates_request_event.h',
|
| - 'engine/events/protocol_event.h',
|
| - 'core/http_bridge.h',
|
| - 'core/http_bridge_network_resources.h',
|
| - 'core/http_post_provider_factory.h',
|
| - 'core/http_post_provider_interface.h',
|
| - 'core/internal_components_factory.h',
|
| - 'core/internal_components_factory_impl.h',
|
| - 'core/model_type_connector.h',
|
| - 'core/model_type_connector_proxy.h',
|
| - 'core/model_type_processor.cc',
|
| - 'core/model_type_processor.h',
|
| - 'core/model_type_store_backend.h',
|
| - 'core/model_type_store_impl.h',
|
| - 'core/network_resources.h',
|
| - 'core/non_blocking_sync_common.cc',
|
| - 'core/non_blocking_sync_common.h',
|
| - 'core/processor_entity_tracker.h',
|
| - 'core/read_node.h',
|
| - 'core/read_transaction.h',
|
| - 'sessions/commit_counters.cc',
|
| - 'sessions/commit_counters.h',
|
| - 'sessions/model_neutral_state.cc',
|
| - 'sessions/model_neutral_state.h',
|
| - 'sessions/status_counters.cc',
|
| - 'sessions/status_counters.h',
|
| - 'sessions/sync_session_snapshot.cc',
|
| - 'sessions/sync_session_snapshot.h',
|
| - 'sessions/type_debug_info_observer.cc',
|
| - 'sessions/type_debug_info_observer.h',
|
| - 'sessions/update_counters.cc',
|
| - 'sessions/update_counters.h',
|
| - 'core/shared_model_type_processor.h',
|
| - 'core/shutdown_reason.h',
|
| - 'core/simple_metadata_change_list.cc',
|
| - 'core/simple_metadata_change_list.h',
|
| - 'core/sync_auth_provider.h',
|
| - 'core/sync_encryption_handler.cc',
|
| - 'core/sync_encryption_handler.h',
|
| - 'core/sync_manager.cc',
|
| - 'core/sync_manager.h',
|
| - 'core/sync_manager_factory.h',
|
| - 'core/user_share.h',
|
| - 'base/experiments.h',
|
| - 'base/immutable.h',
|
| - 'base/proto_value_ptr.h',
|
| - 'base/sync_db_util.h',
|
| - 'base/sync_string_conversions.cc',
|
| - 'base/sync_string_conversions.h',
|
| - 'base/syncer_error.cc',
|
| - 'base/syncer_error.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/write_node.h',
|
| - 'core/write_transaction.h',
|
| - 'core/read_node.cc',
|
| - 'core/read_transaction.cc',
|
| - 'core/shared_model_type_processor.cc',
|
| - 'core/sync_db_util.cc',
|
| - 'internal_api/sync_encryption_handler_impl.cc',
|
| - 'internal_api/sync_encryption_handler_impl.h',
|
| - 'core/sync_manager_factory.cc',
|
| - 'internal_api/sync_manager_impl.cc',
|
| - 'internal_api/sync_manager_impl.h',
|
| - 'internal_api/syncapi_internal.cc',
|
| - 'internal_api/syncapi_internal.h',
|
| - 'internal_api/syncapi_server_connection_manager.cc',
|
| - 'internal_api/syncapi_server_connection_manager.h',
|
| - 'core/user_share.cc',
|
| - 'core/write_node.cc',
|
| - 'core/write_transaction.cc',
|
| - 'js/js_backend.h',
|
| - 'js/js_controller.h',
|
| - 'js/js_event_details.cc',
|
| - 'js/js_event_details.h',
|
| - 'js/js_event_handler.h',
|
| - 'js/sync_js_controller.cc',
|
| - 'js/sync_js_controller.h',
|
| - 'protocol/proto_enum_conversions.cc',
|
| - 'protocol/proto_enum_conversions.h',
|
| - 'protocol/proto_value_conversions.cc',
|
| - 'protocol/proto_value_conversions.h',
|
| - 'protocol/sync_protocol_error.cc',
|
| - 'protocol/sync_protocol_error.h',
|
| - 'sessions_impl/data_type_tracker.cc',
|
| - 'sessions_impl/data_type_tracker.h',
|
| - 'sessions_impl/debug_info_getter.h',
|
| - 'sessions_impl/directory_type_debug_info_emitter.cc',
|
| - 'sessions_impl/directory_type_debug_info_emitter.h',
|
| - 'sessions_impl/model_type_registry.cc',
|
| - 'sessions_impl/model_type_registry.h',
|
| - 'sessions_impl/nudge_tracker.cc',
|
| - 'sessions_impl/nudge_tracker.h',
|
| - 'sessions_impl/status_controller.cc',
|
| - 'sessions_impl/status_controller.h',
|
| - 'sessions_impl/sync_session.cc',
|
| - 'sessions_impl/sync_session.h',
|
| - 'sessions_impl/sync_session_context.cc',
|
| - 'sessions_impl/sync_session_context.h',
|
| - 'syncable/dir_open_result.h',
|
| - 'syncable/directory.cc',
|
| - 'syncable/directory.h',
|
| - 'syncable/directory_backing_store.cc',
|
| - 'syncable/directory_backing_store.h',
|
| - 'syncable/directory_change_delegate.h',
|
| - 'syncable/entry.cc',
|
| - 'syncable/entry.h',
|
| - 'syncable/entry_kernel.cc',
|
| - 'syncable/entry_kernel.h',
|
| - 'syncable/in_memory_directory_backing_store.cc',
|
| - 'syncable/in_memory_directory_backing_store.h',
|
| - 'syncable/invalid_directory_backing_store.cc',
|
| - 'syncable/invalid_directory_backing_store.h',
|
| - 'syncable/metahandle_set.h',
|
| - 'syncable/model_neutral_mutable_entry.cc',
|
| - 'syncable/model_neutral_mutable_entry.h',
|
| - 'syncable/model_type.cc',
|
| - 'syncable/mutable_entry.cc',
|
| - 'syncable/mutable_entry.h',
|
| - 'syncable/nigori_handler.cc',
|
| - 'syncable/nigori_handler.h',
|
| - 'syncable/nigori_util.cc',
|
| - 'syncable/nigori_util.h',
|
| - 'syncable/on_disk_directory_backing_store.cc',
|
| - 'syncable/on_disk_directory_backing_store.h',
|
| - 'syncable/parent_child_index.cc',
|
| - 'syncable/parent_child_index.h',
|
| - 'syncable/scoped_kernel_lock.cc',
|
| - 'syncable/scoped_kernel_lock.h',
|
| - 'syncable/scoped_parent_child_index_updater.cc',
|
| - 'syncable/scoped_parent_child_index_updater.h',
|
| - 'syncable/syncable-inl.h',
|
| - 'syncable/syncable_base_transaction.cc',
|
| - 'syncable/syncable_base_transaction.h',
|
| - 'syncable/syncable_base_write_transaction.cc',
|
| - 'syncable/syncable_base_write_transaction.h',
|
| - 'syncable/syncable_changes_version.h',
|
| - 'syncable/syncable_columns.h',
|
| - 'syncable/syncable_delete_journal.cc',
|
| - 'syncable/syncable_delete_journal.h',
|
| - 'syncable/syncable_enum_conversions.cc',
|
| - 'syncable/syncable_enum_conversions.h',
|
| - 'syncable/syncable_id.cc',
|
| - 'syncable/syncable_id.h',
|
| - 'syncable/syncable_model_neutral_write_transaction.cc',
|
| - 'syncable/syncable_model_neutral_write_transaction.h',
|
| - 'syncable/syncable_proto_util.cc',
|
| - 'syncable/syncable_proto_util.h',
|
| - 'syncable/syncable_read_transaction.cc',
|
| - 'syncable/syncable_read_transaction.h',
|
| - 'syncable/syncable_util.cc',
|
| - 'syncable/syncable_util.h',
|
| - 'syncable/syncable_write_transaction.cc',
|
| - 'syncable/syncable_write_transaction.h',
|
| - 'syncable/transaction_observer.h',
|
| - 'syncable/write_transaction_info.cc',
|
| - 'syncable/write_transaction_info.h',
|
| - 'base/cryptographer.cc',
|
| - 'base/cryptographer.h',
|
| - 'base/data_type_histogram.cc',
|
| - 'base/data_type_histogram.h',
|
| - 'base/encryptor.h',
|
| - 'base/extensions_activity.cc',
|
| - 'base/extensions_activity.h',
|
| - 'base/get_session_name.cc',
|
| - 'base/get_session_name.h',
|
| - 'base/get_session_name_ios.h',
|
| - 'base/get_session_name_ios.mm',
|
| - 'base/get_session_name_linux.cc',
|
| - 'base/get_session_name_linux.h',
|
| - 'base/get_session_name_mac.h',
|
| - 'base/get_session_name_mac.mm',
|
| - 'base/get_session_name_win.cc',
|
| - 'base/get_session_name_win.h',
|
| - 'base/logging.cc',
|
| - 'base/logging.h',
|
| - 'base/nigori.cc',
|
| - 'base/nigori.h',
|
| - 'base/time.cc',
|
| - 'base/time.h',
|
| + 'sync/api/attachments/attachment.cc',
|
| + 'sync/api/attachments/attachment.h',
|
| + 'sync/api/attachments/attachment_id.cc',
|
| + 'sync/api/attachments/attachment_id.h',
|
| + 'sync/api/attachments/attachment_metadata.cc',
|
| + 'sync/api/attachments/attachment_metadata.h',
|
| + 'sync/api/attachments/attachment_store.cc',
|
| + 'sync/api/attachments/attachment_store.h',
|
| + 'sync/api/attachments/attachment_store_backend.cc',
|
| + 'sync/api/attachments/attachment_store_backend.h',
|
| + 'sync/api/conflict_resolution.cc',
|
| + 'sync/api/conflict_resolution.h',
|
| + 'sync/api/data_batch.h',
|
| + 'sync/api/entity_change.cc',
|
| + 'sync/api/entity_change.h',
|
| + 'sync/api/entity_data.cc',
|
| + 'sync/api/entity_data.h',
|
| + 'sync/api/metadata_batch.cc',
|
| + 'sync/api/metadata_batch.h',
|
| + 'sync/api/metadata_change_list.h',
|
| + 'sync/api/model_type_change_processor.cc',
|
| + 'sync/api/model_type_change_processor.h',
|
| + 'sync/api/model_type_service.cc',
|
| + 'sync/api/model_type_service.h',
|
| + 'sync/api/model_type_store.cc',
|
| + 'sync/api/model_type_store.h',
|
| + 'sync/api/string_ordinal.h',
|
| + 'sync/api/sync_change.cc',
|
| + 'sync/api/sync_change.h',
|
| + 'sync/api/sync_change_processor.cc',
|
| + 'sync/api/sync_change_processor.h',
|
| + 'sync/api/sync_data.cc',
|
| + 'sync/api/sync_data.h',
|
| + 'sync/api/sync_error.cc',
|
| + 'sync/api/sync_error.h',
|
| + 'sync/api/sync_error_factory.cc',
|
| + 'sync/api/sync_error_factory.h',
|
| + 'sync/api/sync_merge_result.cc',
|
| + 'sync/api/sync_merge_result.h',
|
| + 'sync/api/syncable_service.cc',
|
| + 'sync/api/syncable_service.h',
|
| + 'sync/api/time.h',
|
| + 'sync/base/sync_export.h',
|
| + 'sync/engine_impl/all_status.cc',
|
| + 'sync/engine_impl/all_status.h',
|
| + 'sync/engine_impl/apply_control_data_updates.cc',
|
| + 'sync/engine_impl/apply_control_data_updates.h',
|
| + 'sync/engine_impl/backoff_delay_provider.cc',
|
| + 'sync/engine_impl/backoff_delay_provider.h',
|
| + 'sync/engine_impl/clear_server_data.cc',
|
| + 'sync/engine_impl/clear_server_data.h',
|
| + 'sync/engine_impl/commit.cc',
|
| + 'sync/engine_impl/commit.h',
|
| + 'sync/engine_impl/commit_contribution.cc',
|
| + 'sync/engine_impl/commit_contribution.h',
|
| + 'sync/engine_impl/commit_contributor.cc',
|
| + 'sync/engine_impl/commit_contributor.h',
|
| + 'sync/engine_impl/commit_processor.cc',
|
| + 'sync/engine_impl/commit_processor.h',
|
| + 'sync/engine_impl/commit_queue.cc',
|
| + 'sync/engine_impl/commit_queue.h',
|
| + 'sync/engine_impl/commit_util.cc',
|
| + 'sync/engine_impl/commit_util.h',
|
| + 'sync/engine_impl/conflict_resolver.cc',
|
| + 'sync/engine_impl/conflict_resolver.h',
|
| + 'sync/engine_impl/conflict_util.cc',
|
| + 'sync/engine_impl/conflict_util.h',
|
| + 'sync/engine_impl/directory_commit_contribution.cc',
|
| + 'sync/engine_impl/directory_commit_contribution.h',
|
| + 'sync/engine_impl/directory_commit_contributor.cc',
|
| + 'sync/engine_impl/directory_commit_contributor.h',
|
| + 'sync/engine_impl/directory_update_handler.cc',
|
| + 'sync/engine_impl/directory_update_handler.h',
|
| + 'sync/engine_impl/get_commit_ids.cc',
|
| + 'sync/engine_impl/get_commit_ids.h',
|
| + 'sync/engine_impl/get_updates_delegate.cc',
|
| + 'sync/engine_impl/get_updates_delegate.h',
|
| + 'sync/engine_impl/get_updates_processor.cc',
|
| + 'sync/engine_impl/get_updates_processor.h',
|
| + 'sync/engine_impl/model_type_worker.cc',
|
| + 'sync/engine_impl/model_type_worker.h',
|
| + 'sync/engine_impl/net/server_connection_manager.cc',
|
| + 'sync/engine_impl/net/server_connection_manager.h',
|
| + 'sync/engine_impl/net/url_translator.cc',
|
| + 'sync/engine_impl/net/url_translator.h',
|
| + 'sync/engine_impl/non_blocking_type_commit_contribution.cc',
|
| + 'sync/engine_impl/non_blocking_type_commit_contribution.h',
|
| + 'sync/engine_impl/nudge_handler.cc',
|
| + 'sync/engine_impl/nudge_handler.h',
|
| + 'sync/engine_impl/nudge_source.cc',
|
| + 'sync/engine_impl/nudge_source.h',
|
| + 'sync/engine_impl/process_updates_util.cc',
|
| + 'sync/engine_impl/process_updates_util.h',
|
| + 'sync/engine_impl/sync_cycle_event.cc',
|
| + 'sync/engine_impl/sync_cycle_event.h',
|
| + 'sync/engine_impl/sync_engine_event_listener.cc',
|
| + 'sync/engine_impl/sync_engine_event_listener.h',
|
| + 'sync/engine_impl/sync_scheduler.cc',
|
| + 'sync/engine_impl/sync_scheduler.h',
|
| + 'sync/engine_impl/sync_scheduler_impl.cc',
|
| + 'sync/engine_impl/sync_scheduler_impl.h',
|
| + 'sync/engine_impl/syncer.cc',
|
| + 'sync/engine_impl/syncer.h',
|
| + 'sync/engine_impl/syncer_proto_util.cc',
|
| + 'sync/engine_impl/syncer_proto_util.h',
|
| + 'sync/engine_impl/syncer_types.h',
|
| + 'sync/engine_impl/syncer_util.cc',
|
| + 'sync/engine_impl/syncer_util.h',
|
| + 'sync/engine_impl/traffic_logger.cc',
|
| + 'sync/engine_impl/traffic_logger.h',
|
| + 'sync/engine_impl/update_applicator.cc',
|
| + 'sync/engine_impl/update_applicator.h',
|
| + 'sync/engine_impl/update_handler.cc',
|
| + 'sync/engine_impl/update_handler.h',
|
| + 'sync/engine_impl/worker_entity_tracker.cc',
|
| + 'sync/engine_impl/worker_entity_tracker.h',
|
| + 'sync/core/activation_context.cc',
|
| + 'sync/core_impl/attachments/attachment_downloader.cc',
|
| + 'sync/core_impl/attachments/attachment_downloader_impl.cc',
|
| + 'sync/core_impl/attachments/attachment_service.cc',
|
| + 'sync/core_impl/attachments/attachment_service_impl.cc',
|
| + 'sync/core_impl/attachments/attachment_service_proxy.cc',
|
| + 'sync/core_impl/attachments/attachment_service_proxy_for_test.cc',
|
| + 'sync/core_impl/attachments/attachment_store_frontend.cc',
|
| + 'sync/core_impl/attachments/attachment_uploader.cc',
|
| + 'sync/core_impl/attachments/attachment_uploader_impl.cc',
|
| + 'sync/core_impl/attachments/attachment_util.cc',
|
| + 'sync/core_impl/attachments/fake_attachment_downloader.cc',
|
| + 'sync/core_impl/attachments/fake_attachment_uploader.cc',
|
| + 'sync/core_impl/attachments/in_memory_attachment_store.cc',
|
| + 'sync/core_impl/attachments/on_disk_attachment_store.cc',
|
| + 'sync/core_impl/attachments/task_queue.cc',
|
| + 'sync/core/base_node.cc',
|
| + 'sync/core/base_transaction.cc',
|
| + 'sync/core/change_record.cc',
|
| + 'sync/core_impl/change_reorder_buffer.cc',
|
| + 'sync/core_impl/change_reorder_buffer.h',
|
| + 'sync/core_impl/debug_info_event_listener.cc',
|
| + 'sync/core_impl/debug_info_event_listener.h',
|
| + 'sync/core/delete_journal.cc',
|
| + 'sync/engine/events/clear_server_data_request_event.cc',
|
| + 'sync/engine/events/clear_server_data_response_event.cc',
|
| + 'sync/engine/events/commit_request_event.cc',
|
| + 'sync/engine/events/commit_response_event.cc',
|
| + 'sync/engine/events/configure_get_updates_request_event.cc',
|
| + 'sync/engine/events/get_updates_response_event.cc',
|
| + 'sync/engine/events/normal_get_updates_request_event.cc',
|
| + 'sync/engine/events/poll_get_updates_request_event.cc',
|
| + 'sync/engine/events/protocol_event.cc',
|
| + 'sync/core/http_bridge.cc',
|
| + 'sync/core/http_bridge_network_resources.cc',
|
| + 'sync/core/internal_components_factory_impl.cc',
|
| + 'sync/core_impl/js_mutation_event_observer.cc',
|
| + 'sync/core_impl/js_mutation_event_observer.h',
|
| + 'sync/core_impl/js_sync_encryption_handler_observer.cc',
|
| + 'sync/core_impl/js_sync_encryption_handler_observer.h',
|
| + 'sync/core_impl/js_sync_manager_observer.cc',
|
| + 'sync/core_impl/js_sync_manager_observer.h',
|
| + 'sync/core/model_type_connector.cc',
|
| + 'sync/core_impl/model_type_connector_proxy.cc',
|
| + 'sync/core/model_type_store_backend.cc',
|
| + 'sync/core/model_type_store_impl.cc',
|
| + 'sync/core/processor_entity_tracker.cc',
|
| + 'sync/core_impl/protocol_event_buffer.cc',
|
| + 'sync/core_impl/protocol_event_buffer.h',
|
| + 'sync/core/activation_context.h',
|
| + 'sync/core/attachments/attachment_downloader.h',
|
| + 'sync/core/attachments/attachment_downloader_impl.h',
|
| + 'sync/core/attachments/attachment_service.h',
|
| + 'sync/core/attachments/attachment_service_impl.h',
|
| + 'sync/core/attachments/attachment_service_proxy.h',
|
| + 'sync/core/attachments/attachment_service_proxy_for_test.h',
|
| + 'sync/core/attachments/attachment_store_frontend.h',
|
| + 'sync/core/attachments/attachment_uploader.h',
|
| + 'sync/core/attachments/attachment_uploader_impl.h',
|
| + 'sync/core/attachments/attachment_util.h',
|
| + 'sync/core/attachments/fake_attachment_downloader.h',
|
| + 'sync/core/attachments/fake_attachment_uploader.h',
|
| + 'sync/core/attachments/in_memory_attachment_store.h',
|
| + 'sync/core/attachments/on_disk_attachment_store.h',
|
| + 'sync/core/attachments/task_queue.h',
|
| + 'sync/base/attachment_id_proto.cc',
|
| + 'sync/base/attachment_id_proto.h',
|
| + 'sync/base/cancelation_observer.cc',
|
| + 'sync/base/cancelation_observer.h',
|
| + 'sync/base/cancelation_signal.cc',
|
| + 'sync/base/cancelation_signal.h',
|
| + 'sync/base/enum_set.h',
|
| + 'sync/base/enum_set.h',
|
| + 'sync/base/invalidation_interface.cc',
|
| + 'sync/base/invalidation_interface.h',
|
| + 'sync/base/model_type.h',
|
| + 'sync/base/node_ordinal.cc',
|
| + 'sync/base/node_ordinal.h',
|
| + 'sync/base/ordinal.h',
|
| + 'sync/base/progress_marker_map.cc',
|
| + 'sync/base/progress_marker_map.h',
|
| + 'sync/base/stop_source.h',
|
| + 'sync/base/unique_position.cc',
|
| + 'sync/base/unique_position.h',
|
| + 'sync/core/base_node.h',
|
| + 'sync/core/base_transaction.h',
|
| + 'sync/core/change_record.h',
|
| + 'sync/core/configure_reason.h',
|
| + 'sync/core/connection_status.h',
|
| + 'sync/core/data_batch_impl.h',
|
| + 'sync/core/data_batch_impl.cc',
|
| + 'sync/core/data_type_association_stats.cc',
|
| + 'sync/core/data_type_association_stats.h',
|
| + 'sync/core/data_type_debug_info_listener.cc',
|
| + 'sync/core/data_type_debug_info_listener.h',
|
| + 'sync/core/data_type_error_handler.h',
|
| + 'sync/core/delete_journal.h',
|
| + 'sync/engine/model_safe_worker.cc',
|
| + 'sync/engine/model_safe_worker.h',
|
| + 'sync/engine/passive_model_worker.cc',
|
| + 'sync/engine/passive_model_worker.h',
|
| + 'sync/engine/polling_constants.cc',
|
| + 'sync/engine/polling_constants.h',
|
| + 'sync/engine/sync_status.cc',
|
| + 'sync/engine/sync_status.h',
|
| + 'sync/engine/events/clear_server_data_request_event.h',
|
| + 'sync/engine/events/clear_server_data_response_event.h',
|
| + 'sync/engine/events/commit_request_event.h',
|
| + 'sync/engine/events/commit_response_event.h',
|
| + 'sync/engine/events/configure_get_updates_request_event.h',
|
| + 'sync/engine/events/get_updates_response_event.h',
|
| + 'sync/engine/events/normal_get_updates_request_event.h',
|
| + 'sync/engine/events/poll_get_updates_request_event.h',
|
| + 'sync/engine/events/protocol_event.h',
|
| + 'sync/core/http_bridge.h',
|
| + 'sync/core/http_bridge_network_resources.h',
|
| + 'sync/core/http_post_provider_factory.h',
|
| + 'sync/core/http_post_provider_interface.h',
|
| + 'sync/core/internal_components_factory.h',
|
| + 'sync/core/internal_components_factory_impl.h',
|
| + 'sync/core/model_type_connector.h',
|
| + 'sync/core/model_type_connector_proxy.h',
|
| + 'sync/core/model_type_processor.cc',
|
| + 'sync/core/model_type_processor.h',
|
| + 'sync/core/model_type_store_backend.h',
|
| + 'sync/core/model_type_store_impl.h',
|
| + 'sync/core/network_resources.h',
|
| + 'sync/core/non_blocking_sync_common.cc',
|
| + 'sync/core/non_blocking_sync_common.h',
|
| + 'sync/core/processor_entity_tracker.h',
|
| + 'sync/core/read_node.h',
|
| + 'sync/core/read_transaction.h',
|
| + 'sync/sessions/commit_counters.cc',
|
| + 'sync/sessions/commit_counters.h',
|
| + 'sync/sessions/model_neutral_state.cc',
|
| + 'sync/sessions/model_neutral_state.h',
|
| + 'sync/sessions/status_counters.cc',
|
| + 'sync/sessions/status_counters.h',
|
| + 'sync/sessions/sync_session_snapshot.cc',
|
| + 'sync/sessions/sync_session_snapshot.h',
|
| + 'sync/sessions/type_debug_info_observer.cc',
|
| + 'sync/sessions/type_debug_info_observer.h',
|
| + 'sync/sessions/update_counters.cc',
|
| + 'sync/sessions/update_counters.h',
|
| + 'sync/core/shared_model_type_processor.h',
|
| + 'sync/core/shutdown_reason.h',
|
| + 'sync/core/simple_metadata_change_list.cc',
|
| + 'sync/core/simple_metadata_change_list.h',
|
| + 'sync/core/sync_auth_provider.h',
|
| + 'sync/core/sync_encryption_handler.cc',
|
| + 'sync/core/sync_encryption_handler.h',
|
| + 'sync/core/sync_manager.cc',
|
| + 'sync/core/sync_manager.h',
|
| + 'sync/core/sync_manager_factory.h',
|
| + 'sync/core/user_share.h',
|
| + 'sync/base/experiments.h',
|
| + 'sync/base/immutable.h',
|
| + 'sync/base/proto_value_ptr.h',
|
| + 'sync/base/sync_db_util.h',
|
| + 'sync/base/sync_string_conversions.cc',
|
| + 'sync/base/sync_string_conversions.h',
|
| + 'sync/base/syncer_error.cc',
|
| + 'sync/base/syncer_error.h',
|
| + 'sync/base/unrecoverable_error_handler.h',
|
| + 'sync/base/unrecoverable_error_info.cc',
|
| + 'sync/base/unrecoverable_error_info.h',
|
| + 'sync/base/weak_handle.cc',
|
| + 'sync/base/weak_handle.h',
|
| + 'sync/core/write_node.h',
|
| + 'sync/core/write_transaction.h',
|
| + 'sync/core/read_node.cc',
|
| + 'sync/core/read_transaction.cc',
|
| + 'sync/core/shared_model_type_processor.cc',
|
| + 'sync/core/sync_db_util.cc',
|
| + 'sync/core_impl/sync_encryption_handler_impl.cc',
|
| + 'sync/core_impl/sync_encryption_handler_impl.h',
|
| + 'sync/core/sync_manager_factory.cc',
|
| + 'sync/core_impl/sync_manager_impl.cc',
|
| + 'sync/core_impl/sync_manager_impl.h',
|
| + 'sync/core_impl/syncapi_internal.cc',
|
| + 'sync/core_impl/syncapi_internal.h',
|
| + 'sync/core_impl/syncapi_server_connection_manager.cc',
|
| + 'sync/core_impl/syncapi_server_connection_manager.h',
|
| + 'sync/core/user_share.cc',
|
| + 'sync/core/write_node.cc',
|
| + 'sync/core/write_transaction.cc',
|
| + 'sync/js/js_backend.h',
|
| + 'sync/js/js_controller.h',
|
| + 'sync/js/js_event_details.cc',
|
| + 'sync/js/js_event_details.h',
|
| + 'sync/js/js_event_handler.h',
|
| + 'sync/js/sync_js_controller.cc',
|
| + 'sync/js/sync_js_controller.h',
|
| + 'sync/protocol/proto_enum_conversions.cc',
|
| + 'sync/protocol/proto_enum_conversions.h',
|
| + 'sync/protocol/proto_value_conversions.cc',
|
| + 'sync/protocol/proto_value_conversions.h',
|
| + 'sync/protocol/sync_protocol_error.cc',
|
| + 'sync/protocol/sync_protocol_error.h',
|
| + 'sync/sessions_impl/data_type_tracker.cc',
|
| + 'sync/sessions_impl/data_type_tracker.h',
|
| + 'sync/sessions_impl/debug_info_getter.h',
|
| + 'sync/sessions_impl/directory_type_debug_info_emitter.cc',
|
| + 'sync/sessions_impl/directory_type_debug_info_emitter.h',
|
| + 'sync/sessions_impl/model_type_registry.cc',
|
| + 'sync/sessions_impl/model_type_registry.h',
|
| + 'sync/sessions_impl/nudge_tracker.cc',
|
| + 'sync/sessions_impl/nudge_tracker.h',
|
| + 'sync/sessions_impl/status_controller.cc',
|
| + 'sync/sessions_impl/status_controller.h',
|
| + 'sync/sessions_impl/sync_session.cc',
|
| + 'sync/sessions_impl/sync_session.h',
|
| + 'sync/sessions_impl/sync_session_context.cc',
|
| + 'sync/sessions_impl/sync_session_context.h',
|
| + 'sync/syncable/dir_open_result.h',
|
| + 'sync/syncable/directory.cc',
|
| + 'sync/syncable/directory.h',
|
| + 'sync/syncable/directory_backing_store.cc',
|
| + 'sync/syncable/directory_backing_store.h',
|
| + 'sync/syncable/directory_change_delegate.h',
|
| + 'sync/syncable/entry.cc',
|
| + 'sync/syncable/entry.h',
|
| + 'sync/syncable/entry_kernel.cc',
|
| + 'sync/syncable/entry_kernel.h',
|
| + 'sync/syncable/in_memory_directory_backing_store.cc',
|
| + 'sync/syncable/in_memory_directory_backing_store.h',
|
| + 'sync/syncable/invalid_directory_backing_store.cc',
|
| + 'sync/syncable/invalid_directory_backing_store.h',
|
| + 'sync/syncable/metahandle_set.h',
|
| + 'sync/syncable/model_neutral_mutable_entry.cc',
|
| + 'sync/syncable/model_neutral_mutable_entry.h',
|
| + 'sync/syncable/model_type.cc',
|
| + 'sync/syncable/mutable_entry.cc',
|
| + 'sync/syncable/mutable_entry.h',
|
| + 'sync/syncable/nigori_handler.cc',
|
| + 'sync/syncable/nigori_handler.h',
|
| + 'sync/syncable/nigori_util.cc',
|
| + 'sync/syncable/nigori_util.h',
|
| + 'sync/syncable/on_disk_directory_backing_store.cc',
|
| + 'sync/syncable/on_disk_directory_backing_store.h',
|
| + 'sync/syncable/parent_child_index.cc',
|
| + 'sync/syncable/parent_child_index.h',
|
| + 'sync/syncable/scoped_kernel_lock.cc',
|
| + 'sync/syncable/scoped_kernel_lock.h',
|
| + 'sync/syncable/scoped_parent_child_index_updater.cc',
|
| + 'sync/syncable/scoped_parent_child_index_updater.h',
|
| + 'sync/syncable/syncable-inl.h',
|
| + 'sync/syncable/syncable_base_transaction.cc',
|
| + 'sync/syncable/syncable_base_transaction.h',
|
| + 'sync/syncable/syncable_base_write_transaction.cc',
|
| + 'sync/syncable/syncable_base_write_transaction.h',
|
| + 'sync/syncable/syncable_changes_version.h',
|
| + 'sync/syncable/syncable_columns.h',
|
| + 'sync/syncable/syncable_delete_journal.cc',
|
| + 'sync/syncable/syncable_delete_journal.h',
|
| + 'sync/syncable/syncable_enum_conversions.cc',
|
| + 'sync/syncable/syncable_enum_conversions.h',
|
| + 'sync/syncable/syncable_id.cc',
|
| + 'sync/syncable/syncable_id.h',
|
| + 'sync/syncable/syncable_model_neutral_write_transaction.cc',
|
| + 'sync/syncable/syncable_model_neutral_write_transaction.h',
|
| + 'sync/syncable/syncable_proto_util.cc',
|
| + 'sync/syncable/syncable_proto_util.h',
|
| + 'sync/syncable/syncable_read_transaction.cc',
|
| + 'sync/syncable/syncable_read_transaction.h',
|
| + 'sync/syncable/syncable_util.cc',
|
| + 'sync/syncable/syncable_util.h',
|
| + 'sync/syncable/syncable_write_transaction.cc',
|
| + 'sync/syncable/syncable_write_transaction.h',
|
| + 'sync/syncable/transaction_observer.h',
|
| + 'sync/syncable/write_transaction_info.cc',
|
| + 'sync/syncable/write_transaction_info.h',
|
| + 'sync/base/cryptographer.cc',
|
| + 'sync/base/cryptographer.h',
|
| + 'sync/base/data_type_histogram.cc',
|
| + 'sync/base/data_type_histogram.h',
|
| + 'sync/base/encryptor.h',
|
| + 'sync/base/extensions_activity.cc',
|
| + 'sync/base/extensions_activity.h',
|
| + 'sync/base/get_session_name.cc',
|
| + 'sync/base/get_session_name.h',
|
| + 'sync/base/get_session_name_ios.h',
|
| + 'sync/base/get_session_name_ios.mm',
|
| + 'sync/base/get_session_name_linux.cc',
|
| + 'sync/base/get_session_name_linux.h',
|
| + 'sync/base/get_session_name_mac.h',
|
| + 'sync/base/get_session_name_mac.mm',
|
| + 'sync/base/get_session_name_win.cc',
|
| + 'sync/base/get_session_name_win.h',
|
| + 'sync/base/logging.cc',
|
| + 'sync/base/logging.h',
|
| + 'sync/base/nigori.cc',
|
| + 'sync/base/nigori.h',
|
| + 'sync/base/time.cc',
|
| + 'sync/base/time.h',
|
| ],
|
|
|
| 'conditions': [
|
| @@ -501,10 +501,10 @@
|
| 'sync_jni_headers',
|
| ],
|
| 'sources': [
|
| - 'android/model_type_helper.cc',
|
| - 'android/model_type_helper.h',
|
| - 'android/sync_jni_registrar.cc',
|
| - 'android/sync_jni_registrar.h',
|
| + 'sync/android/model_type_helper.cc',
|
| + 'sync/android/model_type_helper.h',
|
| + 'sync/android/sync_jni_registrar.cc',
|
| + 'sync/android/sync_jni_registrar.h',
|
| ],
|
| }],
|
| ],
|
| @@ -529,10 +529,10 @@
|
| ],
|
| 'variables': {
|
| 'enable_wexit_time_destructors': 1,
|
| - 'proto_in_dir': './protocol',
|
| - 'proto_out_dir': 'sync/protocol',
|
| + 'proto_in_dir': './sync/protocol',
|
| + 'proto_out_dir': 'components/sync/protocol',
|
| 'cc_generator_options': 'dllexport_decl=SYNC_PROTO_EXPORT:',
|
| - 'cc_include': 'sync/protocol/sync_proto_export.h',
|
| + 'cc_include': 'components/sync/protocol/sync_proto_export.h',
|
| },
|
| 'includes': [
|
| '../build/protoc.gypi'
|
| @@ -549,14 +549,14 @@
|
| 'sources': [
|
| # NOTE: If you add a file to this list, also add it to
|
| # sync/core_impl/attachments/proto/BUILD.gn
|
| - 'internal_api/attachments/proto/attachment_store.proto',
|
| + 'sync/core_impl/attachments/proto/attachment_store.proto',
|
| ],
|
| 'variables': {
|
| 'enable_wexit_time_destructors': 1,
|
| - 'proto_in_dir': 'internal_api/attachments/proto',
|
| - 'proto_out_dir': 'sync/core_impl/attachments/proto',
|
| + 'proto_in_dir': './sync/core_impl/attachments/proto',
|
| + 'proto_out_dir': 'components/sync/core_impl/attachments/proto',
|
| 'cc_generator_options': 'dllexport_decl=SYNC_EXPORT:',
|
| - 'cc_include': 'sync/base/sync_export.h',
|
| + 'cc_include': 'components/sync/base/sync_export.h',
|
| },
|
| 'includes': [
|
| '../build/protoc.gypi'
|
|
|
Chromium Code Reviews
Issue 2155763002:
[Sync] //components/sync manual changes [DO NOT SUBMIT] (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@sc-automated