FYI: Move conflict resolve + clean up afterwards

sync/sessions/sync_session.cc

Index: sync/sessions/sync_session.cc
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index 5a2b572d8a1b5a9092ef0c8a3e15a4799df805db..4ff40facc4b07e53f8aa3dd61b3d7c30667d0220 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -145,13 +145,6 @@ void SyncSession::RebaseRoutingInfoWithLatest(const SyncSession& session) {
   enabled_groups_ = ComputeEnabledGroups(routing_info_, workers_);
 }
 
-void SyncSession::PrepareForAnotherSyncCycle() {
-  finished_ = false;
-  source_.updates_source =
-      sync_pb::GetUpdatesCallerInfo::SYNC_CYCLE_CONTINUATION;
-  status_controller_.reset(new StatusController(routing_info_));
-}
-
 SyncSessionSnapshot SyncSession::TakeSnapshot() const {
   syncable::Directory* dir = context_->directory();
 
@@ -174,11 +167,9 @@ SyncSessionSnapshot SyncSession::TakeSnapshot() const {
       is_share_useable,
       initial_sync_ended,
       download_progress_markers,
-      HasMoreToSync(),
       delegate_->IsSyncingCurrentlySilenced(),
       status_controller_->num_encryption_conflicts(),
       status_controller_->num_hierarchy_conflicts(),
-      status_controller_->num_simple_conflicts(),
       status_controller_->num_server_conflicts(),
       source_,
       context_->notifications_enabled(),
@@ -195,30 +186,10 @@ void SyncSession::SendEventNotification(SyncEngineEvent::EventCause cause) {
   context()->NotifyListeners(event);
 }
 
-bool SyncSession::HasMoreToSync() const {
-  const StatusController* status = status_controller_.get();
-  return status->conflicts_resolved();
-}
-
 const std::set<ModelSafeGroup>& SyncSession::GetEnabledGroups() const {
   return enabled_groups_;
 }
 
-// TODO(rlarocque): Delete this function after refactoring conflict resolution.
-std::set<ModelSafeGroup> SyncSession::GetEnabledGroupsWithConflicts() const {
-  const std::set<ModelSafeGroup>& enabled_groups = GetEnabledGroups();
-  std::set<ModelSafeGroup> enabled_groups_with_conflicts;
-  for (std::set<ModelSafeGroup>::const_iterator it =
-           enabled_groups.begin(); it != enabled_groups.end(); ++it) {
-    const std::set<syncable::Id>* ids =
-        status_controller_->GetUnrestrictedSimpleConflictIds(*it);
-    if (ids && ids->size() > 0) {
-      enabled_groups_with_conflicts.insert(*it);
-    }
-  }
-  return enabled_groups_with_conflicts;
-}
-
 namespace {
 
 // Returns false iff one of the command results had an error.