Sync commit errors should temporarily re-enable trigger pre-commit getupdates

sync/engine/commit.cc

 // Copyright 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/engine/commit.h"
 
 #include "base/trace_event/trace_event.h"
 #include "sync/engine/commit_contribution.h"
 #include "sync/engine/commit_processor.h"
 #include "sync/engine/commit_util.h"
@@ skipping 65 matching lines @@
   for (std::map<ModelType, CommitContribution*>::iterator it =
            contributions.begin(); it != contributions.end(); ++it) {
     it->second->AddToCommitMessage(&message);
   }
 
   // If we made it this far, then we've successfully prepared a commit message.
   return new Commit(contributions, message, extensions_activity_buffer);
 }
 
 SyncerError Commit::PostAndProcessResponse(
+    sessions::NudgeTracker* nudge_tracker,
     sessions::SyncSession* session,
     sessions::StatusController* status,
     ExtensionsActivity* extensions_activity) {
   ModelTypeSet request_types;
   for (ContributionMap::const_iterator it = contributions_.begin();
        it != contributions_.end(); ++it) {
     request_types.Put(it->first);
   }
   session->mutable_status_controller()->set_commit_request_types(request_types);
 
@@ skipping 50 matching lines @@
   }
 
   // Let the contributors process the responses to each of their requests.
   SyncerError processing_result = SYNCER_OK;
   for (std::map<ModelType, CommitContribution*>::iterator it =
        contributions_.begin(); it != contributions_.end(); ++it) {
     TRACE_EVENT1("sync", "ProcessCommitResponse",
                  "type", ModelTypeToString(it->first));
     SyncerError type_result =
         it->second->ProcessCommitResponse(response_, status);
+    if (type_result == SERVER_RETURN_CONFLICT) {
+      nudge_tracker->RecordCommitConflict(it->first);
+    }
     if (processing_result == SYNCER_OK && type_result != SYNCER_OK) {
       processing_result = type_result;
     }
   }
 
   // Handle bookmarks' special extensions activity stats.
   if (session->status_controller().
           model_neutral_state().num_successful_bookmark_commits == 0) {
     extensions_activity->PutRecords(extensions_activity_buffer_);
   }
 
   return processing_result;
 }
 
 void Commit::CleanUp() {
   for (ContributionMap::iterator it = contributions_.begin();
        it != contributions_.end(); ++it) {
     it->second->CleanUp();
   }
   cleaned_up_ = true;
 }
 
 }  // namespace syncer