• Home
  • History
  • Annotate
  • only in /external/chromium_org/sync/
History log of /external/chromium_org/sync/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5b892326406927b709cdaf6c384d4ababf456332 06-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/passive_model_worker.cc
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 29-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.44

This commit was generated by merge_to_master.py.

Change-Id: I12ecf158017b8be5f9a1d33f4152e5a3c812cb7f
ndroid/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
5b62eb5758cb7b791cfdd45cf78f35dc060631b6 27-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.38

This commit was generated by merge_to_master.py.

Change-Id: Id34e308a78a8e250aa0f0b60fcb9f882fc35382e
ndroid/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
nternal_api/public/util/experiments.h
rotocol/BUILD.gn
rotocol/experiment_status.proto
ync.gyp
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationPreferences.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ndroid/java/src/org/chromium/sync/signin/ChromeSigninController.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
pi/attachments/README
pi/attachments/attachment.cc
pi/attachments/attachment_store.h
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
pi/sync_data.cc
pi/sync_data.h
pi/sync_data_unittest.cc
pi/syncable_service.cc
pi/syncable_service.h
ngine/syncer_unittest.cc
ngine/syncer_util.h
ngine/syncer_util_unittest.cc
nternal_api/attachments/attachment_downloader_impl.cc
nternal_api/attachments/attachment_downloader_impl_unittest.cc
nternal_api/attachments/attachment_service_impl.cc
nternal_api/attachments/attachment_service_impl_unittest.cc
nternal_api/attachments/attachment_service_proxy.cc
nternal_api/attachments/attachment_service_proxy_for_test.cc
nternal_api/attachments/attachment_service_proxy_unittest.cc
nternal_api/attachments/attachment_uploader_impl.cc
nternal_api/attachments/attachment_uploader_impl_unittest.cc
nternal_api/attachments/task_queue.cc
nternal_api/attachments/task_queue_unittest.cc
nternal_api/http_bridge.cc
nternal_api/http_bridge_network_resources.cc
nternal_api/http_bridge_unittest.cc
nternal_api/public/attachments/attachment_downloader.h
nternal_api/public/attachments/attachment_service.h
nternal_api/public/attachments/attachment_service_impl.h
nternal_api/public/attachments/attachment_service_proxy.h
nternal_api/public/attachments/attachment_service_proxy_for_test.h
nternal_api/public/attachments/attachment_uploader.h
nternal_api/public/attachments/attachment_uploader_impl.h
nternal_api/public/attachments/task_queue.h
nternal_api/public/base/model_type.h
nternal_api/public/http_bridge.h
nternal_api/public/http_bridge_network_resources.h
nternal_api/public/network_resources.h
nternal_api/public/read_transaction.h
nternal_api/read_transaction.cc
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
rotocol/password_specifics.proto
rotocol/proto_value_conversions.cc
rotocol/sync_enums.proto
ync.gyp
ync_android.gypi
ync_tests.gypi
yncable/DEPS
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store_unittest.cc
yncable/directory_unittest.cc
yncable/model_type.cc
yncable/syncable_unittest.cc
est/accounts_client/test_accounts_client_unittest.cc
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/engine/test_directory_setter_upper.cc
est/fake_server/bookmark_entity.cc
est/fake_server/bookmark_entity.h
est/fake_server/fake_server.cc
est/fake_server/fake_server_entity.h
est/fake_server/fake_server_network_resources.cc
est/fake_server/fake_server_network_resources.h
est/fake_server/permanent_entity.cc
est/fake_server/permanent_entity.h
est/fake_server/tombstone_entity.cc
est/fake_server/tombstone_entity.h
est/fake_server/unique_client_entity.cc
est/fake_server/unique_client_entity.h
til/data_type_histogram_unittest.cc
til/get_session_name.cc
til/get_session_name.h
til/get_session_name_win.cc
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
UILD.gn
ngine/cryptographer_provider.cc
ngine/cryptographer_provider.h
ngine/directory_cryptographer_provider.cc
ngine/directory_cryptographer_provider.h
ngine/get_updates_delegate.cc
ngine/model_type_entity.cc
ngine/model_type_sync_proxy_impl.cc
ngine/model_type_sync_worker_impl.cc
ngine/model_type_sync_worker_impl.h
ngine/model_type_sync_worker_impl_unittest.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer_proto_util.cc
ngine/syncer_unittest.cc
nternal_api/public/configure_reason.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
rotocol/client_commands.proto
rotocol/get_updates_caller_info.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_value_conversions.cc
rotocol/sync_enums.proto
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/sync_session.h
essions/test_util.cc
ync.gyp
ync_tests.gypi
est/DEPS
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/simple_cryptographer_provider.cc
est/engine/simple_cryptographer_provider.h
est/fake_server/android/fake_server_helper_android.cc
est/fake_server/android/fake_server_helper_android.h
til/cryptographer.cc
til/cryptographer.h
til/cryptographer_unittest.cc
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
UILD.gn
RESUBMIT.py
ndroid/java/src/org/chromium/sync/notifier/InvalidationPreferences.java
pi/sync_error.cc
ngine/sync_scheduler_unittest.cc
nternal_api/attachments/attachment_downloader.cc
nternal_api/attachments/attachment_downloader_impl.cc
nternal_api/attachments/attachment_downloader_impl_unittest.cc
nternal_api/attachments/attachment_uploader_impl.cc
nternal_api/attachments/attachment_uploader_impl_unittest.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/public/attachments/attachment_downloader.h
nternal_api/public/attachments/attachment_downloader_impl.h
nternal_api/public/attachments/attachment_uploader_impl.h
nternal_api/public/base/attachment_id_proto.cc
nternal_api/public/base/attachment_id_proto_unittest.cc
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/sync_manager.cc
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/sync_backup_manager.cc
nternal_api/sync_backup_manager.h
nternal_api/sync_backup_manager_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/sync_rollback_manager.cc
nternal_api/sync_rollback_manager.h
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
nternal_api/sync_rollback_manager_base_unittest.cc
nternal_api/sync_rollback_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_internal_components_factory.cc
rotocol/proto_value_conversions.cc
essions/nudge_tracker.cc
ync.gyp
ync_tests.gypi
yncable/deferred_on_disk_directory_backing_store.cc
yncable/deferred_on_disk_directory_backing_store.h
yncable/deferred_on_disk_directory_backing_store_unittest.cc
ools/sync_client.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
UILD.gn
RESUBMIT.py
pi/attachments/README
pi/attachments/attachment_downloader.cc
pi/attachments/attachment_downloader.h
pi/attachments/attachment_service.cc
pi/attachments/attachment_service.h
pi/attachments/attachment_service_impl.cc
pi/attachments/attachment_service_impl.h
pi/attachments/attachment_service_impl_unittest.cc
pi/attachments/attachment_service_proxy.cc
pi/attachments/attachment_service_proxy.h
pi/attachments/attachment_service_proxy_for_test.cc
pi/attachments/attachment_service_proxy_for_test.h
pi/attachments/attachment_service_proxy_unittest.cc
pi/attachments/attachment_uploader.cc
pi/attachments/attachment_uploader.h
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
pi/sync_change_unittest.cc
pi/sync_data.cc
pi/sync_data.h
pi/sync_data_unittest.cc
pi/sync_error.cc
pi/sync_error.h
pi/sync_error_unittest.cc
ngine/cryptographer_provider.cc
ngine/cryptographer_provider.h
ngine/directory_cryptographer_provider.cc
ngine/directory_cryptographer_provider.h
ngine/entity_tracker.cc
ngine/entity_tracker.h
ngine/get_commit_ids.cc
ngine/get_commit_ids.h
ngine/get_updates_processor.h
ngine/get_updates_processor_unittest.cc
ngine/model_type_entity.cc
ngine/model_type_entity.h
ngine/model_type_entity_unittest.cc
ngine/model_type_sync_proxy.h
ngine/model_type_sync_proxy_impl.cc
ngine/model_type_sync_proxy_impl.h
ngine/model_type_sync_proxy_impl_unittest.cc
ngine/model_type_sync_worker.h
ngine/model_type_sync_worker_impl.cc
ngine/model_type_sync_worker_impl.h
ngine/model_type_sync_worker_impl_unittest.cc
ngine/non_blocking_sync_common.cc
ngine/non_blocking_sync_common.h
ngine/non_blocking_type_commit_contribution.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/syncer_unittest.cc
nternal_api/DEPS
nternal_api/attachments/attachment_downloader.cc
nternal_api/attachments/attachment_downloader_impl_unittest.cc
nternal_api/attachments/attachment_service.cc
nternal_api/attachments/attachment_service_impl.cc
nternal_api/attachments/attachment_service_impl_unittest.cc
nternal_api/attachments/attachment_service_proxy.cc
nternal_api/attachments/attachment_service_proxy_for_test.cc
nternal_api/attachments/attachment_service_proxy_unittest.cc
nternal_api/attachments/attachment_uploader.cc
nternal_api/attachments/fake_attachment_store.cc
nternal_api/attachments/fake_attachment_store_unittest.cc
nternal_api/http_bridge.cc
nternal_api/public/attachments/attachment_downloader.h
nternal_api/public/attachments/attachment_downloader_impl.h
nternal_api/public/attachments/attachment_service.h
nternal_api/public/attachments/attachment_service_impl.h
nternal_api/public/attachments/attachment_service_proxy.h
nternal_api/public/attachments/attachment_service_proxy_for_test.h
nternal_api/public/attachments/attachment_uploader.h
nternal_api/public/attachments/attachment_uploader_impl.h
nternal_api/public/attachments/fake_attachment_downloader.h
nternal_api/public/attachments/fake_attachment_store.h
nternal_api/public/attachments/fake_attachment_uploader.h
nternal_api/public/base/DEPS
nternal_api/public/base/ack_handle.cc
nternal_api/public/base/ack_handle.h
nternal_api/public/base/ack_handler.cc
nternal_api/public/base/ack_handler.h
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/invalidation_test_util.cc
nternal_api/public/base/invalidation_test_util.h
nternal_api/public/base/invalidation_util.cc
nternal_api/public/base/invalidation_util.h
nternal_api/public/base/invalidator_state.cc
nternal_api/public/base/invalidator_state.h
nternal_api/public/base/model_type.h
nternal_api/public/non_blocking_sync_common.cc
nternal_api/public/non_blocking_sync_common.h
nternal_api/public/shutdown_reason.h
nternal_api/public/sync_context.h
nternal_api/public/sync_context_proxy.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/null_sync_context_proxy.h
nternal_api/sync_backup_manager.cc
nternal_api/sync_backup_manager.h
nternal_api/sync_backup_manager_unittest.cc
nternal_api/sync_context_proxy_impl.cc
nternal_api/sync_context_proxy_impl.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/sync_rollback_manager.cc
nternal_api/sync_rollback_manager.h
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
nternal_api/sync_rollback_manager_base_unittest.cc
nternal_api/sync_rollback_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/null_sync_context_proxy.cc
nternal_api/write_node.cc
rotocol/BUILD.gn
rotocol/device_info_specifics.proto
rotocol/proto_value_conversions.cc
rotocol/sync.proto
rotocol/sync_proto_export.h
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
ync.gyp
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
ync_proto.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_unittest.cc
yncable/syncable_unittest.cc
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/injectable_sync_context_proxy.cc
est/engine/injectable_sync_context_proxy.h
est/engine/mock_model_type_sync_proxy.cc
est/engine/mock_model_type_sync_proxy.h
est/engine/mock_model_type_sync_worker.cc
est/engine/mock_model_type_sync_worker.h
est/engine/simple_cryptographer_provider.cc
est/engine/simple_cryptographer_provider.h
est/engine/single_type_mock_server.h
est/engine/test_syncable_utils.cc
est/engine/test_syncable_utils.h
est/fake_server/fake_server.cc
est/fake_server/fake_server_entity.cc
est/fake_server/unique_client_entity.cc
est/fake_server/unique_client_entity.h
ools/DEPS
ools/invalidation_helper.cc
ools/invalidation_helper.h
ools/null_invalidation_state_tracker.cc
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/sync_tools.gyp
til/cryptographer.cc
til/cryptographer.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
pi/attachments/attachment_downloader.cc
pi/attachments/attachment_downloader.h
pi/attachments/attachment_id.h
pi/attachments/attachment_service.h
pi/attachments/attachment_service_impl.cc
pi/attachments/attachment_service_impl.h
pi/attachments/attachment_service_impl_unittest.cc
pi/attachments/attachment_service_proxy.cc
pi/attachments/attachment_service_proxy.h
pi/attachments/attachment_service_proxy_for_test.cc
pi/attachments/attachment_service_proxy_unittest.cc
pi/attachments/attachment_uploader.h
pi/sync_data.h
pi/sync_data_unittest.cc
ngine/DEPS
ngine/commit_util.cc
ngine/conflict_resolver.cc
ngine/directory_commit_contribution_unittest.cc
ngine/directory_update_handler_unittest.cc
ngine/entity_tracker.cc
ngine/entity_tracker.h
ngine/entity_tracker_unittest.cc
ngine/get_commit_ids.cc
ngine/get_updates_processor_unittest.cc
ngine/model_thread_sync_entity.cc
ngine/model_thread_sync_entity.h
ngine/model_thread_sync_entity_unittest.cc
ngine/model_type_entity.cc
ngine/model_type_entity.h
ngine/model_type_entity_unittest.cc
ngine/model_type_sync_proxy.cc
ngine/model_type_sync_proxy.h
ngine/model_type_sync_proxy_impl.cc
ngine/model_type_sync_proxy_impl.h
ngine/model_type_sync_proxy_impl_unittest.cc
ngine/model_type_sync_worker.cc
ngine/model_type_sync_worker.h
ngine/model_type_sync_worker_impl.cc
ngine/model_type_sync_worker_impl.h
ngine/model_type_sync_worker_impl_unittest.cc
ngine/non_blocking_sync_common.h
ngine/non_blocking_type_commit_contribution.cc
ngine/non_blocking_type_commit_contribution.h
ngine/non_blocking_type_processor.cc
ngine/non_blocking_type_processor.h
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/non_blocking_type_processor_core_interface.cc
ngine/non_blocking_type_processor_core_interface.h
ngine/non_blocking_type_processor_core_unittest.cc
ngine/non_blocking_type_processor_interface.cc
ngine/non_blocking_type_processor_interface.h
ngine/non_blocking_type_processor_unittest.cc
ngine/nudge_handler.cc
ngine/nudge_handler.h
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/sync_thread_sync_entity.cc
ngine/sync_thread_sync_entity.h
ngine/sync_thread_sync_entity_unittest.cc
ngine/syncer_unittest.cc
ngine/syncer_util.cc
nternal_api/DEPS
nternal_api/attachments/attachment_downloader_impl.cc
nternal_api/attachments/attachment_downloader_impl_unittest.cc
nternal_api/attachments/attachment_uploader_impl.cc
nternal_api/attachments/attachment_uploader_impl_unittest.cc
nternal_api/attachments/fake_attachment_store.cc
nternal_api/attachments/fake_attachment_store_unittest.cc
nternal_api/attachments/fake_attachment_uploader.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/js_mutation_event_observer.cc
nternal_api/public/DEPS
nternal_api/public/attachments/attachment_downloader_impl.h
nternal_api/public/attachments/attachment_uploader_impl.h
nternal_api/public/base/DEPS
nternal_api/public/base/ack_handler.cc
nternal_api/public/base/ack_handler.h
nternal_api/public/base/attachment_id_proto.cc
nternal_api/public/base/attachment_id_proto.h
nternal_api/public/base/attachment_id_proto_unittest.cc
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/invalidation_interface.cc
nternal_api/public/base/invalidation_interface.h
nternal_api/public/base/invalidation_util.cc
nternal_api/public/base/invalidation_util.h
nternal_api/public/base/model_type_test_util.cc
nternal_api/public/base/model_type_test_util.h
nternal_api/public/base/object_id_invalidation_map_test_util.cc
nternal_api/public/base/object_id_invalidation_map_test_util.h
nternal_api/public/sync_context.h
nternal_api/public/sync_context_proxy.h
nternal_api/public/sync_core_proxy.h
nternal_api/public/sync_manager.cc
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/null_sync_context_proxy.h
nternal_api/public/test/null_sync_core_proxy.h
nternal_api/public/test/test_entry_factory.h
nternal_api/public/user_share.h
nternal_api/public/util/sync_db_util.h
nternal_api/public/write_transaction.h
nternal_api/sync_backup_manager.cc
nternal_api/sync_backup_manager.h
nternal_api/sync_backup_manager_unittest.cc
nternal_api/sync_context.cc
nternal_api/sync_context_proxy.cc
nternal_api/sync_context_proxy_impl.cc
nternal_api/sync_context_proxy_impl.h
nternal_api/sync_context_proxy_impl_unittest.cc
nternal_api/sync_core.cc
nternal_api/sync_core.h
nternal_api/sync_core_proxy.cc
nternal_api/sync_core_proxy_impl.cc
nternal_api/sync_core_proxy_impl.h
nternal_api/sync_core_proxy_impl_unittest.cc
nternal_api/sync_db_util.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/sync_rollback_manager.cc
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
nternal_api/sync_rollback_manager_base_unittest.cc
nternal_api/sync_rollback_manager_unittest.cc
nternal_api/syncapi_internal.cc
nternal_api/syncapi_internal.h
nternal_api/test/fake_sync_manager.cc
nternal_api/test/null_sync_context_proxy.cc
nternal_api/test/null_sync_core_proxy.cc
nternal_api/test/test_entry_factory.cc
nternal_api/write_transaction.cc
otifier/DEPS
otifier/ack_handler.cc
otifier/ack_handler.h
otifier/dropped_invalidation_tracker.cc
otifier/dropped_invalidation_tracker.h
otifier/invalidation_handler.h
otifier/invalidation_state_tracker.cc
otifier/invalidation_state_tracker.h
otifier/invalidation_util.cc
otifier/invalidation_util.h
otifier/invalidator.h
otifier/mock_ack_handler.cc
otifier/mock_ack_handler.h
otifier/object_id_invalidation_map.cc
otifier/object_id_invalidation_map.h
otifier/object_id_invalidation_map_unittest.cc
otifier/registration_manager.cc
otifier/registration_manager.h
otifier/registration_manager_unittest.cc
otifier/single_object_invalidation_set.cc
otifier/single_object_invalidation_set.h
otifier/single_object_invalidation_set_unittest.cc
otifier/unacked_invalidation_set.cc
otifier/unacked_invalidation_set.h
otifier/unacked_invalidation_set_test_util.cc
otifier/unacked_invalidation_set_test_util.h
otifier/unacked_invalidation_set_unittest.cc
rotocol/DEPS
rotocol/device_info_specifics.proto
rotocol/extension_specifics.proto
rotocol/proto_value_conversions.cc
essions/DEPS
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
ync.gyp
ync_core.gypi
ync_internal_api.gypi
ync_notifier.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
yncable/directory_unittest.cc
yncable/entry.cc
yncable/entry.h
yncable/entry_kernel.cc
yncable/entry_kernel.h
yncable/model_neutral_mutable_entry.cc
yncable/model_neutral_mutable_entry.h
yncable/model_type.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/syncable_columns.h
yncable/syncable_enum_conversions.cc
yncable/syncable_unittest.cc
yncable/write_transaction_info.cc
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/injectable_sync_context_proxy.cc
est/engine/injectable_sync_context_proxy.h
est/engine/injectable_sync_core_proxy.cc
est/engine/injectable_sync_core_proxy.h
est/engine/mock_model_type_sync_proxy.cc
est/engine/mock_model_type_sync_proxy.h
est/engine/mock_model_type_sync_worker.cc
est/engine/mock_model_type_sync_worker.h
est/engine/mock_non_blocking_type_processor.cc
est/engine/mock_non_blocking_type_processor.h
est/engine/mock_non_blocking_type_processor_core.cc
est/engine/mock_non_blocking_type_processor_core.h
est/engine/mock_nudge_handler.cc
est/engine/mock_nudge_handler.h
est/fake_server/fake_server.cc
est/fake_server/fake_server_entity.cc
est/fake_server/fake_server_entity.h
est/fake_server/permanent_entity.cc
est/fake_server/unique_client_entity.cc
est/fake_server/unique_client_entity.h
est/mock_invalidation.cc
est/mock_invalidation.h
est/mock_invalidation_tracker.cc
est/mock_invalidation_tracker.h
est/test_directory_backing_store.h
est/trackable_mock_invalidation.cc
est/trackable_mock_invalidation.h
ools/DEPS
ools/null_invalidation_state_tracker.cc
ools/null_invalidation_state_tracker.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/sync_tools.gyp
ools/testserver/chromiumsync.py
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
UILD.gn
pi/sync_error.cc
pi/sync_error.h
rotocol/BUILD.gn
rotocol/autofill_specifics.proto
rotocol/proto_value_conversions.cc
ync.gyp
ync_proto.gypi
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ndroid/java/src/org/chromium/sync/SyncSwitches.java
ndroid/java/src/org/chromium/sync/signin/ChromeSigninController.java
pi/fake_sync_change_processor.cc
pi/fake_sync_change_processor.h
ngine/non_blocking_type_processor_core_unittest.cc
ngine/non_blocking_type_processor_interface.h
ngine/non_blocking_type_processor_unittest.cc
ngine/sync_scheduler_impl.cc
nternal_api/attachments/attachment_uploader_impl.cc
nternal_api/attachments/attachment_uploader_impl_unittest.cc
nternal_api/http_bridge.cc
nternal_api/public/attachments/attachment_uploader_impl.h
nternal_api/public/base/model_type.h
nternal_api/public/http_bridge.h
ync_tests.gypi
yncable/model_type.cc
est/engine/injectable_sync_core_proxy.cc
est/engine/injectable_sync_core_proxy.h
est/engine/mock_non_blocking_type_processor.cc
est/engine/mock_non_blocking_type_processor.h
est/engine/mock_non_blocking_type_processor_core.cc
est/engine/mock_non_blocking_type_processor_core.h
est/engine/single_type_mock_server.cc
est/engine/single_type_mock_server.h
est/fake_server/bookmark_entity.cc
est/fake_server/bookmark_entity.h
est/fake_server/bookmark_entity_builder.cc
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/fake_server_entity.cc
est/fake_server/permanent_entity.cc
est/fake_server/permanent_entity.h
est/fake_server/unique_client_entity.cc
til/data_type_histogram.h
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
pi/attachments/attachment_id.h
pi/attachments/attachment_service_impl.cc
pi/attachments/attachment_service_impl.h
pi/attachments/attachment_service_impl_unittest.cc
ngine/apply_control_data_updates.cc
ngine/apply_control_data_updates_unittest.cc
ngine/directory_commit_contribution.cc
ngine/directory_commit_contribution_unittest.cc
ngine/directory_update_handler.cc
ngine/model_thread_sync_entity.cc
ngine/non_blocking_sync_common.cc
ngine/non_blocking_sync_common.h
ngine/non_blocking_type_commit_contribution.cc
ngine/non_blocking_type_commit_contribution.h
ngine/non_blocking_type_processor.cc
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/non_blocking_type_processor_core_unittest.cc
ngine/non_blocking_type_processor_interface.cc
ngine/non_blocking_type_processor_interface.h
ngine/non_blocking_type_processor_unittest.cc
ngine/sync_thread_sync_entity.cc
ngine/sync_thread_sync_entity.h
ngine/sync_thread_sync_entity_unittest.cc
ngine/syncer_unittest.cc
nternal_api/public/base/invalidator_state.cc
nternal_api/public/base/invalidator_state.h
nternal_api/public/base/model_type.h
nternal_api/public/read_node.h
nternal_api/public/sessions/status_counters.cc
nternal_api/public/sessions/status_counters.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/write_node.h
nternal_api/read_node.cc
nternal_api/sync_backup_manager_unittest.cc
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base_unittest.cc
nternal_api/sync_rollback_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/write_node.cc
otifier/DEPS
otifier/fake_invalidation_handler.cc
otifier/fake_invalidation_handler.h
otifier/fake_invalidation_state_tracker.cc
otifier/fake_invalidation_state_tracker.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/fake_invalidator_unittest.cc
otifier/gcm_network_channel.cc
otifier/gcm_network_channel.h
otifier/gcm_network_channel_delegate.h
otifier/gcm_network_channel_unittest.cc
otifier/invalidation_handler.h
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidation_notifier_unittest.cc
otifier/invalidation_state_tracker.cc
otifier/invalidation_state_tracker.h
otifier/invalidator.h
otifier/invalidator_registrar.cc
otifier/invalidator_registrar.h
otifier/invalidator_registrar_unittest.cc
otifier/invalidator_state.cc
otifier/invalidator_state.h
otifier/invalidator_test_template.cc
otifier/invalidator_test_template.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/p2p_invalidator_unittest.cc
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/push_client_channel_unittest.cc
otifier/state_writer.h
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
otifier/unacked_invalidation_set.cc
otifier/unacked_invalidation_set.h
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
essions/directory_type_debug_info_emitter.cc
essions/model_type_registry.cc
ync_core.gypi
ync_internal_api.gypi
ync_notifier.gypi
ync_tests.gypi
yncable/directory.cc
yncable/entry.cc
yncable/entry.h
yncable/model_neutral_mutable_entry.cc
yncable/model_neutral_mutable_entry.h
yncable/model_type.cc
yncable/model_type_unittest.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_util.cc
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
ools/DEPS
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/sync_tools.gyp
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
WNERS
pi/attachments/attachment_downloader.cc
pi/attachments/attachment_downloader.h
pi/attachments/attachment_service.h
pi/attachments/attachment_service_impl.cc
pi/attachments/attachment_service_impl.h
pi/attachments/attachment_service_proxy_for_test.cc
pi/attachments/attachment_store.h
pi/attachments/attachment_uploader.h
pi/attachments/fake_attachment_service.cc
pi/attachments/fake_attachment_service.h
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
pi/attachments/fake_attachment_uploader.cc
pi/attachments/fake_attachment_uploader.h
pi/attachments/fake_attachment_uploader_unittest.cc
pi/sync_data_unittest.cc
ngine/DEPS
ngine/commit_util.cc
ngine/conflict_resolver.cc
ngine/conflict_resolver.h
ngine/directory_commit_contribution.cc
ngine/directory_commit_contribution_unittest.cc
ngine/directory_update_handler.cc
ngine/directory_update_handler_unittest.cc
ngine/model_thread_sync_entity.cc
ngine/model_thread_sync_entity.h
ngine/model_thread_sync_entity_unittest.cc
ngine/non_blocking_sync_common.cc
ngine/non_blocking_sync_common.h
ngine/non_blocking_type_processor.cc
ngine/non_blocking_type_processor.h
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/non_blocking_type_processor_core_interface.cc
ngine/non_blocking_type_processor_core_interface.h
ngine/non_blocking_type_processor_unittest.cc
ngine/process_updates_util.cc
ngine/process_updates_util.h
ngine/syncer_unittest.cc
ngine/syncer_util.cc
ngine/syncer_util.h
ngine/syncer_util_unittest.cc
nternal_api/DEPS
nternal_api/attachments/DEPS
nternal_api/attachments/attachment_downloader_impl.cc
nternal_api/attachments/attachment_downloader_impl_unittest.cc
nternal_api/attachments/attachment_uploader_impl.cc
nternal_api/attachments/attachment_uploader_impl_unittest.cc
nternal_api/attachments/fake_attachment_downloader.cc
nternal_api/attachments/fake_attachment_downloader_unittest.cc
nternal_api/attachments/fake_attachment_store.cc
nternal_api/attachments/fake_attachment_store_unittest.cc
nternal_api/attachments/fake_attachment_uploader.cc
nternal_api/attachments/fake_attachment_uploader_unittest.cc
nternal_api/base_transaction.cc
nternal_api/http_bridge.cc
nternal_api/non_blocking_type_processor.cc
nternal_api/public/attachments/attachment_downloader_impl.h
nternal_api/public/attachments/attachment_uploader_impl.h
nternal_api/public/attachments/fake_attachment_downloader.h
nternal_api/public/attachments/fake_attachment_store.h
nternal_api/public/attachments/fake_attachment_uploader.h
nternal_api/public/base/unique_position.cc
nternal_api/public/base/unique_position.h
nternal_api/public/configure_reason.h
nternal_api/public/http_bridge.h
nternal_api/public/non_blocking_type_processor.h
nternal_api/public/sync_core_proxy.h
nternal_api/public/sync_manager.h
nternal_api/public/sync_manager_factory.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/null_sync_core_proxy.h
nternal_api/public/write_transaction.h
nternal_api/sync_backup_manager.cc
nternal_api/sync_core.cc
nternal_api/sync_core.h
nternal_api/sync_core_proxy_impl.cc
nternal_api/sync_core_proxy_impl.h
nternal_api/sync_core_proxy_impl_unittest.cc
nternal_api/sync_manager_factory.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_rollback_manager.cc
nternal_api/sync_rollback_manager.h
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
nternal_api/sync_rollback_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/null_sync_core_proxy.cc
nternal_api/test/sync_manager_factory_for_profile_sync_test.cc
nternal_api/write_node.cc
nternal_api/write_transaction.cc
otifier/gcm_network_channel.cc
rotocol/sync.proto
rotocol/sync_protocol_error.cc
rotocol/sync_protocol_error.h
essions/directory_type_debug_info_emitter.cc
essions/directory_type_debug_info_emitter.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
ync_android.gypi
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_unittest.cc
yncable/model_type.cc
yncable/model_type_unittest.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_util.cc
yncable/syncable_unittest.cc
est/fake_server/bookmark_entity.cc
est/fake_server/bookmark_entity_builder.h
est/fake_server/entity_builder_factory.h
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/fake_server_http_post_provider.h
est/fake_server/fake_server_network_resources.h
ools/sync_client.cc
ools/sync_tools.gyp
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
pi/attachments/attachment_id.cc
pi/attachments/attachment_service.h
pi/attachments/attachment_service_proxy.cc
pi/attachments/attachment_service_proxy.h
pi/attachments/attachment_service_proxy_unittest.cc
pi/attachments/attachment_uploader.cc
pi/attachments/attachment_uploader.h
pi/attachments/fake_attachment_service.cc
pi/attachments/fake_attachment_service.h
pi/attachments/fake_attachment_uploader.cc
pi/attachments/fake_attachment_uploader.h
pi/attachments/fake_attachment_uploader_unittest.cc
pi/sync_data.cc
pi/sync_data.h
ngine/directory_commit_contribution.cc
ngine/directory_commit_contribution.h
ngine/directory_commit_contribution_unittest.cc
ngine/directory_commit_contributor.cc
ngine/directory_commit_contributor.h
ngine/directory_update_handler.cc
ngine/directory_update_handler.h
ngine/directory_update_handler_unittest.cc
ngine/get_commit_ids.cc
nternal_api/base_node.cc
nternal_api/http_bridge.cc
nternal_api/public/base/attachment_id_proto.cc
nternal_api/public/base/attachment_id_proto.h
nternal_api/public/base_transaction.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/write_node.h
nternal_api/sync_backup_manager.cc
nternal_api/sync_backup_manager.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
nternal_api/test/fake_sync_manager.cc
nternal_api/write_node.cc
otifier/gcm_network_channel.cc
otifier/gcm_network_channel.h
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/sync_invalidation_listener.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/attachments.proto
rotocol/extension_specifics.proto
rotocol/proto_value_conversions.cc
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
ync_api.gypi
ync_internal_api.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_unittest.cc
yncable/directory_unittest.h
yncable/entry_kernel.h
yncable/mutable_entry.cc
yncable/mutable_entry.h
est/fake_server/bookmark_entity.h
est/fake_server/bookmark_entity_builder.cc
est/fake_server/bookmark_entity_builder.h
est/fake_server/entity_builder.cc
est/fake_server/entity_builder.h
est/fake_server/entity_builder_factory.cc
est/fake_server/entity_builder_factory.h
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/fake_server_entity.h
est/fake_server/fake_server_http_post_provider.cc
est/fake_server/fake_server_http_post_provider.h
est/fake_server/fake_server_network_resources.cc
est/fake_server/fake_sync_server_http_handler.cc
est/fake_server/fake_sync_server_http_handler.h
est/fake_server/run_sync_fake_server.cc
til/cryptographer_unittest.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
pi/attachments/attachment_service_proxy_for_test.cc
pi/attachments/attachment_service_proxy_for_test.h
pi/attachments/fake_attachment_service.cc
ngine/all_status.cc
ngine/directory_type_debug_info_emitter.cc
ngine/directory_type_debug_info_emitter.h
ngine/get_updates_processor.cc
nternal_api/non_blocking_type_processor.cc
nternal_api/public/engine/sync_status.cc
nternal_api/public/engine/sync_status.h
nternal_api/public/non_blocking_type_processor.h
nternal_api/public/sessions/commit_counters.cc
nternal_api/public/sessions/commit_counters.h
nternal_api/public/sessions/model_neutral_state.cc
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/sessions/status_counters.cc
nternal_api/public/sessions/status_counters.h
nternal_api/public/sessions/sync_session_snapshot.cc
nternal_api/public/sessions/sync_session_snapshot.h
nternal_api/public/sessions/sync_session_snapshot_unittest.cc
nternal_api/public/sessions/type_debug_info_observer.cc
nternal_api/public/sessions/type_debug_info_observer.h
nternal_api/public/sessions/update_counters.cc
nternal_api/public/sessions/update_counters.h
nternal_api/public/sync_auth_provider.h
nternal_api/public/sync_core_proxy.h
nternal_api/public/test/null_sync_core_proxy.h
nternal_api/sync_core_proxy_impl.cc
nternal_api/sync_core_proxy_impl.h
nternal_api/sync_core_proxy_impl_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/test/null_sync_core_proxy.cc
otifier/gcm_network_channel.h
otifier/gcm_network_channel_delegate.h
rotocol/app_specifics.proto
rotocol/extension_specifics.proto
rotocol/proto_value_conversions.cc
essions/directory_type_debug_info_emitter.cc
essions/directory_type_debug_info_emitter.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/status_controller.cc
essions/status_controller.h
essions/status_controller_unittest.cc
essions/test_util.cc
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
yncable/directory_unittest.cc
yncable/directory_unittest.h
yncable/syncable_unittest.cc
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
WNERS
pi/attachments/attachment_service.h
pi/attachments/attachment_service_proxy.cc
pi/attachments/attachment_service_proxy_unittest.cc
pi/attachments/attachment_store.h
pi/attachments/fake_attachment_service.cc
pi/attachments/fake_attachment_service.h
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
ngine/commit_util.cc
ngine/syncer_proto_util.cc
nternal_api/public/base/model_type.h
nternal_api/public/util/syncer_error.cc
nternal_api/public/util/syncer_error.h
nternal_api/public/write_node.h
nternal_api/sync_backup_manager.cc
nternal_api/sync_backup_manager.h
nternal_api/sync_backup_manager_unittest.cc
nternal_api/sync_manager_impl_unittest.cc
nternal_api/sync_rollback_manager.cc
nternal_api/sync_rollback_manager.h
nternal_api/sync_rollback_manager_base.cc
nternal_api/sync_rollback_manager_base.h
nternal_api/sync_rollback_manager_base_unittest.cc
nternal_api/sync_rollback_manager_unittest.cc
nternal_api/syncapi_internal.h
nternal_api/write_node.cc
otifier/fake_invalidation_state_tracker.cc
otifier/fake_invalidation_state_tracker.h
otifier/invalidation_state_tracker.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
rotocol/password_specifics.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/session_specifics.proto
rotocol/sync.proto
rotocol/sync_enums.proto
rotocol/sync_protocol_error.cc
rotocol/sync_protocol_error.h
rotocol/synced_notification_app_info_specifics.proto
ync_internal_api.gypi
ync_tests.gypi
yncable/directory_unittest.cc
yncable/directory_unittest.h
yncable/entry_kernel_unittest.cc
yncable/model_type.cc
yncable/syncable_unittest.cc
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/fake_server_verifier.cc
est/fake_server/fake_server_verifier.h
ools/null_invalidation_state_tracker.cc
ools/null_invalidation_state_tracker.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/chromiumsync.py
ools/testserver/sync_testserver.py
ools/testserver/synced_notifications.html
ools/testserver/synced_notifications_app_info.html
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
RESUBMIT.py
pi/attachments/attachment_service_proxy.cc
pi/attachments/attachment_service_proxy.h
pi/attachments/attachment_service_proxy_for_test.cc
pi/attachments/attachment_service_proxy_for_test.h
pi/sync_change_unittest.cc
pi/sync_data.cc
pi/sync_data.h
pi/sync_data_unittest.cc
ngine/all_status.cc
ngine/backoff_delay_provider.cc
ngine/backoff_delay_provider_unittest.cc
ngine/directory_update_handler.cc
ngine/directory_update_handler.h
ngine/directory_update_handler_unittest.cc
ngine/get_updates_processor.cc
ngine/get_updates_processor.h
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/update_handler.h
nternal_api/js_sync_encryption_handler_observer.cc
nternal_api/js_sync_manager_observer.cc
nternal_api/non_blocking_type_processor.cc
nternal_api/public/engine/sync_status.cc
nternal_api/public/engine/sync_status.h
nternal_api/public/non_blocking_type_processor.h
nternal_api/public/read_transaction.h
nternal_api/public/sync_core_proxy.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/null_sync_core_proxy.h
nternal_api/public/util/syncer_error.cc
nternal_api/public/util/syncer_error.h
nternal_api/read_transaction.cc
nternal_api/sync_core_proxy.cc
nternal_api/sync_core_proxy_impl.cc
nternal_api/sync_core_proxy_impl.h
nternal_api/sync_core_proxy_impl_unittest.cc
nternal_api/sync_core_proxy_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/test/fake_sync_manager.cc
nternal_api/test/null_sync_core_proxy.cc
s/README.js
s/js_arg_list.cc
s/js_arg_list.h
s/js_arg_list_unittest.cc
s/js_backend.h
s/js_controller.h
s/js_reply_handler.h
s/js_test_util.cc
s/js_test_util.h
s/sync_js_controller.cc
s/sync_js_controller.h
s/sync_js_controller_unittest.cc
otifier/invalidation_util.h
rotocol/autofill_specifics.proto
rotocol/proto_value_conversions.cc
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/syncable_unittest.cc
est/engine/mock_update_handler.cc
est/engine/mock_update_handler.h
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
pi/sync_change_processor.cc
pi/sync_change_processor.h
ngine/directory_commit_contribution.cc
ngine/directory_commit_contribution.h
ngine/directory_type_debug_info_emitter.cc
ngine/directory_type_debug_info_emitter.h
ngine/directory_update_handler.cc
ngine/directory_update_handler.h
ngine/directory_update_handler_unittest.cc
ngine/get_updates_processor.cc
ngine/get_updates_processor_unittest.cc
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/syncer_unittest.cc
ngine/update_handler.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/write_transaction.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/write_transaction.cc
rotocol/proto_value_conversions.cc
rotocol/sync.proto
rotocol/synced_notification_app_info_specifics.proto
rotocol/synced_notification_data.proto
essions/model_type_registry.cc
essions/model_type_registry.h
ync_core.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
est/engine/mock_update_handler.cc
est/engine/mock_update_handler.h
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/permanent_entity.cc
est/fake_server/permanent_entity.h
est/fake_server/unique_client_entity.cc
est/fake_server/unique_client_entity.h
est/test_directory_backing_store.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
pi/attachments/attachment.cc
pi/attachments/attachment.h
pi/attachments/attachment_id.cc
pi/attachments/attachment_id.h
pi/attachments/attachment_service.cc
pi/attachments/attachment_service.h
pi/attachments/attachment_service_proxy.cc
pi/attachments/attachment_service_proxy.h
pi/attachments/attachment_service_proxy_unittest.cc
pi/attachments/attachment_store.h
pi/attachments/attachment_unittest.cc
pi/attachments/fake_attachment_service.cc
pi/attachments/fake_attachment_service.h
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
pi/sync_change.cc
pi/sync_change_processor.h
pi/sync_change_unittest.cc
pi/sync_data.cc
pi/sync_data.h
pi/sync_data_unittest.cc
ngine/get_commit_ids.cc
ngine/sync_scheduler_unittest.cc
ngine/syncer_proto_util.cc
ngine/syncer_unittest.cc
ngine/traffic_recorder.cc
ngine/traffic_recorder.h
ngine/traffic_recorder_unittest.cc
nternal_api/base_node.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/protocol_event_buffer.cc
nternal_api/protocol_event_buffer.h
nternal_api/protocol_event_buffer_unittest.cc
nternal_api/public/DEPS
nternal_api/public/base_node.h
nternal_api/public/events/commit_request_event.h
nternal_api/public/events/commit_response_event.h
nternal_api/public/events/configure_get_updates_request_event.h
nternal_api/public/events/get_updates_response_event.h
nternal_api/public/events/normal_get_updates_request_event.h
nternal_api/public/events/poll_get_updates_request_event.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_internal_components_factory.cc
otifier/invalidation_util.h
rotocol/attachments.proto
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/sync.proto
essions/sync_session_context.cc
essions/sync_session_context.h
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
ync_proto.gypi
ync_tests.gypi
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
yncable/entry.cc
yncable/entry.h
yncable/entry_kernel.cc
yncable/entry_kernel.h
yncable/syncable_columns.h
yncable/syncable_enum_conversions.cc
yncable/syncable_enum_conversions.h
yncable/syncable_enum_conversions_unittest.cc
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/test_directory_backing_store.h
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
est/fake_server/fake_sync_server_http_handler.cc
est/fake_server/fake_sync_server_http_handler.h
est/fake_server/run_sync_fake_server.cc
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ngine/DEPS
ngine/all_status.cc
ngine/all_status.h
ngine/commit.cc
ngine/get_updates_delegate.cc
ngine/get_updates_delegate.h
ngine/get_updates_processor.cc
ngine/get_updates_processor.h
ngine/get_updates_processor_unittest.cc
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/sync_engine_event_listener.h
ngine/sync_scheduler_impl.cc
ngine/syncer.cc
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/events/commit_request_event.cc
nternal_api/events/commit_request_event.h
nternal_api/events/commit_response_event.cc
nternal_api/events/commit_response_event.h
nternal_api/events/configure_get_updates_request_event.cc
nternal_api/events/configure_get_updates_request_event.h
nternal_api/events/get_updates_response_event.cc
nternal_api/events/get_updates_response_event.h
nternal_api/events/normal_get_updates_request_event.cc
nternal_api/events/normal_get_updates_request_event.h
nternal_api/events/poll_get_updates_request_event.cc
nternal_api/events/poll_get_updates_request_event.h
nternal_api/js_sync_manager_observer.cc
nternal_api/js_sync_manager_observer.h
nternal_api/non_blocking_type_processor.cc
nternal_api/public/events/commit_request_event.h
nternal_api/public/events/commit_response_event.h
nternal_api/public/events/configure_get_updates_request_event.h
nternal_api/public/events/get_updates_response_event.h
nternal_api/public/events/normal_get_updates_request_event.h
nternal_api/public/events/poll_get_updates_request_event.h
nternal_api/public/non_blocking_type_processor.h
nternal_api/public/sync_core_proxy.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/util/experiments.h
nternal_api/sync_core.cc
nternal_api/sync_core.h
nternal_api/sync_core_proxy.cc
nternal_api/sync_core_proxy_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/test/fake_sync_manager.cc
otifier/DEPS
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/gcm_network_channel.cc
otifier/gcm_network_channel.h
otifier/gcm_network_channel_unittest.cc
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidator.h
otifier/invalidator_registrar_unittest.cc
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/registration_manager.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
rotocol/experiments_specifics.proto
rotocol/proto_value_conversions.cc
essions/DEPS
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
essions/sync_session.cc
essions/sync_session.h
ync_internal_api.gypi
ync_tests.gypi
est/engine/mock_update_handler.cc
est/engine/mock_update_handler.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
WNERS
ndroid/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
pi/attachments/attachment.cc
pi/attachments/attachment.h
pi/attachments/attachment_id.cc
pi/attachments/attachment_id.h
pi/attachments/attachment_id_unittest.cc
pi/attachments/attachment_store.h
pi/attachments/attachment_unittest.cc
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
ngine/commit_contributor.h
ngine/non_blocking_type_processor_core.cc
ngine/non_blocking_type_processor_core.h
ngine/sync_scheduler_impl.cc
ngine/syncer.cc
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/debug_info_event_listener_unittest.cc
nternal_api/events/commit_request_event.cc
nternal_api/events/commit_request_event.h
nternal_api/events/commit_response_event.cc
nternal_api/events/commit_response_event.h
nternal_api/events/configure_get_updates_request_event.cc
nternal_api/events/configure_get_updates_request_event.h
nternal_api/events/get_updates_response_event.cc
nternal_api/events/get_updates_response_event.h
nternal_api/events/normal_get_updates_request_event.cc
nternal_api/events/normal_get_updates_request_event.h
nternal_api/events/poll_get_updates_request_event.cc
nternal_api/events/poll_get_updates_request_event.h
nternal_api/events/protocol_event.cc
nternal_api/public/base/model_type.h
nternal_api/public/events/protocol_event.h
nternal_api/sync_manager_impl.cc
otifier/gcm_network_channel.cc
otifier/gcm_network_channel.h
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/attachments.proto
rotocol/client_debug_info.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_enum_conversions.h
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/sync.proto
rotocol/sync_enums.proto
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/sync_session_context.cc
essions/sync_session_context.h
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
ync_proto.gypi
ync_tests.gypi
yncable/model_type.cc
yncable/model_type_unittest.cc
est/fake_server/fake_sync_server_http_handler.cc
est/fake_server/fake_sync_server_http_handler.h
est/fake_server/run_sync_fake_server.cc
ools/testserver/OWNERS
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
RESUBMIT.py
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
pi/attachments/attachment.cc
pi/attachments/attachment.h
pi/attachments/attachment_store.h
pi/attachments/attachment_unittest.cc
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
pi/fake_sync_change_processor.cc
pi/fake_sync_change_processor.h
pi/sync_change_processor_wrapper_for_test.cc
pi/sync_change_processor_wrapper_for_test.h
pi/sync_data_unittest.cc
ngine/commit.cc
ngine/commit.h
ngine/commit_contribution.cc
ngine/commit_contribution.h
ngine/commit_contributor.cc
ngine/commit_contributor.h
ngine/commit_processor.cc
ngine/commit_processor.h
ngine/directory_commit_contribution.cc
ngine/directory_commit_contribution.h
ngine/directory_commit_contribution_unittest.cc
ngine/directory_commit_contributor.cc
ngine/directory_commit_contributor.h
ngine/directory_update_handler.cc
ngine/directory_update_handler.h
ngine/directory_update_handler_unittest.cc
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/get_updates_delegate.cc
ngine/get_updates_delegate.h
ngine/get_updates_processor.cc
ngine/get_updates_processor.h
ngine/get_updates_processor_unittest.cc
ngine/process_updates_util.cc
ngine/process_updates_util.h
ngine/sync_directory_commit_contribution.cc
ngine/sync_directory_commit_contribution.h
ngine/sync_directory_commit_contribution_unittest.cc
ngine/sync_directory_commit_contributor.cc
ngine/sync_directory_commit_contributor.h
ngine/sync_directory_update_handler.cc
ngine/sync_directory_update_handler.h
ngine/sync_directory_update_handler_unittest.cc
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/update_handler.cc
ngine/update_handler.h
nternal_api/base_node.cc
nternal_api/http_bridge.cc
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_internal.cc
nternal_api/syncapi_internal.h
nternal_api/test/fake_sync_manager.cc
otifier/fake_invalidation_handler.cc
otifier/fake_invalidation_handler.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/gcm_network_channel.cc
otifier/gcm_network_channel.h
otifier/gcm_network_channel_delegate.h
otifier/gcm_network_channel_unittest.cc
otifier/invalidation_handler.h
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidator.h
otifier/invalidator_registrar.cc
otifier/invalidator_registrar.h
otifier/invalidator_registrar_unittest.cc
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/push_client_channel_unittest.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/managed_user_specifics.proto
rotocol/sync.proto
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/test_util.cc
essions/test_util.h
ync_core.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store_unittest.cc
yncable/model_type.cc
est/accounts_client/url_request_context_getter.cc
est/engine/mock_update_handler.cc
est/engine/mock_update_handler.h
est/fake_server/bookmark_entity.cc
est/fake_server/bookmark_entity.h
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/fake_server_entity.cc
est/fake_server/fake_server_entity.h
est/fake_server/fake_server_http_post_provider.cc
est/fake_server/fake_server_http_post_provider.h
est/fake_server/fake_server_network_resources.cc
est/fake_server/fake_server_network_resources.h
est/fake_server/permanent_entity.cc
est/fake_server/permanent_entity.h
est/fake_server/tombstone_entity.cc
est/fake_server/tombstone_entity.h
est/fake_server/unique_client_entity.cc
est/fake_server/unique_client_entity.h
est/local_sync_test_server.cc
est/local_sync_test_server.h
est/test_directory_backing_store.h
ools/sync_listen_notifications.cc
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
WNERS
ndroid/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationClientNameGenerator.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationClientNameProvider.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationPreferences.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/SyncContentResolverDelegate.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/java/src/org/chromium/sync/notifier/SystemSyncContentResolverDelegate.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ndroid/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ndroid/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
ndroid/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java
pi/attachments/attachment.cc
pi/attachments/attachment.h
pi/attachments/attachment_store.cc
pi/attachments/attachment_store.h
pi/attachments/attachment_unittest.cc
pi/attachments/fake_attachment_store.cc
pi/attachments/fake_attachment_store.h
pi/attachments/fake_attachment_store_unittest.cc
pi/fake_sync_change_processor.cc
pi/fake_sync_change_processor.h
ngine/all_status.cc
ngine/all_status.h
ngine/commit.cc
ngine/commit.h
ngine/commit_processor.cc
ngine/commit_processor.h
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/get_updates_delegate.cc
ngine/get_updates_delegate.h
ngine/get_updates_processor.cc
ngine/get_updates_processor.h
ngine/process_updates_util.cc
ngine/process_updates_util.h
ngine/sync_cycle_event.cc
ngine/sync_cycle_event.h
ngine/sync_directory_commit_contributor.h
ngine/sync_directory_update_handler.cc
ngine/sync_directory_update_handler.h
ngine/sync_directory_update_handler_unittest.cc
ngine/sync_engine_event.cc
ngine/sync_engine_event.h
ngine/sync_engine_event_listener.cc
ngine/sync_engine_event_listener.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
nternal_api/base_node.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/http_bridge.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/js_sync_manager_observer.cc
nternal_api/js_sync_manager_observer.h
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/base/cancelation_signal_unittest.cc
nternal_api/public/base/model_type.h
nternal_api/public/base/model_type_test_util.cc
nternal_api/public/base/model_type_test_util.h
nternal_api/public/base/ordinal.h
nternal_api/public/base/progress_marker_map.cc
nternal_api/public/base_node.h
nternal_api/public/change_record_unittest.cc
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/public/util/experiments.h
nternal_api/public/write_node.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_internal_components_factory.cc
nternal_api/write_node.cc
s/js_test_util.cc
s/js_test_util.h
otifier/DEPS
otifier/dropped_invalidation_tracker.cc
otifier/dropped_invalidation_tracker.h
otifier/gcm_network_channel.cc
otifier/gcm_network_channel.h
otifier/gcm_network_channel_delegate.h
otifier/gcm_network_channel_unittest.cc
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidation_notifier_unittest.cc
otifier/mock_ack_handler.cc
otifier/mock_ack_handler.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/object_id_invalidation_map.cc
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/single_object_invalidation_set.cc
otifier/single_object_invalidation_set.h
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
otifier/unacked_invalidation_set.cc
rotocol/app_list_specifics.proto
rotocol/app_specifics.proto
rotocol/attachments.proto
rotocol/autofill_specifics.proto
rotocol/client_commands.proto
rotocol/experiments_specifics.proto
rotocol/get_updates_caller_info.proto
rotocol/managed_user_shared_setting_specifics.proto
rotocol/nigori_specifics.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_enum_conversions.h
rotocol/proto_enum_conversions_unittest.cc
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/session_specifics.proto
rotocol/sync.proto
rotocol/sync_enums.proto
rotocol/synced_notification_app_info_specifics.proto
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/model_type_registry.cc
essions/model_type_registry.h
essions/model_type_registry_unittest.cc
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/status_controller.cc
essions/status_controller.h
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
essions/test_util.cc
essions/test_util.h
ync_android.gypi
ync_api.gypi
ync_core.gypi
ync_notifier.gypi
ync_proto.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/entry.cc
yncable/entry_kernel.cc
yncable/model_type.cc
yncable/model_type_unittest.cc
yncable/nigori_util.cc
yncable/syncable_unittest.cc
est/DEPS
est/accounts_client/test_accounts_client.cc
est/accounts_client/test_accounts_client_unittest.cc
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/fake_server/fake_server.cc
est/fake_server/fake_server.h
est/fake_server/fake_server_http_post_provider.cc
est/fake_server/fake_server_http_post_provider.h
est/fake_server/fake_server_network_resources.cc
est/fake_server/fake_server_network_resources.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/chromiumsync.py
til/data_type_histogram.h
til/time.cc
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ngine/apply_updates_and_resolve_conflicts_command.cc
ngine/apply_updates_and_resolve_conflicts_command.h
ngine/apply_updates_and_resolve_conflicts_command_unittest.cc
ngine/commit_util.cc
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/get_commit_ids.cc
ngine/model_changing_syncer_command.cc
ngine/model_changing_syncer_command.h
ngine/model_changing_syncer_command_unittest.cc
ngine/sync_directory_update_handler.cc
ngine/sync_directory_update_handler.h
ngine/sync_directory_update_handler_unittest.cc
ngine/sync_engine_event.h
ngine/sync_scheduler_impl.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_command.cc
ngine/syncer_command.h
ngine/syncer_unittest.cc
ngine/update_applicator.cc
ngine/update_applicator.h
nternal_api/http_bridge_network_resources.cc
nternal_api/public/base/unique_position_unittest.cc
nternal_api/public/http_bridge.h
nternal_api/public/http_bridge_network_resources.h
nternal_api/public/network_resources.h
nternal_api/public/network_time_update_callback.h
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/test/sync_manager_factory_for_profile_sync_test.h
nternal_api/public/util/syncer_error.cc
nternal_api/public/util/syncer_error.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_manager_impl_unittest.cc
nternal_api/test/sync_manager_factory_for_profile_sync_test.cc
nternal_api/test/sync_manager_for_profile_sync_test.cc
nternal_api/test/sync_manager_for_profile_sync_test.h
nternal_api/write_node.cc
s/sync_js_controller_unittest.cc
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/push_client_channel_unittest.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/bookmark_specifics.proto
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions_unittest.cc
essions/status_controller.cc
essions/status_controller.h
essions/status_controller_unittest.cc
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
ync_core.gypi
ync_internal_api.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/syncable_util.cc
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
est/fake_encryptor.cc
ools/null_invalidation_state_tracker.cc
ools/testserver/chromiumsync.py
ools/testserver/sync_testserver.py
ools/testserver/synced_notifications.html
til/cryptographer.cc
til/nigori.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ndroid/java/src/org/chromium/sync/notifier/InvalidationClientNameGenerator.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationClientNameProvider.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ngine/apply_control_data_updates.cc
ngine/apply_control_data_updates.h
ngine/apply_control_data_updates_unittest.cc
ngine/commit.cc
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/net/server_connection_manager.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/debug_info_event_listener_unittest.cc
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/model_type_test_util.cc
nternal_api/public/base/ordinal.h
nternal_api/public/base/unique_position.cc
nternal_api/public/base/unique_position_unittest.cc
nternal_api/public/sessions/model_neutral_state.cc
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/sync_manager.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl_unittest.cc
otifier/ack_tracker.cc
otifier/ack_tracker.h
otifier/ack_tracker_unittest.cc
otifier/fake_invalidation_handler.h
otifier/fake_invalidation_state_tracker.cc
otifier/fake_invalidation_state_tracker.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/invalidation_handler.h
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidation_notifier_unittest.cc
otifier/invalidation_state_tracker.cc
otifier/invalidation_state_tracker.h
otifier/invalidator.h
otifier/invalidator_registrar_unittest.cc
otifier/invalidator_test_template.h
otifier/mock_ack_handler.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/object_id_invalidation_map.cc
otifier/object_id_invalidation_map.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/p2p_invalidator_unittest.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
otifier/unacked_invalidation_set.h
otifier/unacked_invalidation_set_test_util.cc
otifier/unacked_invalidation_set_test_util.h
otifier/unacked_invalidation_set_unittest.cc
rotocol/extension_specifics.proto
rotocol/unique_position.proto
essions/debug_info_getter.h
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/status_controller.cc
essions/status_controller.h
essions/sync_session.h
essions/sync_session_unittest.cc
ync_android.gypi
ync_internal_api.gypi
ync_notifier.gypi
ync_tests.gypi
yncable/directory_backing_store.cc
est/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
est/sessions/mock_debug_info_getter.cc
est/sessions/mock_debug_info_getter.h
ools/null_invalidation_state_tracker.cc
ools/null_invalidation_state_tracker.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/chromiumsync.py
ools/testserver/sync_testserver.py
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ndroid/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java
ngine/all_status.cc
ngine/download.cc
ngine/download.h
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/process_updates_command.cc
ngine/process_updates_command.h
ngine/process_updates_command_unittest.cc
ngine/process_updates_util.cc
ngine/process_updates_util.h
ngine/store_timestamps_command.cc
ngine/store_timestamps_command.h
ngine/store_timestamps_command_unittest.cc
ngine/sync_directory_update_handler.cc
ngine/sync_directory_update_handler.h
ngine/sync_directory_update_handler_unittest.cc
ngine/sync_engine_event.h
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util_unittest.cc
ngine/syncer_types.h
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/js_sync_manager_observer.cc
nternal_api/js_sync_manager_observer.h
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/base/DEPS
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/sync_manager_factory_for_profile_sync_test.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_server_connection_manager.cc
nternal_api/syncapi_server_connection_manager.h
nternal_api/syncapi_server_connection_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/sync_manager_factory_for_profile_sync_test.cc
nternal_api/test/sync_manager_for_profile_sync_test.cc
nternal_api/test/sync_manager_for_profile_sync_test.h
otifier/ack_handler.cc
otifier/ack_handler.h
otifier/dropped_invalidation_tracker.cc
otifier/dropped_invalidation_tracker.h
otifier/invalidation_util.cc
otifier/invalidation_util.h
otifier/mock_ack_handler.cc
otifier/mock_ack_handler.h
otifier/single_object_invalidation_set.cc
otifier/single_object_invalidation_set.h
otifier/unacked_invalidation_set.cc
otifier/unacked_invalidation_set.h
otifier/unacked_invalidation_set_unittest.cc
rotocol/extension_specifics.proto
essions/nudge_tracker.cc
essions/nudge_tracker_unittest.cc
essions/sync_session_context.cc
essions/sync_session_context.h
ync_android.gypi
ync_core.gypi
ync_notifier.gypi
ync_tests.gypi
yncable/model_type.cc
est/android/OWNERS
est/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
est/engine/mock_connection_manager.cc
ools/sync_client.cc
ools/testserver/chromiumsync.py
til/DEPS
til/get_session_name.cc
til/get_session_name_unittest.cc
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ngine/build_commit_command.cc
ngine/build_commit_command.h
ngine/commit.cc
ngine/commit.h
ngine/commit_util.cc
ngine/commit_util.h
ngine/get_commit_ids.cc
ngine/get_commit_ids.h
ngine/process_commit_response_command.cc
ngine/process_commit_response_command.h
ngine/process_commit_response_command_unittest.cc
ngine/process_updates_command.cc
ngine/process_updates_command.h
ngine/process_updates_command_unittest.cc
ngine/sync_directory_commit_contribution.cc
ngine/sync_directory_commit_contribution.h
ngine/sync_directory_commit_contribution_unittest.cc
ngine/sync_directory_commit_contributor.cc
ngine/sync_directory_commit_contributor.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_unittest.cc
ngine/syncer_util.cc
ngine/syncer_util.h
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/js_mutation_event_observer.h
nternal_api/public/base/DEPS
nternal_api/public/base/ack_handle.cc
nternal_api/public/base/ack_handle.h
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/invalidation_test_util.cc
nternal_api/public/base/invalidation_test_util.h
nternal_api/public/base/model_type.h
nternal_api/public/base/model_type_test_util.cc
nternal_api/public/base/object_id_invalidation_map_test_util.cc
nternal_api/public/base/object_id_invalidation_map_test_util.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
otifier/invalidation_notifier_unittest.cc
otifier/invalidator_registrar.cc
otifier/invalidator_registrar.h
otifier/invalidator_registrar_unittest.cc
otifier/invalidator_test_template.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/object_id_invalidation_map.cc
otifier/object_id_invalidation_map.h
otifier/object_id_invalidation_map_test_util.cc
otifier/object_id_invalidation_map_test_util.h
otifier/object_id_invalidation_map_unittest.cc
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/p2p_invalidator_unittest.cc
otifier/single_object_invalidation_set.cc
otifier/single_object_invalidation_set.h
otifier/single_object_invalidation_set_unittest.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
rotocol/article_specifics.proto
rotocol/nigori_specifics.proto
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/sync.proto
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/nudge_tracker.cc
essions/ordered_commit_set.cc
essions/ordered_commit_set.h
essions/ordered_commit_set_unittest.cc
essions/status_controller.h
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
ync_core.gypi
ync_internal_api.gypi
ync_notifier.gypi
ync_proto.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/metahandle_set.h
yncable/model_neutral_mutable_entry.cc
yncable/model_neutral_mutable_entry.h
yncable/model_type.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_util.cc
yncable/syncable_base_write_transaction.cc
yncable/syncable_base_write_transaction.h
yncable/syncable_model_neutral_write_transaction.cc
yncable/syncable_model_neutral_write_transaction.h
yncable/syncable_util.cc
yncable/syncable_util.h
yncable/syncable_write_transaction.cc
yncable/syncable_write_transaction.h
ools/sync_listen_notifications.cc
ools/testserver/chromiumsync.py
til/data_type_histogram.h
til/get_session_name.cc
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ngine/download_unittest.cc
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/public/data_type_debug_info_listener.h
nternal_api/sync_manager_impl_unittest.cc
essions/sync_session_context.cc
ync_core.gypi
yncable/directory.h
yncable/model_neutral_mutable_entry.cc
yncable/model_neutral_mutable_entry.h
yncable/mutable_entry.cc
yncable/mutable_entry.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ngine/apply_control_data_updates.cc
ngine/apply_control_data_updates_unittest.cc
ngine/apply_updates_and_resolve_conflicts_command_unittest.cc
ngine/build_commit_command.cc
ngine/commit.cc
ngine/conflict_resolver.cc
ngine/conflict_util.cc
ngine/get_commit_ids.cc
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/process_commit_response_command.cc
ngine/process_commit_response_command_unittest.cc
ngine/process_updates_command.cc
ngine/process_updates_command_unittest.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util.h
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
ngine/syncer_util.cc
ngine/update_applicator.cc
nternal_api/base_node.cc
nternal_api/change_reorder_buffer.cc
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/public/base/cancelation_observer.cc
nternal_api/public/base/cancelation_observer.h
nternal_api/public/base/cancelation_signal.cc
nternal_api/public/base/cancelation_signal.h
nternal_api/public/base/cancelation_signal_unittest.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/http_bridge.h
nternal_api/public/http_post_provider_factory.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/read_node.cc
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_server_connection_manager.cc
nternal_api/syncapi_server_connection_manager.h
nternal_api/syncapi_server_connection_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_entry_factory.cc
nternal_api/test/test_internal_components_factory.cc
nternal_api/write_node.cc
ync_internal_api.gypi
ync_tests.gypi
yncable/directory.cc
yncable/entry.cc
yncable/entry.h
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_util.cc
yncable/nigori_util.h
yncable/syncable_unittest.cc
yncable/syncable_util.cc
yncable/syncable_write_transaction.cc
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/engine/syncer_command_test.h
est/engine/test_syncable_utils.cc
ools/sync_client.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationPreferences.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ndroid/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
pi/sync_change_processor.h
pi/syncable_service.h
ngine/DEPS
ngine/build_commit_command.cc
ngine/commit.cc
ngine/download.cc
ngine/download_unittest.cc
ngine/get_commit_ids.cc
ngine/get_commit_ids.h
ngine/get_commit_ids_command.cc
ngine/get_commit_ids_command.h
ngine/net/server_connection_manager.h
ngine/process_commit_response_command.cc
ngine/process_commit_response_command.h
ngine/process_commit_response_command_unittest.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/public/base/DEPS
nternal_api/public/base/model_type_invalidation_map.cc
nternal_api/public/base/model_type_invalidation_map.h
nternal_api/public/base/model_type_invalidation_map_test_util.cc
nternal_api/public/base/model_type_invalidation_map_test_util.h
nternal_api/public/base/model_type_invalidation_map_unittest.cc
nternal_api/public/base/model_type_test_util.cc
nternal_api/public/base/model_type_test_util.h
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/model_safe_worker_unittest.cc
nternal_api/public/http_bridge.h
nternal_api/public/http_post_provider_factory.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_server_connection_manager.cc
nternal_api/syncapi_server_connection_manager.h
nternal_api/syncapi_server_connection_manager_unittest.cc
otifier/invalidation_notifier_unittest.cc
otifier/object_id_invalidation_map.cc
otifier/object_id_invalidation_map.h
otifier/object_id_invalidation_map_test_util.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator_unittest.cc
rotocol/managed_user_specifics.proto
rotocol/proto_value_conversions.cc
rotocol/sync.proto
essions/DEPS
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/ordered_commit_set.cc
essions/ordered_commit_set.h
essions/ordered_commit_set_unittest.cc
essions/sync_session_unittest.cc
ync.gyp
ync_android.gypi
ync_core.gypi
ync_internal_api.gypi
ync_tests.gypi
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/mock_connection_manager.h
ools/sync_listen_notifications.cc
ools/testserver/chromiumsync.py
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
ngine/build_commit_command.cc
ngine/build_commit_command.h
s/sync_js_controller.cc
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/session_specifics.proto
yncable/syncable_base_transaction.cc
yncable/syncable_base_transaction.h
ools/sync_client.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/java/src/org/chromium/sync/signin/ChromeSigninController.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ndroid/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
ndroid/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java
ngine/build_commit_command.cc
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/net/server_connection_manager.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util.h
ngine/syncer_proto_util_unittest.cc
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
rotocol/proto_value_conversions.cc
rotocol/search_engine_specifics.proto
yncable/syncable_util.cc
yncable/syncable_util.h
est/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
til/nigori.cc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ngine/build_commit_command.cc
ngine/build_commit_command.h
ngine/commit.cc
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/passive_model_worker.cc
nternal_api/public/engine/passive_model_worker.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/sessions/sync_session_snapshot.cc
nternal_api/public/sessions/sync_session_snapshot.h
nternal_api/public/sessions/sync_session_snapshot_unittest.cc
nternal_api/public/sessions/sync_source_info.cc
nternal_api/public/sessions/sync_source_info.h
nternal_api/public/sessions/sync_source_info_unittest.cc
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/public/util/unrecoverable_error_handler.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_internal_components_factory.cc
otifier/non_blocking_invalidator.cc
rotocol/proto_value_conversions.cc
rotocol/search_engine_specifics.proto
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/ordered_commit_set.cc
essions/ordered_commit_set.h
essions/ordered_commit_set_unittest.cc
essions/status_controller.h
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
essions/test_util.cc
essions/test_util.h
ync_core.gypi
ync_internal_api.gypi
ync_tests.gypi
est/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
est/fake_extensions_activity_monitor.cc
est/fake_extensions_activity_monitor.h
ools/sync_client.cc
til/extensions_activity.cc
til/extensions_activity.h
til/extensions_activity_monitor.cc
til/extensions_activity_monitor.h
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
ndroid/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
rotocol/synced_notification_render.proto
ools/testserver/run_sync_testserver.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer_unittest.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/model_type.h
nternal_api/public/internal_components_factory.h
nternal_api/public/util/experiments.h
nternal_api/sync_manager_impl.cc
nternal_api/test/test_internal_components_factory.cc
otifier/object_id_invalidation_map.cc
otifier/object_id_invalidation_map.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator_unittest.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
rotocol/experiments_specifics.proto
rotocol/proto_value_conversions.cc
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
yncable/model_type.cc
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/engine/syncer_command_test.h
ools/testserver/chromiumsync.py
ools/testserver/sync_testserver.py
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationPreferences.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/java/src/org/chromium/sync/signin/ChromeSigninController.java
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
nternal_api/http_bridge.cc
nternal_api/js_mutation_event_observer_unittest.cc
nternal_api/js_sync_encryption_handler_observer_unittest.cc
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/passive_model_worker.cc
nternal_api/public/util/weak_handle_unittest.cc
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_impl_unittest.cc
s/sync_js_controller_unittest.cc
otifier/ack_tracker_unittest.cc
otifier/invalidation_notifier_unittest.cc
otifier/non_blocking_invalidator_unittest.cc
otifier/registration_manager_unittest.cc
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
essions/sync_session_unittest.cc
yncable/syncable_unittest.cc
est/accounts_client/test_accounts_client.cc
est/accounts_client/test_accounts_client.h
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/android/javatests/src/org/chromium/sync/test/util/MockGrantCredentialsPermissionActivity.java
est/engine/fake_sync_scheduler.h
est/engine/syncer_command_test.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/run_sync_testserver.cc
til/get_session_name_unittest.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
pi/sync_change_unittest.cc
pi/sync_data.cc
pi/sync_data.h
ngine/DEPS
ngine/build_commit_command.cc
ngine/net/server_connection_manager.cc
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
nternal_api/DEPS
nternal_api/public/base/unique_position.cc
nternal_api/public/base/unique_position.h
nternal_api/public/base/unique_position_unittest.cc
nternal_api/public/base_node.h
nternal_api/public/http_bridge.h
nternal_api/public/util/experiments.h
nternal_api/sync_manager_impl.cc
nternal_api/write_node.cc
rotocol/password_specifics.proto
rotocol/unique_position.proto
yncable/mutable_entry.cc
yncable/on_disk_directory_backing_store.cc
yncable/syncable_unittest.cc
est/accounts_client/test_accounts_client.h
est/accounts_client/test_accounts_client_unittest.cc
est/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/fake_sync_encryption_handler.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
WNERS
ndroid/OWNERS
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ndroid/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java
pi/sync_change_unittest.cc
pi/sync_data.cc
pi/sync_error.cc
pi/sync_error.h
pi/sync_error_unittest.cc
pi/sync_merge_result.cc
pi/sync_merge_result_unittest.cc
ngine/backoff_delay_provider.h
ngine/backoff_delay_provider_unittest.cc
ngine/commit.cc
ngine/commit.h
ngine/download.cc
ngine/download.h
ngine/download_unittest.cc
ngine/download_updates_command.cc
ngine/download_updates_command.h
ngine/download_updates_command_unittest.cc
ngine/get_commit_ids_command.cc
ngine/get_commit_ids_command.h
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_proto_util.h
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
ngine/syncer_util.h
ngine/traffic_logger.cc
ngine/traffic_recorder.cc
ngine/traffic_recorder.h
ngine/traffic_recorder_unittest.cc
nternal_api/base_node.cc
nternal_api/change_record.cc
nternal_api/js_mutation_event_observer_unittest.cc
nternal_api/js_sync_encryption_handler_observer.cc
nternal_api/js_sync_manager_observer.cc
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/model_type_invalidation_map.cc
nternal_api/public/base/model_type_invalidation_map_unittest.cc
nternal_api/public/base/progress_marker_map.cc
nternal_api/public/base_node.h
nternal_api/public/change_record_unittest.cc
nternal_api/public/data_type_association_stats.h
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker_unittest.cc
nternal_api/public/engine/sync_status.h
nternal_api/public/sessions/sync_session_snapshot.cc
nternal_api/public/sessions/sync_session_snapshot.h
nternal_api/public/sessions/sync_session_snapshot_unittest.cc
nternal_api/public/sessions/sync_source_info.cc
nternal_api/public/sessions/sync_source_info_unittest.cc
nternal_api/public/sync_encryption_handler.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/util/experiments.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_server_connection_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
s/js_arg_list.cc
s/js_arg_list.h
s/js_event_details.cc
s/js_event_details.h
s/js_event_details_unittest.cc
s/js_test_util.cc
otifier/ack_tracker.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidator.h
otifier/invalidator_factory.cc
otifier/invalidator_factory.h
otifier/invalidator_factory_unittest.cc
otifier/invalidator_registrar.cc
otifier/invalidator_registrar_unittest.cc
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/object_id_invalidation_map.cc
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/registration_manager.h
otifier/sync_invalidation_listener_unittest.cc
rotocol/autofill_specifics.proto
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions_unittest.cc
rotocol/sync_protocol_error.cc
rotocol/sync_protocol_error.h
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/status_controller.h
essions/sync_session.cc
essions/sync_session.h
essions/test_util.cc
essions/test_util.h
ync_core.gypi
ync_notifier.gypi
ync_tests.gypi
yncable/directory_backing_store.cc
yncable/entry.cc
yncable/entry_kernel.cc
yncable/entry_kernel.h
yncable/model_type_unittest.cc
yncable/nigori_util.cc
yncable/on_disk_directory_backing_store.cc
yncable/syncable_unittest.cc
est/accounts_client/test_accounts_client.cc
est/accounts_client/test_accounts_client_unittest.cc
est/android/OWNERS
est/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/run_sync_testserver.cc
ools/testserver/xmppserver.py
til/data_encryption_win.cc
til/data_encryption_win.h
til/data_encryption_win_unittest.cc
til/data_type_histogram.h
til/data_type_histogram_unittest.cc
til/get_session_name_mac.mm
til/time.h
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
pi/sync_merge_result.cc
pi/sync_merge_result.h
ngine/all_status.cc
ngine/all_status.h
ngine/download_updates_command.cc
ngine/get_commit_ids_command.cc
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/sync_engine_event.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer.cc
ngine/syncer_proto_util.cc
ngine/syncer_proto_util.h
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
ngine/throttled_data_type_tracker.cc
ngine/throttled_data_type_tracker.h
ngine/throttled_data_type_tracker_unittest.cc
nternal_api/base_node.cc
nternal_api/change_reorder_buffer.cc
nternal_api/change_reorder_buffer.h
nternal_api/debug_info_event_listener.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/public/base_node.h
nternal_api/public/data_type_association_stats.cc
nternal_api/public/data_type_association_stats.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_server_connection_manager.cc
nternal_api/syncapi_server_connection_manager.h
nternal_api/syncapi_server_connection_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_internal_components_factory.cc
rotocol/client_debug_info.proto
rotocol/managed_user_specifics.proto
rotocol/proto_value_conversions.cc
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
essions/test_util.cc
ync_core.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/entry.cc
yncable/entry.h
yncable/on_disk_directory_backing_store.cc
yncable/syncable_id.h
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/mock_connection_manager.cc
est/engine/syncer_command_test.h
ools/sync_client.cc
ools/testserver/xmppserver.py
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
pi/sync_data.cc
ngine/apply_control_data_updates_unittest.cc
ngine/apply_updates_and_resolve_conflicts_command_unittest.cc
ngine/build_commit_command.cc
ngine/conflict_resolver.cc
ngine/get_commit_ids_command.cc
ngine/get_commit_ids_command.h
ngine/model_changing_syncer_command.cc
ngine/net/server_connection_manager.h
ngine/process_commit_response_command_unittest.cc
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_unittest.cc
ngine/syncer_proto_util.cc
ngine/syncer_unittest.cc
ngine/syncer_util.cc
nternal_api/base_node.cc
nternal_api/change_record.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/js_mutation_event_observer.cc
nternal_api/js_sync_encryption_handler_observer.cc
nternal_api/js_sync_manager_observer.cc
nternal_api/public/base/invalidation.cc
nternal_api/public/base/unique_position.cc
nternal_api/public/base/unique_position_unittest.cc
nternal_api/public/change_record_unittest.cc
nternal_api/public/configure_reason.h
nternal_api/public/data_type_association_stats.cc
nternal_api/public/data_type_association_stats.h
nternal_api/public/data_type_debug_info_listener.cc
nternal_api/public/data_type_debug_info_listener.h
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/util/syncer_error.cc
nternal_api/public/util/syncer_error.h
nternal_api/public/util/weak_handle.cc
nternal_api/public/util/weak_handle.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/write_node.cc
otifier/invalidation_notifier.cc
otifier/invalidator_factory.cc
otifier/non_blocking_invalidator.cc
otifier/sync_system_resources.cc
rotocol/client_debug_info.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions_unittest.cc
rotocol/sync_enums.proto
rotocol/sync_protocol_error.cc
rotocol/sync_protocol_error.h
essions/data_type_tracker.cc
essions/data_type_tracker.h
essions/nudge_tracker.cc
essions/nudge_tracker.h
ync_core.gypi
ync_internal_api.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
yncable/entry.cc
yncable/entry.h
yncable/entry_kernel.cc
yncable/in_memory_directory_backing_store.cc
yncable/in_memory_directory_backing_store.h
yncable/invalid_directory_backing_store.cc
yncable/invalid_directory_backing_store.h
yncable/model_type.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/on_disk_directory_backing_store.cc
yncable/on_disk_directory_backing_store.h
yncable/scoped_index_updater.h
yncable/scoped_kernel_lock.cc
yncable/scoped_kernel_lock.h
yncable/syncable_mock.cc
yncable/syncable_mock.h
yncable/syncable_unittest.cc
yncable/syncable_util.cc
yncable/write_transaction_info.cc
est/accounts_client/test_accounts_client.cc
est/accounts_client/test_accounts_client.h
est/engine/mock_connection_manager.cc
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
est/engine/test_directory_setter_upper.cc
est/engine/test_id_factory.h
est/engine/test_syncable_utils.cc
est/local_sync_test_server.cc
est/test_directory_backing_store.cc
est/test_directory_backing_store.h
ools/sync_client.cc
ools/testserver/chromiumsync.py
ools/testserver/chromiumsync_test.py
ools/testserver/run_sync_testserver.cc
ools/testserver/sync_testserver.py
til/cryptographer_unittest.cc
til/get_session_name_mac.mm
til/nigori.cc
til/nigori_unittest.cc
til/time.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ngine/conflict_resolver.cc
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
nternal_api/base_node.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/public/base/model_type.h
nternal_api/public/base_node.h
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/passive_model_worker.cc
nternal_api/public/engine/passive_model_worker.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/public/write_node.h
nternal_api/test/test_internal_components_factory.cc
nternal_api/write_node.cc
rotocol/managed_user_specifics.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_enum_conversions.h
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/session_specifics.proto
rotocol/sync.proto
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/test_util.cc
essions/test_util.h
ync_proto.gypi
yncable/entry.cc
yncable/entry.h
yncable/model_type.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_util.cc
yncable/syncable_write_transaction.cc
est/engine/fake_model_worker.cc
est/engine/fake_model_worker.h
ools/sync_client.cc
ools/testserver/chromiumsync.py
til/data_type_histogram.h
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ync_tests.gypi
est/accounts_client/DEPS
est/accounts_client/test_accounts_client.cc
est/accounts_client/test_accounts_client.h
est/accounts_client/test_accounts_client_unittest.cc
est/accounts_client/url_request_context_getter.cc
est/accounts_client/url_request_context_getter.h
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ngine/download_updates_command.cc
ngine/download_updates_command_unittest.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/syncer_proto_util.cc
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
nternal_api/debug_info_event_listener.cc
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/js_mutation_event_observer_unittest.cc
nternal_api/js_sync_encryption_handler_observer_unittest.cc
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/data_type_association_stats.h
nternal_api/public/engine/passive_model_worker.cc
nternal_api/public/util/weak_handle_unittest.cc
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl_unittest.cc
s/sync_js_controller_unittest.cc
otifier/ack_tracker_unittest.cc
otifier/invalidation_notifier_unittest.cc
otifier/invalidator_factory_unittest.cc
otifier/non_blocking_invalidator_unittest.cc
otifier/registration_manager_unittest.cc
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/client_commands.proto
rotocol/client_debug_info.proto
rotocol/proto_value_conversions.cc
rotocol/sync.proto
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_unittest.cc
ync_core.gypi
yncable/syncable_unittest.cc
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/syncer_command_test.h
est/local_sync_test_server.cc
est/local_sync_test_server.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/run_sync_testserver.cc
til/get_session_name.cc
til/get_session_name_linux.cc
til/get_session_name_linux.h
til/get_session_name_unittest.cc
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/java/src/org/chromium/sync/notifier/ModelTypeResolver.java
ndroid/java/src/org/chromium/sync/notifier/ModelTypeResolverImpl.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ndroid/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ndroid/javatests/src/org/chromium/sync/notifier/ModelTypeResolverTest.java
pi/sync_data.cc
pi/syncable_service.h
ngine/apply_control_data_updates_unittest.cc
ngine/build_commit_command.cc
ngine/build_commit_command.h
ngine/build_commit_command_unittest.cc
ngine/conflict_resolver.cc
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/process_commit_response_command.cc
ngine/process_commit_response_command_unittest.cc
ngine/process_updates_command.cc
ngine/process_updates_command_unittest.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/sync_scheduler_whitebox_unittest.cc
ngine/sync_session_job.cc
ngine/sync_session_job.h
ngine/sync_session_job_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util.h
ngine/syncer_unittest.cc
ngine/syncer_util.cc
ngine/syncer_util.h
nternal_api/DEPS
nternal_api/base_node.cc
nternal_api/change_reorder_buffer.cc
nternal_api/debug_info_event_listener.cc
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/js_mutation_event_observer.cc
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/base/model_type.h
nternal_api/public/base/model_type_invalidation_map_unittest.cc
nternal_api/public/base/ordinal_unittest.cc
nternal_api/public/base/unique_position.cc
nternal_api/public/base/unique_position.h
nternal_api/public/base/unique_position_unittest.cc
nternal_api/public/base_node.h
nternal_api/public/engine/passive_model_worker.h
nternal_api/public/http_bridge.h
nternal_api/public/sessions/sync_session_snapshot.cc
nternal_api/public/sessions/sync_session_snapshot.h
nternal_api/public/sessions/sync_session_snapshot_unittest.cc
nternal_api/public/sync_manager.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/util/experiments.h
nternal_api/public/util/weak_handle_unittest.cc
nternal_api/public/write_node.h
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_server_connection_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_entry_factory.cc
nternal_api/test/test_user_share.cc
nternal_api/write_node.cc
otifier/fake_invalidation_state_tracker.cc
otifier/fake_invalidation_state_tracker.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/fake_invalidator_unittest.cc
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidation_notifier_unittest.cc
otifier/invalidation_state_tracker.h
otifier/invalidator.h
otifier/invalidator_factory.cc
otifier/invalidator_factory.h
otifier/invalidator_registrar_unittest.cc
otifier/invalidator_test_template.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/p2p_invalidator_unittest.cc
otifier/push_client_channel.cc
otifier/push_client_channel_unittest.cc
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources_unittest.cc
rotocol/experiments_specifics.proto
rotocol/get_updates_caller_info.proto
rotocol/managed_user_setting_specifics.proto
rotocol/priority_preference_specifics.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_enum_conversions.h
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/sync.proto
rotocol/sync_enums.proto
rotocol/synced_notification_data.proto
rotocol/synced_notification_render.proto
rotocol/unique_position.proto
essions/nudge_tracker.cc
essions/nudge_tracker.h
essions/nudge_tracker_unittest.cc
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_unittest.cc
ync_core.gypi
ync_internal_api.gypi
ync_proto.gypi
ync_tests.gypi
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
yncable/entry.cc
yncable/entry.h
yncable/entry_kernel.cc
yncable/entry_kernel.h
yncable/in_memory_directory_backing_store.cc
yncable/in_memory_directory_backing_store.h
yncable/model_type.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_util.cc
yncable/parent_child_index.cc
yncable/parent_child_index.h
yncable/parent_child_index_unittest.cc
yncable/scoped_parent_child_index_updater.cc
yncable/scoped_parent_child_index_updater.h
yncable/syncable_columns.h
yncable/syncable_enum_conversions.cc
yncable/syncable_enum_conversions.h
yncable/syncable_enum_conversions_unittest.cc
yncable/syncable_unittest.cc
yncable/syncable_util.cc
yncable/syncable_util.h
yncable/syncable_write_transaction.cc
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/engine/syncer_command_test.h
est/local_sync_test_server.cc
est/test_directory_backing_store.h
ools/null_invalidation_state_tracker.cc
ools/null_invalidation_state_tracker.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/chromiumsync.py
ools/testserver/chromiumsync_test.py
til/cryptographer.cc
til/data_type_histogram.h
til/get_session_name_ios.mm
til/get_session_name_mac.mm
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
WNERS
ndroid/DEPS
ndroid/OWNERS
ndroid/java/src/org/chromium/sync/internal_api/pub/SyncDecryptionPassphraseType.java
ndroid/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationController.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationPreferences.java
ndroid/java/src/org/chromium/sync/notifier/InvalidationService.java
ndroid/java/src/org/chromium/sync/notifier/ModelTypeResolver.java
ndroid/java/src/org/chromium/sync/notifier/ModelTypeResolverImpl.java
ndroid/java/src/org/chromium/sync/notifier/SyncContentResolverDelegate.java
ndroid/java/src/org/chromium/sync/notifier/SyncStatusHelper.java
ndroid/java/src/org/chromium/sync/notifier/SystemSyncContentResolverDelegate.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerDelegate.java
ndroid/java/src/org/chromium/sync/signin/AccountManagerHelper.java
ndroid/java/src/org/chromium/sync/signin/ChromeSigninController.java
ndroid/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationControllerTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
ndroid/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
ndroid/javatests/src/org/chromium/sync/notifier/ModelTypeResolverTest.java
ndroid/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
ndroid/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java
pi/DEPS
pi/fake_syncable_service.cc
pi/fake_syncable_service.h
pi/sync_change.h
pi/sync_change_processor.h
pi/sync_data.h
pi/sync_error.h
pi/sync_error_factory.h
pi/sync_merge_result.cc
pi/sync_merge_result.h
pi/sync_merge_result_unittest.cc
pi/syncable_service.h
ase/sync_export.h
ngine/DEPS
ngine/all_status.cc
ngine/all_status.h
ngine/apply_control_data_updates.cc
ngine/apply_control_data_updates.h
ngine/apply_control_data_updates_unittest.cc
ngine/apply_updates_and_resolve_conflicts_command.cc
ngine/apply_updates_and_resolve_conflicts_command.h
ngine/apply_updates_and_resolve_conflicts_command_unittest.cc
ngine/backoff_delay_provider.cc
ngine/backoff_delay_provider.h
ngine/backoff_delay_provider_unittest.cc
ngine/build_commit_command.cc
ngine/build_commit_command.h
ngine/build_commit_command_unittest.cc
ngine/commit.cc
ngine/conflict_resolver.cc
ngine/download_updates_command.cc
ngine/download_updates_command.h
ngine/get_commit_ids_command.cc
ngine/get_commit_ids_command.h
ngine/model_changing_syncer_command.cc
ngine/model_changing_syncer_command.h
ngine/model_changing_syncer_command_unittest.cc
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/process_commit_response_command.cc
ngine/process_commit_response_command.h
ngine/process_commit_response_command_unittest.cc
ngine/process_updates_command.cc
ngine/process_updates_command.h
ngine/store_timestamps_command.cc
ngine/store_timestamps_command.h
ngine/store_timestamps_command_unittest.cc
ngine/sync_engine_event.h
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/sync_scheduler_whitebox_unittest.cc
ngine/sync_session_job.cc
ngine/sync_session_job.h
ngine/sync_session_job_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_command.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util.h
ngine/syncer_proto_util_unittest.cc
ngine/syncer_unittest.cc
ngine/syncer_util.cc
ngine/throttled_data_type_tracker.h
ngine/traffic_recorder.cc
ngine/traffic_recorder.h
ngine/traffic_recorder_unittest.cc
ngine/update_applicator.cc
nternal_api/DEPS
nternal_api/base_node.cc
nternal_api/base_transaction.cc
nternal_api/change_reorder_buffer.cc
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/delete_journal.cc
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/js_mutation_event_observer.cc
nternal_api/js_mutation_event_observer.h
nternal_api/js_mutation_event_observer_unittest.cc
nternal_api/js_sync_encryption_handler_observer.h
nternal_api/js_sync_encryption_handler_observer_unittest.cc
nternal_api/js_sync_manager_observer.h
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/base/DEPS
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/invalidation_test_util.cc
nternal_api/public/base/invalidation_test_util.h
nternal_api/public/base/model_type.h
nternal_api/public/base/model_type_invalidation_map.cc
nternal_api/public/base/model_type_invalidation_map.h
nternal_api/public/base/model_type_invalidation_map_unittest.cc
nternal_api/public/base/node_ordinal.h
nternal_api/public/base/progress_marker_map.h
nternal_api/public/base/unique_position.cc
nternal_api/public/base/unique_position.h
nternal_api/public/base/unique_position_unittest.cc
nternal_api/public/base_node.h
nternal_api/public/base_transaction.h
nternal_api/public/change_record.h
nternal_api/public/data_type_association_stats.h
nternal_api/public/delete_journal.h
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/polling_constants.h
nternal_api/public/engine/sync_status.cc
nternal_api/public/engine/sync_status.h
nternal_api/public/http_bridge.h
nternal_api/public/http_post_provider_factory.h
nternal_api/public/http_post_provider_interface.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/read_node.h
nternal_api/public/read_transaction.h
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/sessions/sync_session_snapshot.cc
nternal_api/public/sessions/sync_session_snapshot.h
nternal_api/public/sessions/sync_session_snapshot_unittest.cc
nternal_api/public/sessions/sync_source_info.h
nternal_api/public/sync_encryption_handler.h
nternal_api/public/sync_manager.h
nternal_api/public/sync_manager_factory.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_entry_factory.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/public/test/test_user_share.h
nternal_api/public/user_share.h
nternal_api/public/util/experiments.h
nternal_api/public/util/sync_string_conversions.h
nternal_api/public/util/syncer_error.cc
nternal_api/public/util/syncer_error.h
nternal_api/public/util/weak_handle.h
nternal_api/public/util/weak_handle_unittest.cc
nternal_api/public/write_node.h
nternal_api/public/write_transaction.h
nternal_api/read_node.cc
nternal_api/read_transaction.cc
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl.h
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_internal.h
nternal_api/syncapi_server_connection_manager.cc
nternal_api/syncapi_server_connection_manager.h
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_entry_factory.cc
nternal_api/test/test_internal_components_factory.cc
nternal_api/test/test_user_share.cc
nternal_api/write_node.cc
nternal_api/write_transaction.cc
s/DEPS
s/js_arg_list.h
s/js_arg_list_unittest.cc
s/js_backend.h
s/js_controller.h
s/js_event_details.h
s/js_event_handler.h
s/sync_js_controller.h
s/sync_js_controller_unittest.cc
otifier/DEPS
otifier/ack_tracker.cc
otifier/ack_tracker.h
otifier/ack_tracker_unittest.cc
otifier/fake_invalidation_handler.cc
otifier/fake_invalidation_handler.h
otifier/fake_invalidation_state_tracker.cc
otifier/fake_invalidation_state_tracker.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/fake_invalidator_unittest.cc
otifier/invalidation_handler.h
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidation_notifier_unittest.cc
otifier/invalidation_state_tracker.cc
otifier/invalidation_state_tracker.h
otifier/invalidation_util.h
otifier/invalidator.h
otifier/invalidator_factory.cc
otifier/invalidator_factory.h
otifier/invalidator_factory_unittest.cc
otifier/invalidator_registrar.cc
otifier/invalidator_registrar.h
otifier/invalidator_registrar_unittest.cc
otifier/invalidator_state.h
otifier/invalidator_test_template.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/object_id_invalidation_map.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/p2p_invalidator_unittest.cc
otifier/push_client_channel.h
otifier/push_client_channel_unittest.cc
otifier/registration_manager.h
otifier/registration_manager_unittest.cc
otifier/state_writer.h
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/DEPS
rotocol/app_notification_specifics.proto
rotocol/app_setting_specifics.proto
rotocol/app_specifics.proto
rotocol/autofill_specifics.proto
rotocol/bookmark_specifics.proto
rotocol/client_commands.proto
rotocol/client_debug_info.proto
rotocol/device_info_specifics.proto
rotocol/dictionary_specifics.proto
rotocol/encryption.proto
rotocol/experiments_specifics.proto
rotocol/extension_setting_specifics.proto
rotocol/extension_specifics.proto
rotocol/favicon_image_specifics.proto
rotocol/favicon_tracking_specifics.proto
rotocol/get_updates_caller_info.proto
rotocol/history_delete_directive_specifics.proto
rotocol/nigori_specifics.proto
rotocol/password_specifics.proto
rotocol/preference_specifics.proto
rotocol/priority_preference_specifics.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_enum_conversions.h
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/search_engine_specifics.proto
rotocol/session_specifics.proto
rotocol/sync.proto
rotocol/sync_enums.proto
rotocol/sync_proto.gyp
rotocol/sync_protocol_error.h
rotocol/synced_notification_data.proto
rotocol/synced_notification_render.proto
rotocol/synced_notification_specifics.proto
rotocol/test.proto
rotocol/theme_specifics.proto
rotocol/typed_url_specifics.proto
rotocol/unique_position.proto
essions/DEPS
essions/debug_info_getter.h
essions/ordered_commit_set.h
essions/status_controller.cc
essions/status_controller.h
essions/status_controller_unittest.cc
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
ync.gyp
ync_android.gypi
ync_api.gypi
ync_core.gypi
ync_internal_api.gypi
ync_notifier.gypi
ync_proto.gypi
ync_tests.gypi
yncable/DEPS
yncable/base_transaction.cc
yncable/base_transaction.h
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
yncable/directory_change_delegate.h
yncable/entry.cc
yncable/entry.h
yncable/entry_kernel.cc
yncable/entry_kernel.h
yncable/in_memory_directory_backing_store.cc
yncable/in_memory_directory_backing_store.h
yncable/invalid_directory_backing_store.cc
yncable/invalid_directory_backing_store.h
yncable/model_type.cc
yncable/model_type_unittest.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_handler.h
yncable/nigori_util.cc
yncable/nigori_util.h
yncable/on_disk_directory_backing_store.cc
yncable/on_disk_directory_backing_store.h
yncable/read_transaction.cc
yncable/read_transaction.h
yncable/syncable_base_transaction.cc
yncable/syncable_base_transaction.h
yncable/syncable_delete_journal.cc
yncable/syncable_delete_journal.h
yncable/syncable_enum_conversions.h
yncable/syncable_id.cc
yncable/syncable_id.h
yncable/syncable_mock.h
yncable/syncable_proto_util.h
yncable/syncable_read_transaction.cc
yncable/syncable_read_transaction.h
yncable/syncable_unittest.cc
yncable/syncable_util.cc
yncable/syncable_util.h
yncable/syncable_util_unittest.cc
yncable/syncable_write_transaction.cc
yncable/syncable_write_transaction.h
yncable/transaction_observer.h
yncable/write_transaction.cc
yncable/write_transaction.h
yncable/write_transaction_info.cc
yncable/write_transaction_info.h
est/DEPS
est/android/OWNERS
est/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
est/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
est/android/javatests/src/org/chromium/sync/test/util/MockGrantCredentialsPermissionActivity.java
est/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
est/engine/test_directory_setter_upper.cc
est/engine/test_directory_setter_upper.h
est/engine/test_syncable_utils.cc
est/engine/test_syncable_utils.h
est/fake_sync_encryption_handler.cc
est/fake_sync_encryption_handler.h
est/local_sync_test_server.cc
est/local_sync_test_server.h
est/test_directory_backing_store.cc
est/test_directory_backing_store.h
est/test_transaction_observer.cc
est/test_transaction_observer.h
ools/null_invalidation_state_tracker.cc
ools/null_invalidation_state_tracker.h
ools/sync_client.cc
ools/sync_listen_notifications.cc
ools/testserver/DEPS
ools/testserver/OWNERS
ools/testserver/chromiumsync.py
ools/testserver/chromiumsync_test.py
ools/testserver/run_sync_testserver.cc
ools/testserver/sync_testserver.py
ools/testserver/xmppserver.py
ools/testserver/xmppserver_test.py
til/DEPS
til/cryptographer.h
til/data_encryption_win.cc
til/data_encryption_win.h
til/data_encryption_win_unittest.cc
til/data_type_histogram.h
til/extensions_activity_monitor.h
til/get_session_name.cc
til/get_session_name.h
til/get_session_name_ios.h
til/get_session_name_ios.mm
til/get_session_name_unittest.cc
til/nigori.h
til/session_utils_android.cc
til/session_utils_android.h
til/time.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
WNERS
RESUBMIT.py
pi/DEPS
pi/fake_syncable_service.cc
pi/fake_syncable_service.h
pi/string_ordinal.h
pi/sync_change.cc
pi/sync_change.h
pi/sync_change_processor.cc
pi/sync_change_processor.h
pi/sync_change_unittest.cc
pi/sync_data.cc
pi/sync_data.h
pi/sync_error.cc
pi/sync_error.h
pi/sync_error_factory.cc
pi/sync_error_factory.h
pi/sync_error_factory_mock.cc
pi/sync_error_factory_mock.h
pi/sync_error_unittest.cc
pi/syncable_service.cc
pi/syncable_service.h
pi/time.h
ase/DEPS
ase/sync_export.h
ngine/DEPS
ngine/all_status.cc
ngine/all_status.h
ngine/apply_control_data_updates.cc
ngine/apply_control_data_updates.h
ngine/apply_control_data_updates_unittest.cc
ngine/apply_updates_and_resolve_conflicts_command.cc
ngine/apply_updates_and_resolve_conflicts_command.h
ngine/apply_updates_and_resolve_conflicts_command_unittest.cc
ngine/backoff_delay_provider.cc
ngine/backoff_delay_provider.h
ngine/backoff_delay_provider_unittest.cc
ngine/build_commit_command.cc
ngine/build_commit_command.h
ngine/build_commit_command_unittest.cc
ngine/commit.cc
ngine/commit.h
ngine/conflict_resolver.cc
ngine/conflict_resolver.h
ngine/conflict_util.cc
ngine/conflict_util.h
ngine/download_updates_command.cc
ngine/download_updates_command.h
ngine/download_updates_command_unittest.cc
ngine/get_commit_ids_command.cc
ngine/get_commit_ids_command.h
ngine/model_changing_syncer_command.cc
ngine/model_changing_syncer_command.h
ngine/model_changing_syncer_command_unittest.cc
ngine/net/DEPS
ngine/net/server_connection_manager.cc
ngine/net/server_connection_manager.h
ngine/net/url_translator.cc
ngine/net/url_translator.h
ngine/nudge_source.cc
ngine/nudge_source.h
ngine/process_commit_response_command.cc
ngine/process_commit_response_command.h
ngine/process_commit_response_command_unittest.cc
ngine/process_updates_command.cc
ngine/process_updates_command.h
ngine/process_updates_command_unittest.cc
ngine/store_timestamps_command.cc
ngine/store_timestamps_command.h
ngine/sync_engine_event.cc
ngine/sync_engine_event.h
ngine/sync_scheduler.cc
ngine/sync_scheduler.h
ngine/sync_scheduler_impl.cc
ngine/sync_scheduler_impl.h
ngine/sync_scheduler_unittest.cc
ngine/sync_scheduler_whitebox_unittest.cc
ngine/sync_session_job.cc
ngine/sync_session_job.h
ngine/sync_session_job_unittest.cc
ngine/syncer.cc
ngine/syncer.h
ngine/syncer_command.cc
ngine/syncer_command.h
ngine/syncer_proto_util.cc
ngine/syncer_proto_util.h
ngine/syncer_proto_util_unittest.cc
ngine/syncer_types.h
ngine/syncer_unittest.cc
ngine/syncer_util.cc
ngine/syncer_util.h
ngine/throttled_data_type_tracker.cc
ngine/throttled_data_type_tracker.h
ngine/throttled_data_type_tracker_unittest.cc
ngine/traffic_logger.cc
ngine/traffic_logger.h
ngine/traffic_recorder.cc
ngine/traffic_recorder.h
ngine/traffic_recorder_unittest.cc
ngine/update_applicator.cc
ngine/update_applicator.h
nternal_api/DEPS
nternal_api/README
nternal_api/base_node.cc
nternal_api/base_transaction.cc
nternal_api/change_record.cc
nternal_api/change_reorder_buffer.cc
nternal_api/change_reorder_buffer.h
nternal_api/debug_info_event_listener.cc
nternal_api/debug_info_event_listener.h
nternal_api/debug_info_event_listener_unittest.cc
nternal_api/http_bridge.cc
nternal_api/http_bridge_unittest.cc
nternal_api/internal_components_factory_impl.cc
nternal_api/js_mutation_event_observer.cc
nternal_api/js_mutation_event_observer.h
nternal_api/js_mutation_event_observer_unittest.cc
nternal_api/js_sync_encryption_handler_observer.cc
nternal_api/js_sync_encryption_handler_observer.h
nternal_api/js_sync_encryption_handler_observer_unittest.cc
nternal_api/js_sync_manager_observer.cc
nternal_api/js_sync_manager_observer.h
nternal_api/js_sync_manager_observer_unittest.cc
nternal_api/public/DEPS
nternal_api/public/base/DEPS
nternal_api/public/base/enum_set.h
nternal_api/public/base/enum_set_unittest.cc
nternal_api/public/base/invalidation.cc
nternal_api/public/base/invalidation.h
nternal_api/public/base/invalidation_test_util.cc
nternal_api/public/base/invalidation_test_util.h
nternal_api/public/base/model_type.h
nternal_api/public/base/model_type_invalidation_map.cc
nternal_api/public/base/model_type_invalidation_map.h
nternal_api/public/base/model_type_invalidation_map_test_util.cc
nternal_api/public/base/model_type_invalidation_map_test_util.h
nternal_api/public/base/model_type_invalidation_map_unittest.cc
nternal_api/public/base/model_type_test_util.cc
nternal_api/public/base/model_type_test_util.h
nternal_api/public/base/node_ordinal.cc
nternal_api/public/base/node_ordinal.h
nternal_api/public/base/node_ordinal_unittest.cc
nternal_api/public/base/ordinal.h
nternal_api/public/base/ordinal_unittest.cc
nternal_api/public/base/progress_marker_map.cc
nternal_api/public/base/progress_marker_map.h
nternal_api/public/base_node.h
nternal_api/public/base_transaction.h
nternal_api/public/change_record.h
nternal_api/public/change_record_unittest.cc
nternal_api/public/configure_reason.h
nternal_api/public/data_type_association_stats.cc
nternal_api/public/data_type_association_stats.h
nternal_api/public/data_type_debug_info_listener.h
nternal_api/public/engine/model_safe_worker.cc
nternal_api/public/engine/model_safe_worker.h
nternal_api/public/engine/model_safe_worker_unittest.cc
nternal_api/public/engine/passive_model_worker.cc
nternal_api/public/engine/passive_model_worker.h
nternal_api/public/engine/polling_constants.cc
nternal_api/public/engine/polling_constants.h
nternal_api/public/engine/sync_status.cc
nternal_api/public/engine/sync_status.h
nternal_api/public/http_bridge.h
nternal_api/public/http_post_provider_factory.h
nternal_api/public/http_post_provider_interface.h
nternal_api/public/internal_components_factory.h
nternal_api/public/internal_components_factory_impl.h
nternal_api/public/read_node.h
nternal_api/public/read_transaction.h
nternal_api/public/sessions/model_neutral_state.cc
nternal_api/public/sessions/model_neutral_state.h
nternal_api/public/sessions/sync_session_snapshot.cc
nternal_api/public/sessions/sync_session_snapshot.h
nternal_api/public/sessions/sync_session_snapshot_unittest.cc
nternal_api/public/sessions/sync_source_info.cc
nternal_api/public/sessions/sync_source_info.h
nternal_api/public/sessions/sync_source_info_unittest.cc
nternal_api/public/sync_encryption_handler.cc
nternal_api/public/sync_encryption_handler.h
nternal_api/public/sync_manager.cc
nternal_api/public/sync_manager.h
nternal_api/public/sync_manager_factory.h
nternal_api/public/test/fake_sync_manager.h
nternal_api/public/test/test_entry_factory.h
nternal_api/public/test/test_internal_components_factory.h
nternal_api/public/test/test_user_share.h
nternal_api/public/user_share.h
nternal_api/public/util/experiments.h
nternal_api/public/util/immutable.h
nternal_api/public/util/immutable_unittest.cc
nternal_api/public/util/report_unrecoverable_error_function.h
nternal_api/public/util/sync_string_conversions.cc
nternal_api/public/util/sync_string_conversions.h
nternal_api/public/util/syncer_error.cc
nternal_api/public/util/syncer_error.h
nternal_api/public/util/unrecoverable_error_handler.h
nternal_api/public/util/unrecoverable_error_info.cc
nternal_api/public/util/unrecoverable_error_info.h
nternal_api/public/util/weak_handle.cc
nternal_api/public/util/weak_handle.h
nternal_api/public/util/weak_handle_unittest.cc
nternal_api/public/write_node.h
nternal_api/public/write_transaction.h
nternal_api/read_node.cc
nternal_api/read_transaction.cc
nternal_api/sync_encryption_handler_impl.cc
nternal_api/sync_encryption_handler_impl.h
nternal_api/sync_encryption_handler_impl_unittest.cc
nternal_api/sync_manager_factory.cc
nternal_api/sync_manager_impl.cc
nternal_api/sync_manager_impl.h
nternal_api/sync_manager_impl_unittest.cc
nternal_api/syncapi_internal.cc
nternal_api/syncapi_internal.h
nternal_api/syncapi_server_connection_manager.cc
nternal_api/syncapi_server_connection_manager.h
nternal_api/syncapi_server_connection_manager_unittest.cc
nternal_api/test/fake_sync_manager.cc
nternal_api/test/test_entry_factory.cc
nternal_api/test/test_internal_components_factory.cc
nternal_api/test/test_user_share.cc
nternal_api/user_share.cc
nternal_api/write_node.cc
nternal_api/write_transaction.cc
s/DEPS
s/README.js
s/js_arg_list.cc
s/js_arg_list.h
s/js_arg_list_unittest.cc
s/js_backend.h
s/js_controller.h
s/js_event_details.cc
s/js_event_details.h
s/js_event_details_unittest.cc
s/js_event_handler.h
s/js_reply_handler.h
s/js_test_util.cc
s/js_test_util.h
s/sync_js_controller.cc
s/sync_js_controller.h
s/sync_js_controller_unittest.cc
otifier/DEPS
otifier/ack_tracker.cc
otifier/ack_tracker.h
otifier/ack_tracker_unittest.cc
otifier/fake_invalidation_handler.cc
otifier/fake_invalidation_handler.h
otifier/fake_invalidation_state_tracker.cc
otifier/fake_invalidation_state_tracker.h
otifier/fake_invalidator.cc
otifier/fake_invalidator.h
otifier/fake_invalidator_unittest.cc
otifier/invalidation_handler.h
otifier/invalidation_notifier.cc
otifier/invalidation_notifier.h
otifier/invalidation_notifier_unittest.cc
otifier/invalidation_state_tracker.h
otifier/invalidation_util.cc
otifier/invalidation_util.h
otifier/invalidator.h
otifier/invalidator_factory.cc
otifier/invalidator_factory.h
otifier/invalidator_factory_unittest.cc
otifier/invalidator_registrar.cc
otifier/invalidator_registrar.h
otifier/invalidator_registrar_unittest.cc
otifier/invalidator_state.cc
otifier/invalidator_state.h
otifier/invalidator_test_template.cc
otifier/invalidator_test_template.h
otifier/non_blocking_invalidator.cc
otifier/non_blocking_invalidator.h
otifier/non_blocking_invalidator_unittest.cc
otifier/object_id_invalidation_map.cc
otifier/object_id_invalidation_map.h
otifier/object_id_invalidation_map_test_util.cc
otifier/object_id_invalidation_map_test_util.h
otifier/p2p_invalidator.cc
otifier/p2p_invalidator.h
otifier/p2p_invalidator_unittest.cc
otifier/push_client_channel.cc
otifier/push_client_channel.h
otifier/push_client_channel_unittest.cc
otifier/registration_manager.cc
otifier/registration_manager.h
otifier/registration_manager_unittest.cc
otifier/state_writer.h
otifier/sync_invalidation_listener.cc
otifier/sync_invalidation_listener.h
otifier/sync_invalidation_listener_unittest.cc
otifier/sync_system_resources.cc
otifier/sync_system_resources.h
otifier/sync_system_resources_unittest.cc
rotocol/DEPS
rotocol/app_notification_specifics.proto
rotocol/app_setting_specifics.proto
rotocol/app_specifics.proto
rotocol/autofill_specifics.proto
rotocol/bookmark_specifics.proto
rotocol/client_commands.proto
rotocol/client_debug_info.proto
rotocol/device_info_specifics.proto
rotocol/encryption.proto
rotocol/experiments_specifics.proto
rotocol/extension_setting_specifics.proto
rotocol/extension_specifics.proto
rotocol/get_updates_caller_info.proto
rotocol/history_delete_directive_specifics.proto
rotocol/nigori_specifics.proto
rotocol/password_specifics.proto
rotocol/preference_specifics.proto
rotocol/proto_enum_conversions.cc
rotocol/proto_enum_conversions.h
rotocol/proto_enum_conversions_unittest.cc
rotocol/proto_value_conversions.cc
rotocol/proto_value_conversions.h
rotocol/proto_value_conversions_unittest.cc
rotocol/search_engine_specifics.proto
rotocol/session_specifics.proto
rotocol/sync.proto
rotocol/sync_enums.proto
rotocol/sync_proto.gyp
rotocol/sync_protocol_error.cc
rotocol/sync_protocol_error.h
rotocol/test.proto
rotocol/theme_specifics.proto
rotocol/typed_url_specifics.proto
essions/DEPS
essions/debug_info_getter.h
essions/ordered_commit_set.cc
essions/ordered_commit_set.h
essions/ordered_commit_set_unittest.cc
essions/status_controller.cc
essions/status_controller.h
essions/status_controller_unittest.cc
essions/sync_session.cc
essions/sync_session.h
essions/sync_session_context.cc
essions/sync_session_context.h
essions/sync_session_unittest.cc
essions/test_util.cc
essions/test_util.h
ync.gyp
yncable/DEPS
yncable/base_transaction.cc
yncable/base_transaction.h
yncable/blob.h
yncable/dir_open_result.h
yncable/directory.cc
yncable/directory.h
yncable/directory_backing_store.cc
yncable/directory_backing_store.h
yncable/directory_backing_store_unittest.cc
yncable/directory_change_delegate.h
yncable/entry.cc
yncable/entry.h
yncable/entry_kernel.cc
yncable/entry_kernel.h
yncable/in_memory_directory_backing_store.cc
yncable/in_memory_directory_backing_store.h
yncable/invalid_directory_backing_store.cc
yncable/invalid_directory_backing_store.h
yncable/metahandle_set.h
yncable/model_type.cc
yncable/model_type_unittest.cc
yncable/mutable_entry.cc
yncable/mutable_entry.h
yncable/nigori_handler.cc
yncable/nigori_handler.h
yncable/nigori_util.cc
yncable/nigori_util.h
yncable/nigori_util_unittest.cc
yncable/on_disk_directory_backing_store.cc
yncable/on_disk_directory_backing_store.h
yncable/read_transaction.cc
yncable/read_transaction.h
yncable/scoped_index_updater.h
yncable/scoped_kernel_lock.h
yncable/syncable-inl.h
yncable/syncable_changes_version.h
yncable/syncable_columns.h
yncable/syncable_enum_conversions.cc
yncable/syncable_enum_conversions.h
yncable/syncable_enum_conversions_unittest.cc
yncable/syncable_id.cc
yncable/syncable_id.h
yncable/syncable_id_unittest.cc
yncable/syncable_mock.cc
yncable/syncable_mock.h
yncable/syncable_proto_util.cc
yncable/syncable_proto_util.h
yncable/syncable_unittest.cc
yncable/syncable_util.cc
yncable/syncable_util.h
yncable/transaction_observer.h
yncable/write_transaction.cc
yncable/write_transaction.h
yncable/write_transaction_info.cc
yncable/write_transaction_info.h
est/DEPS
est/callback_counter.h
est/engine/fake_model_worker.cc
est/engine/fake_model_worker.h
est/engine/fake_sync_scheduler.cc
est/engine/fake_sync_scheduler.h
est/engine/mock_connection_manager.cc
est/engine/mock_connection_manager.h
est/engine/syncer_command_test.cc
est/engine/syncer_command_test.h
est/engine/test_directory_setter_upper.cc
est/engine/test_directory_setter_upper.h
est/engine/test_id_factory.h
est/engine/test_syncable_utils.cc
est/engine/test_syncable_utils.h
est/fake_encryptor.cc
est/fake_encryptor.h
est/fake_extensions_activity_monitor.cc
est/fake_extensions_activity_monitor.h
est/fake_sync_encryption_handler.cc
est/fake_sync_encryption_handler.h
est/null_directory_change_delegate.cc
est/null_directory_change_delegate.h
est/null_transaction_observer.cc
est/null_transaction_observer.h
est/sessions/test_scoped_session_event_listener.h
est/test_directory_backing_store.cc
est/test_directory_backing_store.h
ools/DEPS
ools/sync_client.cc
ools/sync_listen_notifications.cc
til/DEPS
til/cryptographer.cc
til/cryptographer.h
til/cryptographer_unittest.cc
til/data_encryption_win.cc
til/data_encryption_win.h
til/data_encryption_win_unittest.cc
til/data_type_histogram.h
til/data_type_histogram_unittest.cc
til/encryptor.h
til/extensions_activity_monitor.cc
til/extensions_activity_monitor.h
til/get_session_name.cc
til/get_session_name.h
til/get_session_name_mac.h
til/get_session_name_mac.mm
til/get_session_name_unittest.cc
til/get_session_name_win.cc
til/get_session_name_win.h
til/logging.cc
til/logging.h
til/nigori.cc
til/nigori.h
til/nigori_unittest.cc
til/protobuf_unittest.cc
til/session_utils_android.cc
til/session_utils_android.h
til/test_unrecoverable_error_handler.cc
til/test_unrecoverable_error_handler.h
til/time.cc
til/time.h