FYI: Remove PerModelSafeGroupState + move ConflictResolution

sync/engine/sync_scheduler_impl.cc

Index: sync/engine/sync_scheduler_impl.cc
diff --git a/sync/engine/sync_scheduler_impl.cc b/sync/engine/sync_scheduler_impl.cc
index d5f9dfff1f84f569d5704992240494ab757a7069..5074cb7def30f54ebdee0b60e47f979593c6e8aa 100644
--- a/sync/engine/sync_scheduler_impl.cc
+++ b/sync/engine/sync_scheduler_impl.cc
@@ -806,15 +806,9 @@ void SyncSchedulerImpl::DoSyncSessionJob(const SyncSessionJob& job) {
   SyncerStep end(SYNCER_END);
   SetSyncerStepsForPurpose(job.purpose, &begin, &end);
 
-  bool has_more_to_sync = true;
-  while (ShouldRunJob(job) && has_more_to_sync) {
-    SDVLOG(2) << "Calling SyncShare.";
-    // Synchronously perform the sync session from this thread.
-    syncer_->SyncShare(job.session.get(), begin, end);
-    has_more_to_sync = job.session->HasMoreToSync();
-    if (has_more_to_sync)
-      job.session->PrepareForAnotherSyncCycle();
-  }
+  SDVLOG(2) << "Calling SyncShare.";
+  // Synchronously perform the sync session from this thread.
+  syncer_->SyncShare(job.session.get(), begin, end);
   SDVLOG(2) << "Done SyncShare looping.";
 
   FinishSyncSessionJob(job);
@@ -878,8 +872,6 @@ void SyncSchedulerImpl::FinishSyncSessionJob(const SyncSessionJob& job) {
 
 void SyncSchedulerImpl::ScheduleNextSync(const SyncSessionJob& old_job) {
   DCHECK_EQ(MessageLoop::current(), sync_loop_);
-  DCHECK(!old_job.session->HasMoreToSync());
-
   AdjustPolling(&old_job);
 
   if (old_job.session->Succeeded()) {