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

sync/sessions/nudge_tracker.h

 // Copyright 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.
 //
 // A class to track the outstanding work required to bring the client back into
 // sync with the server.
 #ifndef SYNC_SESSIONS_NUDGE_TRACKER_H_
 #define SYNC_SESSIONS_NUDGE_TRACKER_H_
 
 #include <list>
@@ skipping 52 matching lines @@
 
   // Takes note of the receipt of an invalidation notice from the server.
   // Returns the current nudge delay for a remote invalidation.
   base::TimeDelta RecordRemoteInvalidation(
       syncer::ModelType type,
       scoped_ptr<InvalidationInterface> invalidation);
 
   // Take note that an initial sync is pending for this type.
   void RecordInitialSyncRequired(syncer::ModelType type);
 
-  // Takes note that the conflict happended for this type, need to sync to
-  // resolve conflict locally.
-  void RecordCommitConflict(syncer::ModelType type);
-
   // These functions should be called to keep this class informed of the status
   // of the connection to the invalidations server.
   void OnInvalidationsEnabled();
   void OnInvalidationsDisabled();
 
   // Marks |types| as being throttled from |now| until |now| + |length|.
   void SetTypesThrottledUntil(ModelTypeSet types,
                               base::TimeDelta length,
                               base::TimeTicks now);
 
@@ skipping 114 matching lines @@
   base::TimeDelta local_refresh_nudge_delay_;
   base::TimeDelta remote_invalidation_nudge_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(NudgeTracker);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_NUDGE_TRACKER_H_