FYI: Move conflict resolve + clean up afterwards

sync/internal_api/sync_manager_impl.cc

Index: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index d035cb7bc98ea521925eebcfcd22e717d790ec97..76562f59292518c0e2b08221636a546b5dc94b33 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -956,16 +956,11 @@ void SyncManagerImpl::OnSyncEngineEvent(const SyncEngineEvent& event) {
       return;
     }
 
-    if (!event.snapshot.has_more_to_sync()) {
-      DVLOG(1) << "Sending OnSyncCycleCompleted";
-      FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
-                        OnSyncCycleCompleted(event.snapshot));
-    }
+    DVLOG(1) << "Sending OnSyncCycleCompleted";
+    FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
+                      OnSyncCycleCompleted(event.snapshot));
 
     // This is here for tests, which are still using p2p notifications.
-    //
-    // TODO(chron): Consider changing this back to track has_more_to_sync
-    // only notify peers if a successful commit has occurred.
     bool is_notifiable_commit =
         (event.snapshot.model_neutral_state().num_successful_commits > 0);
     if (is_notifiable_commit) {