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

sync/sessions/nudge_tracker.cc

 // Copyright (c) 2013 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/sessions/nudge_tracker.h"
 
 #include "base/basictypes.h"
 #include "sync/internal_api/public/engine/polling_constants.h"
 #include "sync/protocol/sync.pb.h"
 
@@ skipping 150 matching lines @@
   tracker_it->second->RecordRemoteInvalidation(invalidation.Pass());
   return remote_invalidation_nudge_delay_;
 }
 
 void NudgeTracker::RecordInitialSyncRequired(syncer::ModelType type) {
   TypeTrackerMap::iterator tracker_it = type_trackers_.find(type);
   DCHECK(tracker_it != type_trackers_.end());
   tracker_it->second->RecordInitialSyncRequired();
 }
 
-void NudgeTracker::RecordCommitConflict(syncer::ModelType type) {
-  TypeTrackerMap::iterator tracker_it = type_trackers_.find(type);
-  DCHECK(tracker_it != type_trackers_.end());
-  tracker_it->second->RecordCommitConflict();
-}
-
 void NudgeTracker::OnInvalidationsEnabled() {
   invalidations_enabled_ = true;
 }
 
 void NudgeTracker::OnInvalidationsDisabled() {
   invalidations_enabled_ = false;
   invalidations_out_of_sync_ = true;
 }
 
 void NudgeTracker::SetTypesThrottledUntil(
@@ skipping 213 matching lines @@
     }
   }
 }
 
 void NudgeTracker::SetDefaultNudgeDelay(base::TimeDelta nudge_delay) {
   minimum_local_nudge_delay_ = nudge_delay;
 }
 
 }  // namespace sessions
 }  // namespace syncer