• Home
  • History
  • Annotate
  • only in /external/chromium_org/chrome/browser/sync_file_system/
History log of /external/chromium_org/chrome/browser/sync_file_system/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
rive_backend/callback_helper.h
rive_backend/callback_helper_unittest.cc
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/drive_service_on_worker.cc
rive_backend/drive_uploader_on_worker.cc
rive_backend/fake_drive_service_helper.cc
rive_backend/fake_drive_uploader.h
rive_backend/folder_creator.cc
rive_backend/folder_creator.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_index.cc
rive_backend/metadata_database_index_on_disk.cc
rive_backend/metadata_database_index_on_disk.h
rive_backend/metadata_database_index_on_disk_unittest.cc
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util.cc
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_change_processor_on_worker.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/sync_worker.cc
rive_backend/task_dependency_manager.cc
rive_backend/task_dependency_manager.h
rive_backend/task_dependency_manager_unittest.cc
rive_backend/uninstall_app_task.cc
ake_remote_change_processor.cc
ile_change.h
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service_unittest.cc
ocal/local_file_sync_status.cc
ocal/local_file_sync_status.h
ocal/root_delete_helper.cc
ocal/root_delete_helper.h
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner.h
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ocal/syncable_file_system_unittest.cc
ogger.cc
ock_local_change_processor.cc
ock_remote_file_sync_service.cc
emote_file_sync_service.h
ubtree_set.cc
ync_callbacks.h
ync_file_metadata.h
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_unittest.cc
yncable_file_system_util.cc
yncable_file_system_util.h
yncable_file_system_util_unittest.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
onflict_resolution_resolver.cc
onflict_resolution_resolver.h
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/fake_sync_worker.cc
rive_backend/fake_sync_worker.h
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database_index_on_disk.cc
rive_backend/metadata_database_index_on_disk_unittest.cc
rive_backend/metadata_db_migration_util.cc
rive_backend/metadata_db_migration_util.h
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/remote_change_processor_on_worker.cc
rive_backend/remote_change_processor_on_worker.h
rive_backend/remote_change_processor_wrapper.cc
rive_backend/remote_change_processor_wrapper.h
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend/sync_worker_interface.h
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/api_util_interface.h
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_service_unittest.cc
rive_backend_v1/drive_file_sync_util.cc
rive_backend_v1/drive_file_sync_util.h
rive_backend_v1/drive_metadata_store.cc
rive_backend_v1/drive_metadata_store.h
rive_backend_v1/drive_metadata_store_unittest.cc
rive_backend_v1/fake_api_util.cc
rive_backend_v1/fake_api_util.h
rive_backend_v1/fake_api_util_unittest.cc
rive_backend_v1/local_sync_delegate.cc
rive_backend_v1/local_sync_delegate.h
rive_backend_v1/local_sync_operation_resolver.cc
rive_backend_v1/local_sync_operation_resolver.h
rive_backend_v1/local_sync_operation_resolver_unittest.cc
rive_backend_v1/origin_operation_queue.cc
rive_backend_v1/origin_operation_queue.h
rive_backend_v1/origin_operation_queue_unittest.cc
rive_backend_v1/remote_change_handler.cc
rive_backend_v1/remote_change_handler.h
rive_backend_v1/remote_sync_delegate.cc
rive_backend_v1/remote_sync_delegate.h
rive_backend_v1/remote_sync_operation_resolver.cc
rive_backend_v1/remote_sync_operation_resolver.h
rive_backend_v1/remote_sync_operation_resolver_unittest.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ile_status_observer.h
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ocal/local_file_sync_service_unittest.cc
ocal/local_file_sync_status.cc
ocal/local_file_sync_status.h
ocal/local_file_sync_status_unittest.cc
ocal/mock_sync_status_observer.h
ocal/root_delete_helper.cc
ocal/root_delete_helper.h
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner.cc
ocal/syncable_file_operation_runner.h
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ocal/syncable_file_system_unittest.cc
ocal_change_processor.h
ock_local_change_processor.cc
ock_local_change_processor.h
ock_remote_change_processor.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_processor.h
emote_file_sync_service.cc
emote_file_sync_service.h
ubtree_set.cc
ync_callbacks.h
ync_event_observer.h
ync_file_metadata.h
ync_file_system.proto
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_file_system_test_util.h
ync_process_runner.cc
ync_process_runner.h
yncable_file_system_util.cc
yncable_file_system_util.h
yncable_file_system_util_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
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/drive_backend_sync_unittest.cc
rive_backend/leveldb_wrapper.cc
rive_backend/leveldb_wrapper.h
rive_backend/leveldb_wrapper_unittest.cc
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_index.cc
rive_backend/metadata_database_index.h
rive_backend/metadata_database_index_interface.h
rive_backend/metadata_database_index_on_disk.cc
rive_backend/metadata_database_index_on_disk.h
rive_backend/metadata_database_index_on_disk_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_unittest.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker_unittest.cc
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service_factory.cc
ync_file_system_service_factory.h
ync_file_system_service_unittest.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
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/drive_service_on_worker.cc
rive_backend/drive_service_on_worker.h
rive_backend/fake_drive_service_helper.cc
rive_backend/fake_sync_worker.cc
rive_backend/fake_sync_worker.h
rive_backend/leveldb_wrapper.cc
rive_backend/leveldb_wrapper.h
rive_backend/leveldb_wrapper_unittest.cc
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_index.cc
rive_backend/metadata_database_index.h
rive_backend/metadata_database_index_interface.h
rive_backend/metadata_database_index_on_disk.cc
rive_backend/metadata_database_index_on_disk.h
rive_backend/metadata_database_index_on_disk_unittest.cc
rive_backend/metadata_database_index_unittest.cc
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util.cc
rive_backend/metadata_db_migration_util.h
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend/sync_worker_interface.h
rive_backend/sync_worker_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ock_remote_file_sync_service.h
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service.h
yncable_file_system_util.cc
yncable_file_system_util.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
UILD.gn
rive_backend/BUILD.gn
rive_backend/callback_helper_unittest.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_test_util.cc
rive_backend/drive_backend_test_util.h
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/fake_drive_uploader.cc
rive_backend/fake_sync_worker.cc
rive_backend/fake_sync_worker.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_index.cc
rive_backend/metadata_database_index.h
rive_backend/metadata_database_index_interface.h
rive_backend/metadata_database_index_on_disk.cc
rive_backend/metadata_database_index_on_disk.h
rive_backend/metadata_database_index_on_disk_unittest.cc
rive_backend/metadata_database_index_unittest.cc
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend/sync_worker_interface.h
rive_backend/sync_worker_unittest.cc
rive_backend/uninstall_app_task.cc
rive_backend_v1/api_util.cc
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_service_unittest.cc
rive_backend_v1/drive_metadata_store.cc
rive_backend_v1/drive_metadata_store_unittest.cc
rive_backend_v1/fake_api_util.cc
rive_backend_v1/local_sync_delegate.cc
rive_backend_v1/remote_sync_delegate.cc
ake_remote_change_processor.cc
ocal/canned_syncable_file_system.cc
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service_unittest.cc
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_unittest.cc
ock_local_change_processor.cc
ock_remote_file_sync_service.cc
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_process_runner.cc
ync_process_runner.h
ync_process_runner_unittest.cc
yncable_file_system_util.cc
yncable_file_system_util.h
yncable_file_system_util_unittest.cc
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
rive_backend/conflict_resolver_unittest.cc
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_index.cc
rive_backend/metadata_database_index.h
rive_backend/metadata_database_index_interface.h
rive_backend/metadata_database_index_unittest.cc
rive_backend/metadata_database_unittest.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_worker.cc
rive_backend_v1/drive_file_sync_service.cc
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
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_util.h
rive_backend/fake_sync_worker.cc
rive_backend/fake_sync_worker.h
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/remote_change_processor_on_worker.cc
rive_backend/remote_change_processor_on_worker.h
rive_backend/remote_to_local_syncer.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.h
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend/sync_worker_interface.h
rive_backend/sync_worker_unittest.cc
ask_logger.cc
ask_logger.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
rive_backend/callback_tracker.cc
rive_backend/callback_tracker.h
rive_backend/callback_tracker_internal.cc
rive_backend/callback_tracker_internal.h
rive_backend/callback_tracker_internal.h.pump
rive_backend/callback_tracker_unittest.cc
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver.h
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/drive_service_on_worker.cc
rive_backend/drive_service_on_worker.h
rive_backend/drive_service_wrapper.cc
rive_backend/drive_service_wrapper.h
rive_backend/drive_uploader_on_worker.cc
rive_backend/drive_uploader_on_worker.h
rive_backend/drive_uploader_wrapper.cc
rive_backend/drive_uploader_wrapper.h
rive_backend/fake_drive_service_helper.cc
rive_backend/fake_drive_service_helper.h
rive_backend/fake_drive_uploader.cc
rive_backend/fake_drive_uploader.h
rive_backend/folder_creator.cc
rive_backend/folder_creator.h
rive_backend/list_changes_task.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/metadata_database_index.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_change_processor_on_worker.cc
rive_backend/remote_change_processor_on_worker.h
rive_backend/remote_change_processor_wrapper.cc
rive_backend/remote_change_processor_wrapper.h
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
ask_logger.cc
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
rive_backend/callback_helper.h
rive_backend/callback_helper.h.pump
rive_backend/callback_helper_unittest.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_service_on_worker.cc
rive_backend/drive_service_on_worker.h
rive_backend/drive_service_wrapper.cc
rive_backend/drive_service_wrapper.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_service_unittest.cc
ocal/local_file_change_tracker.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context_unittest.cc
ocal/syncable_file_system_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_file_sync_service.cc
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
yncable_file_system_util.cc
yncable_file_system_util.h
ask_logger.cc
ask_logger.h
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
rive_backend/callback_helper.h
rive_backend/callback_helper.h.pump
rive_backend/callback_helper_unittest.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_service_on_worker.cc
rive_backend/drive_service_on_worker.h
rive_backend/drive_service_wrapper.cc
rive_backend/drive_service_wrapper.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend_v1/api_util.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
rive_backend/callback_helper.h
rive_backend/callback_helper.h.pump
rive_backend/callback_helper_unittest.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_service_on_worker.cc
rive_backend/drive_service_on_worker.h
rive_backend/drive_service_wrapper.cc
rive_backend/drive_service_wrapper.h
rive_backend/drive_uploader_on_worker.cc
rive_backend/drive_uploader_on_worker.h
rive_backend/drive_uploader_wrapper.cc
rive_backend/drive_uploader_wrapper.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_change_processor_on_worker.cc
rive_backend/remote_change_processor_on_worker.h
rive_backend/remote_change_processor_wrapper.cc
rive_backend/remote_change_processor_wrapper.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
ocal/canned_syncable_file_system.cc
ocal/local_file_sync_status.cc
ocal/local_file_sync_status.h
ocal/local_file_sync_status_unittest.cc
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
rive_backend/callback_helper.h
rive_backend/callback_helper_unittest.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend_v1/fake_api_util.cc
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
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_worker.cc
rive_backend/sync_worker.h
rive_backend/task_dependency_manager.cc
rive_backend/task_dependency_manager.h
rive_backend/task_dependency_manager_unittest.cc
ocal/local_file_sync_service.cc
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
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_sync_unittest.cc
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_service_unittest.cc
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
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver.h
rive_backend/conflict_resolver_unittest.cc
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task.h
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task.cc
rive_backend/sync_task.h
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager_unittest.cc
rive_backend/uninstall_app_task.cc
rive_backend/uninstall_app_task.h
rive_backend_v1/api_util.cc
rive_backend_v1/drive_file_sync_service.cc
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
rive_backend_v1/api_util.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
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_util.cc
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.cc
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/task_dependency_manager.cc
rive_backend/task_dependency_manager.h
rive_backend/task_dependency_manager_unittest.cc
rive_backend_v1/api_util.cc
rive_backend_v1/drive_file_sync_service.cc
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
rive_backend/sync_engine.cc
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/task_dependency_manager.cc
rive_backend_v1/api_util.cc
ocal/canned_syncable_file_system.cc
ync_file_system_service.cc
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
onflict_resolution_policy.h
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver.h
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_test_util.cc
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/fake_drive_service_helper.cc
rive_backend/folder_creator.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_index.cc
rive_backend/metadata_database_index.h
rive_backend/metadata_database_index_unittest.cc
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task.h
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/sync_task.cc
rive_backend/sync_task.h
rive_backend/sync_task_manager.cc
rive_backend/sync_task_manager.h
rive_backend/sync_task_manager_unittest.cc
rive_backend/sync_task_token.cc
rive_backend/sync_task_token.h
rive_backend/task_dependency_manager.cc
rive_backend/task_dependency_manager.h
rive_backend/task_dependency_manager_unittest.cc
rive_backend/tracker_id_set.cc
rive_backend/tracker_id_set.h
rive_backend/tracker_set.cc
rive_backend/tracker_set.h
rive_backend/uninstall_app_task.cc
rive_backend/uninstall_app_task.h
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service_unittest.cc
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_file_sync_service.h
ubtree_set.cc
ubtree_set.h
ubtree_set_unittest.cc
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_factory.h
ync_process_runner.h
ync_task.h
ync_task_manager.cc
ync_task_manager.h
ync_task_manager_unittest.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
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver.h
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/drive_backend_sync_unittest.cc
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/fake_drive_service_helper.cc
rive_backend/fake_drive_service_helper.h
rive_backend/fake_drive_uploader.cc
rive_backend/fake_drive_uploader.h
rive_backend/folder_creator.cc
rive_backend/folder_creator.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/uninstall_app_task.cc
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_util.cc
rive_backend_v1/drive_file_sync_util.h
rive_backend_v1/drive_metadata_store.cc
rive_backend_v1/fake_drive_service_helper.cc
rive_backend_v1/fake_drive_service_helper.h
rive_backend_v1/fake_drive_uploader.cc
rive_backend_v1/fake_drive_uploader.h
rive_backend_v1/remote_sync_delegate.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ocal/local_file_sync_service_unittest.cc
ocal/root_delete_helper.cc
ocal/root_delete_helper.h
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ocal/syncable_file_system_unittest.cc
ogger.cc
ock_remote_file_sync_service.h
emote_file_sync_service.h
ync_action.cc
ync_action.h
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_process_runner.cc
ync_process_runner.h
ync_status_code.cc
ync_status_code.h
yncable_file_system_util.cc
yncable_file_system_util.h
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
rive_backend/conflict_resolver.cc
rive_backend/conflict_resolver.h
rive_backend/conflict_resolver_unittest.cc
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_test_util.cc
rive_backend/drive_backend_test_util.h
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/folder_creator.cc
rive_backend/folder_creator.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/local_to_remote_syncer_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task.h
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/sync_engine_unittest.cc
rive_backend/uninstall_app_task.cc
rive_backend/uninstall_app_task.h
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/api_util_interface.h
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_util.h
rive_backend_v1/drive_metadata_store.cc
rive_backend_v1/drive_metadata_store.h
rive_backend_v1/drive_metadata_store_unittest.cc
rive_backend_v1/fake_api_util.cc
rive_backend_v1/fake_api_util.h
rive_backend_v1/fake_api_util_unittest.cc
rive_backend_v1/fake_drive_service_helper.cc
rive_backend_v1/fake_drive_service_helper.h
rive_backend_v1/fake_drive_uploader.cc
rive_backend_v1/fake_drive_uploader.h
ake_remote_change_processor.cc
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ocal/local_file_sync_service_unittest.cc
ocal/root_delete_helper.cc
ocal/root_delete_helper.h
ocal/sync_file_system_backend.cc
ocal/syncable_file_operation_runner_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_file_sync_service.cc
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
ync_file_system_test_util.h
ync_process_runner.cc
ync_process_runner.h
ync_status_code.cc
ync_task_manager.cc
ync_task_manager.h
ync_task_manager_unittest.cc
yncable_file_system_util.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
WNERS
rive_backend/OWNERS
rive_backend/drive_backend_test_util.cc
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database.proto
rive_backend/metadata_database_unittest.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/remote_to_local_syncer_unittest.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_unittest.cc
rive_backend/tracker_set.h
rive_backend/uninstall_app_task.cc
rive_backend_v1/OWNERS
rive_backend_v1/api_util.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_util.cc
rive_backend_v1/drive_metadata_store.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ocal/syncable_file_system_operation.cc
ync_file_system_service.cc
ync_file_system_service_factory.cc
ync_task.h
ync_task_manager.cc
ync_task_manager.h
ync_task_manager_unittest.cc
yncable_file_system_util.cc
yncable_file_system_util.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
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
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/list_changes_task.cc
rive_backend/list_changes_task.h
rive_backend/list_changes_task_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/register_app_task.cc
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend_v1/api_util.cc
rive_backend_v1/api_util_interface.h
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/fake_api_util.cc
rive_backend_v1/fake_api_util_unittest.cc
rive_backend_v1/remote_sync_delegate.cc
rive_backend_v1/remote_sync_delegate.h
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
emote_file_sync_service.h
ync_file_system_service.cc
ync_task_manager.cc
ync_task_manager.h
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
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/drive_backend_util.cc
rive_backend/drive_backend_util.h
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task_unittest.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/fake_drive_service_helper.cc
rive_backend_v1/fake_drive_service_helper.h
ocal/sync_file_system_backend.cc
ocal/syncable_file_system_unittest.cc
ync_file_system_test_util.cc
ync_file_system_test_util.h
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
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/register_app_task.cc
rive_backend/register_app_task.h
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_context.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/uninstall_app_task.cc
rive_backend/uninstall_app_task.h
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_metadata_store.cc
rive_backend_v1/origin_operation_queue.cc
rive_backend_v1/origin_operation_queue.h
rive_backend_v1/origin_operation_queue_unittest.cc
rive_backend_v1/remote_sync_delegate.cc
rive_backend_v1/remote_sync_delegate.h
ake_remote_change_processor.cc
ake_remote_change_processor.h
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ocal/local_file_sync_service_unittest.cc
ocal/syncable_file_system_unittest.cc
ock_remote_change_processor.h
emote_change_processor.h
ync_file_system_service.cc
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
yncable_file_system_util.cc
yncable_file_system_util.h
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
rive_backend/drive_backend_constants.cc
rive_backend/drive_backend_constants.h
rive_backend/drive_backend_test_util.cc
rive_backend/metadata_database.h
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_service_unittest.cc
rive_backend_v1/drive_metadata_store.cc
ocal/canned_syncable_file_system.cc
ocal/local_file_sync_context.cc
ocal/sync_file_system_backend.cc
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
yncable_file_system_util_unittest.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
rive_backend/drive_backend_test_util.cc
rive_backend/drive_backend_test_util.h
rive_backend/metadata_database.cc
rive_backend/metadata_database_unittest.cc
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_util.cc
rive_backend_v1/fake_api_util.cc
rive_backend_v1/origin_operation_queue.cc
rive_backend_v1/origin_operation_queue.h
rive_backend_v1/origin_operation_queue_unittest.cc
rive_backend_v1/remote_sync_delegate.cc
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ocal/local_file_sync_service_unittest.cc
ocal/local_file_sync_status.cc
ocal/sync_file_system_backend.cc
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ocal/syncable_file_system_unittest.cc
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_test_util.cc
ync_file_system_test_util.h
ync_status_code.cc
ync_status_code.h
ync_task_manager.cc
yncable_file_system_util.cc
yncable_file_system_util.h
yncable_file_system_util_unittest.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
rive_backend/api_util.cc
rive_backend/api_util.h
rive_backend/api_util_interface.h
rive_backend/api_util_unittest.cc
rive_backend/drive_backend_test_util.cc
rive_backend/drive_backend_test_util.h
rive_backend/drive_file_sync_service.cc
rive_backend/drive_file_sync_service.h
rive_backend/drive_file_sync_service_fake_unittest.cc
rive_backend/drive_file_sync_service_sync_unittest.cc
rive_backend/drive_file_sync_service_unittest.cc
rive_backend/drive_file_sync_util.cc
rive_backend/drive_file_sync_util.h
rive_backend/drive_metadata_store.cc
rive_backend/drive_metadata_store.h
rive_backend/drive_metadata_store_unittest.cc
rive_backend/fake_api_util.cc
rive_backend/fake_api_util.h
rive_backend/fake_api_util_unittest.cc
rive_backend/fake_drive_service_helper.cc
rive_backend/fake_drive_service_helper.h
rive_backend/local_sync_delegate.cc
rive_backend/local_sync_delegate.h
rive_backend/local_sync_operation_resolver.cc
rive_backend/local_sync_operation_resolver.h
rive_backend/local_sync_operation_resolver_unittest.cc
rive_backend/local_to_remote_syncer.cc
rive_backend/local_to_remote_syncer.h
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/remote_change_handler.cc
rive_backend/remote_change_handler.h
rive_backend/remote_sync_delegate.cc
rive_backend/remote_sync_delegate.h
rive_backend/remote_sync_operation_resolver.cc
rive_backend/remote_sync_operation_resolver.h
rive_backend/remote_sync_operation_resolver_unittest.cc
rive_backend/remote_to_local_syncer.cc
rive_backend/remote_to_local_syncer.h
rive_backend/sync_engine.cc
rive_backend/sync_engine.h
rive_backend/sync_engine_initializer.cc
rive_backend/sync_engine_initializer.h
rive_backend/sync_engine_initializer_unittest.cc
rive_backend/tracker_set.h
rive_backend_v1/OWNERS
rive_backend_v1/api_util.cc
rive_backend_v1/api_util.h
rive_backend_v1/api_util_interface.h
rive_backend_v1/api_util_unittest.cc
rive_backend_v1/drive_file_sync_service.cc
rive_backend_v1/drive_file_sync_service.h
rive_backend_v1/drive_file_sync_service_fake_unittest.cc
rive_backend_v1/drive_file_sync_service_sync_unittest.cc
rive_backend_v1/drive_file_sync_service_unittest.cc
rive_backend_v1/drive_file_sync_util.cc
rive_backend_v1/drive_file_sync_util.h
rive_backend_v1/drive_metadata_store.cc
rive_backend_v1/drive_metadata_store.h
rive_backend_v1/drive_metadata_store_unittest.cc
rive_backend_v1/fake_api_util.cc
rive_backend_v1/fake_api_util.h
rive_backend_v1/fake_api_util_unittest.cc
rive_backend_v1/fake_drive_service_helper.cc
rive_backend_v1/fake_drive_service_helper.h
rive_backend_v1/local_sync_delegate.cc
rive_backend_v1/local_sync_delegate.h
rive_backend_v1/local_sync_operation_resolver.cc
rive_backend_v1/local_sync_operation_resolver.h
rive_backend_v1/local_sync_operation_resolver_unittest.cc
rive_backend_v1/remote_change_handler.cc
rive_backend_v1/remote_change_handler.h
rive_backend_v1/remote_sync_delegate.cc
rive_backend_v1/remote_sync_delegate.h
rive_backend_v1/remote_sync_operation_resolver.cc
rive_backend_v1/remote_sync_operation_resolver.h
rive_backend_v1/remote_sync_operation_resolver_unittest.cc
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_service.cc
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_status_code.cc
ync_status_code.h
ync_task.h
ync_task_manager.cc
ync_task_manager.h
ync_task_manager_unittest.cc
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
rive_backend/api_util.cc
rive_backend/api_util.h
rive_backend/api_util_interface.h
rive_backend/api_util_unittest.cc
rive_backend/drive_file_sync_service.cc
rive_backend/fake_api_util.cc
rive_backend/fake_api_util.h
rive_backend/fake_drive_service_helper.cc
rive_backend/local_sync_delegate.cc
rive_backend/local_sync_delegate.h
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
ocal/canned_syncable_file_system.cc
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_service_unittest.cc
ocal/local_file_sync_status.h
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ocal/syncable_file_system_unittest.cc
ogger_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
ync_file_status.h
ync_file_system_service.h
yncable_file_system_util.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
rive_backend/drive_file_sync_service.cc
rive_backend/drive_file_sync_service.h
rive_backend/drive_file_sync_service_fake_unittest.cc
rive_backend/drive_metadata_store.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database.proto
rive_backend/metadata_database_unittest.cc
rive_backend/remote_sync_delegate.cc
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ock_remote_file_sync_service.h
emote_file_sync_service.h
ync_status_code.cc
ync_status_code.h
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
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database.proto
rive_backend/metadata_database_unittest.cc
rive_backend/tracker_set.h
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
rive_backend/tracker_set.cc
rive_backend/tracker_set.h
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database.proto
rive_backend/metadata_database_unittest.cc
ync_file_system_service_unittest.cc
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
onflict_resolution_resolver.h
rive_backend/api_util.cc
rive_backend/drive_file_sync_service.cc
rive_backend/drive_file_sync_service.h
rive_backend/drive_file_sync_service_fake_unittest.cc
rive_backend/drive_file_sync_service_sync_unittest.cc
rive_backend/drive_file_sync_service_unittest.cc
rive_backend/drive_file_sync_util.h
rive_backend/drive_metadata_store.cc
rive_backend/drive_metadata_store.h
rive_backend/drive_metadata_store_unittest.cc
rive_backend/fake_api_util.h
rive_backend/fake_drive_service_helper.cc
rive_backend/local_sync_delegate.cc
rive_backend/local_sync_delegate.h
rive_backend/local_sync_operation_resolver.h
rive_backend/local_sync_operation_resolver_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_db_migration_util.h
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/remote_change_handler.h
rive_backend/remote_sync_delegate.cc
rive_backend/remote_sync_delegate.h
rive_backend/remote_sync_operation_resolver.h
rive_backend/remote_sync_operation_resolver_unittest.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ile_change.cc
ile_change.h
ile_change_unittest.cc
ile_status_observer.h
ocal/DEPS
ocal/canned_syncable_file_system.cc
ocal/canned_syncable_file_system.h
ocal/local_file_change_tracker.cc
ocal/local_file_change_tracker.h
ocal/local_file_change_tracker_unittest.cc
ocal/local_file_sync_context.cc
ocal/local_file_sync_context.h
ocal/local_file_sync_context_unittest.cc
ocal/local_file_sync_service.cc
ocal/local_file_sync_service.h
ocal/local_file_sync_service_unittest.cc
ocal/local_file_sync_status.cc
ocal/local_file_sync_status.h
ocal/local_file_sync_status_unittest.cc
ocal/local_origin_change_observer.h
ocal/mock_sync_status_observer.cc
ocal/mock_sync_status_observer.h
ocal/sync_file_system_backend.cc
ocal/sync_file_system_backend.h
ocal/syncable_file_operation_runner.cc
ocal/syncable_file_operation_runner.h
ocal/syncable_file_operation_runner_unittest.cc
ocal/syncable_file_system_operation.cc
ocal/syncable_file_system_operation.h
ocal/syncable_file_system_unittest.cc
ocal_change_processor.h
ocal_file_sync_service.cc
ocal_file_sync_service.h
ocal_file_sync_service_unittest.cc
ock_local_change_processor.cc
ock_remote_change_processor.h
ock_remote_file_sync_service.h
emote_change_processor.h
emote_file_sync_service.h
ync_callbacks.h
ync_file_metadata.cc
ync_file_metadata.h
ync_file_status.h
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
ync_file_type.h
ync_status_code.cc
ync_status_code.h
ync_task_manager.cc
ync_task_manager.h
yncable_file_system_util.cc
yncable_file_system_util.h
yncable_file_system_util_unittest.cc
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
rive_backend/api_util.cc
rive_backend/drive_file_sync_service_sync_unittest.cc
ocal_file_sync_service.cc
ocal_file_sync_service_unittest.cc
ogger.cc
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_unittest.cc
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
rive_backend/api_util.cc
rive_backend/api_util.h
rive_backend/api_util_unittest.cc
rive_backend/drive_file_sync_service_fake_unittest.cc
rive_backend/drive_file_sync_service_sync_unittest.cc
ync_file_system_service_factory.cc
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
rive_backend/api_util.cc
rive_backend/api_util.h
rive_backend/api_util_interface.h
rive_backend/api_util_unittest.cc
rive_backend/drive_file_sync_service.cc
rive_backend/drive_file_sync_service_fake_unittest.cc
rive_backend/drive_file_sync_service_sync_unittest.cc
rive_backend/drive_file_sync_service_unittest.cc
rive_backend/fake_api_util.cc
rive_backend/fake_api_util.h
rive_backend/fake_api_util_unittest.cc
rive_backend/remote_sync_delegate.cc
rive_backend/remote_sync_delegate.h
ocal_file_sync_service_unittest.cc
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
ync_file_system_test_util.h
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
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database_unittest.cc
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
rive_backend/drive_file_sync_service_sync_unittest.cc
rive_backend/drive_metadata_store_unittest.cc
rive_backend/fake_api_util_unittest.cc
rive_backend/fake_drive_service_helper.cc
ync_file_system_test_util.h
ync_task_manager_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
rive_backend/api_util.cc
rive_backend/api_util_unittest.cc
rive_backend/drive_file_sync_service.cc
rive_backend/drive_file_sync_service.h
rive_backend/drive_file_sync_service_fake_unittest.cc
rive_backend/drive_file_sync_service_sync_unittest.cc
rive_backend/drive_file_sync_service_unittest.cc
rive_backend/drive_file_sync_util.cc
rive_backend/drive_file_sync_util.h
rive_backend/drive_metadata_store.cc
rive_backend/drive_metadata_store.h
rive_backend/drive_metadata_store_unittest.cc
rive_backend/fake_drive_service_helper.cc
rive_backend/local_sync_delegate.cc
rive_backend/local_sync_delegate.h
rive_backend/local_sync_operation_resolver.cc
rive_backend/local_sync_operation_resolver.h
rive_backend/local_sync_operation_resolver_unittest.cc
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database.proto
rive_backend/metadata_database_unittest.cc
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/remote_change_handler.cc
rive_backend/remote_change_handler.h
rive_backend/remote_sync_delegate.cc
rive_backend/remote_sync_delegate.h
rive_backend/remote_sync_operation_resolver.cc
rive_backend/remote_sync_operation_resolver.h
rive_backend/remote_sync_operation_resolver_unittest.cc
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_fake_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ile_metadata.h
ocal_sync_operation_resolver.cc
ocal_sync_operation_resolver.h
ocal_sync_operation_resolver_unittest.cc
ogger.cc
ogger.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_handler.cc
emote_change_handler.h
emote_file_sync_service.h
emote_sync_operation_resolver.cc
emote_sync_operation_resolver.h
emote_sync_operation_resolver_unittest.cc
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.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
onflict_resolution_policy.h
onflict_resolution_resolver.cc
onflict_resolution_resolver.h
rive/api_util.cc
rive/api_util.h
rive/api_util_interface.h
rive/api_util_unittest.cc
rive/fake_api_util.cc
rive/fake_api_util.h
rive/fake_api_util_unittest.cc
rive/local_change_processor_delegate.cc
rive/local_change_processor_delegate.h
rive/metadata_db_migration_util.cc
rive/metadata_db_migration_util.h
rive/metadata_db_migration_util_unittest.cc
rive_backend/OWNERS
rive_backend/api_util.cc
rive_backend/api_util.h
rive_backend/api_util_interface.h
rive_backend/api_util_unittest.cc
rive_backend/fake_api_util.cc
rive_backend/fake_api_util.h
rive_backend/fake_api_util_unittest.cc
rive_backend/fake_drive_service_helper.cc
rive_backend/fake_drive_service_helper.h
rive_backend/local_sync_delegate.cc
rive_backend/local_sync_delegate.h
rive_backend/metadata_database.cc
rive_backend/metadata_database.h
rive_backend/metadata_database.proto
rive_backend/metadata_db_migration_util.cc
rive_backend/metadata_db_migration_util.h
rive_backend/metadata_db_migration_util_unittest.cc
rive_backend/remote_sync_delegate.cc
rive_backend/remote_sync_delegate.h
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_fake_unittest.cc
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ile_status_observer.h
ocal_file_sync_service.cc
ocal_file_sync_service_unittest.cc
ogger.cc
ogger.h
ogger_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_handler.h
emote_file_sync_service.h
ync_action.h
ync_direction.h
ync_file_system.proto
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.cc
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
rive/api_util.cc
rive/api_util.h
rive/api_util_unittest.cc
rive/fake_api_util.cc
rive/local_change_processor_delegate.cc
rive/local_change_processor_delegate.h
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_task_manager.cc
rive_file_sync_task_manager.h
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ile_metadata.h
ocal_file_sync_service.cc
ocal_file_sync_service_unittest.cc
ocal_sync_operation_resolver.cc
ocal_sync_operation_resolver.h
ocal_sync_operation_resolver_unittest.cc
ogger.cc
ock_remote_file_sync_service.h
emote_change_handler.cc
emote_change_handler.h
emote_file_sync_service.h
emote_sync_operation_resolver.cc
emote_sync_operation_resolver.h
emote_sync_operation_resolver_unittest.cc
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_test_util.cc
ync_file_system_test_util.h
ync_operation_type.cc
ync_operation_type.h
ync_task_manager.cc
ync_task_manager.h
ync_task_manager_unittest.cc
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
rive/local_change_processor_delegate.cc
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ile_metadata.h
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
rive/api_util.cc
rive/api_util.h
rive/api_util_interface.h
rive/local_change_processor_delegate.cc
rive/local_change_processor_delegate.h
rive/metadata_db_migration_util.cc
rive/metadata_db_migration_util.h
rive/metadata_db_migration_util_unittest.cc
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_task_manager.cc
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ocal_file_sync_service.cc
ocal_file_sync_service.h
ocal_file_sync_service_unittest.cc
ocal_sync_operation_resolver.cc
ocal_sync_operation_resolver.h
ocal_sync_operation_resolver_unittest.cc
ogger.cc
ogger_unittest.cc
ock_remote_change_processor.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_processor.h
emote_file_sync_service.h
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_unittest.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
rive/api_util.cc
rive/api_util.h
rive/api_util_interface.h
rive/api_util_unittest.cc
rive/fake_api_util.cc
rive/fake_api_util.h
rive/fake_api_util_unittest.cc
rive/local_change_processor_delegate.cc
rive/local_change_processor_delegate.h
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_task_manager.cc
rive_file_sync_task_manager.h
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ile_status_observer.h
ocal_change_processor.h
ocal_file_sync_service.cc
ocal_file_sync_service.h
ocal_file_sync_service_unittest.cc
ocal_sync_operation_resolver.h
ocal_sync_operation_resolver_unittest.cc
ogger.cc
ogger.h
ogger_unittest.cc
ock_local_change_processor.cc
ock_remote_change_processor.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_handler.cc
emote_change_handler.h
emote_change_processor.h
emote_file_sync_service.h
emote_sync_operation_resolver.h
emote_sync_operation_resolver_unittest.cc
ync_file_system.proto
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_factory.h
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
ync_file_system_test_util.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
rive/api_util.cc
rive/api_util.h
rive/api_util_interface.h
rive/api_util_unittest.cc
rive/fake_api_util.cc
rive/fake_api_util.h
rive/fake_api_util_unittest.cc
rive_file_sync_client.cc
rive_file_sync_client.h
rive_file_sync_client_interface.h
rive_file_sync_client_unittest.cc
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_task_manager.cc
rive_file_sync_task_manager.h
ake_drive_file_sync_client.cc
ake_drive_file_sync_client.h
ake_drive_file_sync_client_unittest.cc
emote_change_handler.cc
emote_change_handler.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
rive_file_sync_client_unittest.cc
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_metadata_store.cc
ake_drive_file_sync_client.cc
ake_remote_change_processor.cc
ocal_file_sync_service.cc
ocal_file_sync_service_unittest.cc
ocal_sync_operation_resolver.cc
ocal_sync_operation_resolver.h
ocal_sync_operation_resolver_unittest.cc
ock_local_change_processor.cc
ock_remote_file_sync_service.cc
ync_file_system_service.cc
ync_file_system_service_factory.cc
ync_file_system_test_util.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
rive_file_sync_client.cc
rive_file_sync_client.h
rive_file_sync_client_interface.h
rive_file_sync_client_unittest.cc
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ake_drive_file_sync_client.cc
ake_drive_file_sync_client.h
ake_drive_file_sync_client_unittest.cc
ocal_sync_operation_resolver.cc
ocal_sync_operation_resolver.h
ocal_sync_operation_resolver_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_file_sync_service.h
emote_sync_operation_resolver.cc
emote_sync_operation_resolver.h
emote_sync_operation_resolver_unittest.cc
ync_event_observer.h
ync_file_system.proto
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_factory.h
ync_file_system_service_unittest.cc
ync_service_state.h
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
onflict_resolution_policy.h
rive_file_sync_client.cc
rive_file_sync_client.h
rive_file_sync_client_interface.h
rive_file_sync_client_unittest.cc
rive_file_sync_service.cc
rive_file_sync_service.h
rive_file_sync_service_mock_unittest.cc
rive_file_sync_service_sync_unittest.cc
rive_file_sync_service_unittest.cc
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ake_drive_file_sync_client.cc
ake_drive_file_sync_client.h
ake_drive_file_sync_client_unittest.cc
ake_remote_change_processor.cc
ake_remote_change_processor.h
ile_status_observer.h
ocal_change_processor.h
ocal_file_sync_service.cc
ocal_file_sync_service.h
ocal_file_sync_service_unittest.cc
ock_local_change_processor.cc
ock_local_change_processor.h
ock_remote_change_processor.cc
ock_remote_change_processor.h
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_processor.h
emote_file_sync_service.h
ync_event_observer.h
ync_file_system.proto
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_service_factory.cc
ync_file_system_service_factory.h
ync_file_system_service_unittest.cc
ync_file_system_test_util.cc
ync_file_system_test_util.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
WNERS
rive_file_sync_client.cc
rive_file_sync_client.h
rive_file_sync_client_unittest.cc
rive_file_sync_util.cc
rive_file_sync_util.h
rive_metadata_store.cc
rive_metadata_store.h
rive_metadata_store_unittest.cc
ocal_change_processor.h
ocal_file_sync_service.cc
ocal_file_sync_service.h
ocal_file_sync_service_unittest.cc
ock_remote_file_sync_service.cc
ock_remote_file_sync_service.h
emote_change_processor.h
emote_file_sync_service.h
ync_file_system.proto
ync_file_system_service.cc
ync_file_system_service.h
ync_file_system_test_util.cc
ync_file_system_test_util.h