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

sync/engine/commit.cc

Index: sync/engine/commit.cc
diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc
index 509e08d9d32443d8c28aea8260236a8d1a1a0765..0561e9b58367d284a7b4470f782c0598dab8f5c4 100644
--- a/sync/engine/commit.cc
+++ b/sync/engine/commit.cc
@@ -83,6 +83,7 @@ Commit* Commit::Init(
 }
 
 SyncerError Commit::PostAndProcessResponse(
+    sessions::NudgeTracker* nudge_tracker,
     sessions::SyncSession* session,
     sessions::StatusController* status,
     ExtensionsActivity* extensions_activity) {
@@ -153,6 +154,9 @@ SyncerError Commit::PostAndProcessResponse(
                  "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;
     }