summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp20
1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d151cba..78f1a56 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -5496,6 +5496,8 @@
'browser/sync/engine/syncer_unittest.cc',
'browser/sync/engine/syncproto_unittest.cc',
'browser/sync/notifier/listener/talk_mediator_unittest.cc',
+ 'browser/sync/sessions/status_controller_unittest.cc',
+ 'browser/sync/sessions/sync_session_unittest.cc',
'browser/sync/syncable/syncable_id_unittest.cc',
'browser/sync/syncable/syncable_unittest.cc',
'browser/sync/util/character_set_converters_unittest.cc',
@@ -5583,9 +5585,6 @@
'browser/sync/engine/build_commit_command.h',
'browser/sync/engine/change_reorder_buffer.cc',
'browser/sync/engine/change_reorder_buffer.h',
- 'browser/sync/engine/client_command_channel.h',
- 'browser/sync/engine/conflict_resolution_view.cc',
- 'browser/sync/engine/conflict_resolution_view.h',
'browser/sync/engine/conflict_resolver.cc',
'browser/sync/engine/conflict_resolver.h',
'browser/sync/engine/download_updates_command.cc',
@@ -5612,9 +5611,6 @@
'browser/sync/engine/process_updates_command.h',
'browser/sync/engine/resolve_conflicts_command.cc',
'browser/sync/engine/resolve_conflicts_command.h',
- 'browser/sync/engine/sync_cycle_state.h',
- 'browser/sync/engine/sync_process_state.cc',
- 'browser/sync/engine/sync_process_state.h',
'browser/sync/engine/syncapi.h',
'browser/sync/engine/syncer.cc',
'browser/sync/engine/syncer.h',
@@ -5624,13 +5620,8 @@
'browser/sync/engine/syncer_end_command.h',
'browser/sync/engine/syncer_proto_util.cc',
'browser/sync/engine/syncer_proto_util.h',
- 'browser/sync/engine/syncer_session.h',
- 'browser/sync/engine/syncer_status.cc',
- 'browser/sync/engine/syncer_status.h',
'browser/sync/engine/syncer_thread.cc',
'browser/sync/engine/syncer_thread.h',
- 'browser/sync/engine/syncer_thread_timed_stop.cc',
- 'browser/sync/engine/syncer_thread_timed_stop.h',
'browser/sync/engine/syncer_types.h',
'browser/sync/engine/syncer_util.cc',
'browser/sync/engine/syncer_util.h',
@@ -5640,6 +5631,13 @@
'browser/sync/engine/verify_updates_command.cc',
'browser/sync/engine/verify_updates_command.h',
'browser/sync/protocol/service_constants.h',
+ 'browser/sync/sessions/session_state.cc',
+ 'browser/sync/sessions/session_state.h',
+ 'browser/sync/sessions/status_controller.cc',
+ 'browser/sync/sessions/status_controller.h',
+ 'browser/sync/sessions/sync_session.cc',
+ 'browser/sync/sessions/sync_session.h',
+ 'browser/sync/sessions/sync_session_context.h',
'browser/sync/syncable/blob.h',
'browser/sync/syncable/dir_open_result.h',
'browser/sync/syncable/directory_backing_store.cc',