summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 03:29:52 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 03:29:52 +0000
commit9ec27852a63c2d8fbcf4942629532af171f0a312 (patch)
tree5f22093d68d1699073439b40043383df8434da4f /chrome/chrome.gyp
parentfb6be8f376c29a67ca134c71f3a4e3c414dd4c47 (diff)
downloadchromium_src-9ec27852a63c2d8fbcf4942629532af171f0a312.zip
chromium_src-9ec27852a63c2d8fbcf4942629532af171f0a312.tar.gz
chromium_src-9ec27852a63c2d8fbcf4942629532af171f0a312.tar.bz2
Add browser_sync 'sessions' to relieve SyncCycleState, SyncProcessState, SyncerSession,
SyncerStatus, and ConflictResolutionView of duty. Main impact is factors all status munging to 'StatusController', adds SyncSessionContext to wrap various engine parts needed by different components, removes duplicated methods by a factor of ~3 making it easier to reason about, and adds a 'Controller' to the session object to give a way to delegate session-global (i.e affecting any session) occurrences such as throttling. Also adds testing for 'HasMoreToSync' and other session related code. BUG=25266 TEST=SyncSessionTest(added), StatusControllerTest(added) various sync_unit_tests in this CL Review URL: http://codereview.chromium.org/386030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32732 0039d316-1c4b-4281-b951-d872f2087c98
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',