Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1605)

Unified Diff: sync/engine/syncer.cc

Issue 11342008: Revert 164565 - sync: make scheduling logic and job ownership more obvious. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1311/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/engine/syncer.h ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer.cc
===================================================================
--- sync/engine/syncer.cc (revision 164641)
+++ sync/engine/syncer.cc (working copy)
@@ -83,7 +83,7 @@
early_exit_requested_ = true;
}
-bool Syncer::SyncShare(sessions::SyncSession* session,
+void Syncer::SyncShare(sessions::SyncSession* session,
SyncerStep first_step,
SyncerStep last_step) {
ScopedSessionContextConflictResolver scoped(session->context(),
@@ -179,16 +179,17 @@
}
default:
LOG(ERROR) << "Unknown command: " << current_step;
- } // switch
+ }
DVLOG(2) << "last step: " << SyncerStepToString(last_step) << ", "
<< "current step: " << SyncerStepToString(current_step) << ", "
<< "next step: " << SyncerStepToString(next_step) << ", "
<< "snapshot: " << session->TakeSnapshot().ToString();
- if (last_step == current_step)
- return true;
+ if (last_step == current_step) {
+ session->SetFinished();
+ break;
+ }
current_step = next_step;
- } // while
- return false;
+ }
}
void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest) {
« no previous file with comments | « sync/engine/syncer.h ('k') | sync/engine/syncer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698