diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 21:40:05 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 21:40:05 +0000 |
| commit | 034565e3656a7d1227ff77e8eb3f6f06e4b64ff6 (patch) | |
| tree | 77e02774c532271f9a192fb9c904a7343708a407 /chrome/browser/sync/engine/syncer.cc | |
| parent | 47e9c75cebaa22ecb24c7bb4cde81f2cf507590b (diff) | |
| download | chromium_src-034565e3656a7d1227ff77e8eb3f6f06e4b64ff6.zip chromium_src-034565e3656a7d1227ff77e8eb3f6f06e4b64ff6.tar.gz chromium_src-034565e3656a7d1227ff77e8eb3f6f06e4b64ff6.tar.bz2 | |
For sync, make ProcessCommitResponseCommand handle commit entries one ModelSafeGroup at a time.
Enforce ModelSafeGroup restrictions in the StatusController by DCHECKing if out-of-bounds.
Move OrderedCommitSet to its own file.
Removed some unused error counters and ResetTransientState calls that were useless.
BUG=31911
TEST=ProcessCommitResponseTest, OrderedCommitSetTest
Review URL: http://codereview.chromium.org/604045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncer.cc')
| -rwxr-xr-x | chrome/browser/sync/engine/syncer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc index 8316390..9170a46 100755 --- a/chrome/browser/sync/engine/syncer.cc +++ b/chrome/browser/sync/engine/syncer.cc @@ -81,7 +81,6 @@ bool Syncer::SyncShare(sessions::SyncSession::Delegate* delegate) { } bool Syncer::SyncShare(sessions::SyncSession* session) { - session->status_controller()->ResetTransientState(); session->set_source(TestAndSetUpdatesSource()); // This isn't perfect, as we can end up bundling extensions activity // intended for the next session into the current one. We could do a @@ -197,6 +196,7 @@ void Syncer::SyncShare(sessions::SyncSession* session, } case PROCESS_COMMIT_RESPONSE: { LOG(INFO) << "Processing the commit response"; + session->status_controller()->reset_num_conflicting_commits(); ProcessCommitResponseCommand process_response_command; process_response_command.Execute(session); next_step = BUILD_AND_PROCESS_CONFLICT_SETS; |