FYI: Move conflict resolve + clean up afterwards

sync/internal_api/sync_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 938 matching lines @@
   //
   // Notifications are sent at the end of every sync cycle, regardless of
   // whether we should sync again.
   if (event.what_happened == SyncEngineEvent::SYNC_CYCLE_ENDED) {
     if (!initialized_) {
       LOG(INFO) << "OnSyncCycleCompleted not sent because sync api is not "
                 << "initialized";
       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) {
       if (invalidator_.get()) {
         const ObjectIdInvalidationMap& invalidation_map =
             ModelTypeInvalidationMapToObjectIdInvalidationMap(
                 event.snapshot.source().types);
         invalidator_->SendInvalidation(invalidation_map);
       } else {
         DVLOG(1) << "Not sending invalidation: invalidator_ is NULL";
@@ skipping 333 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer