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

sync/engine/syncer.h

 // 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.
 
 #ifndef SYNC_ENGINE_SYNCER_H_
 #define SYNC_ENGINE_SYNCER_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 30 matching lines @@
   Syncer(CancelationSignal* cancelation_signal);
   virtual ~Syncer();
 
   bool ExitRequested();
 
   // Fetches and applies updates, resolves conflicts and commits local changes
   // for |request_types| as necessary until client and server states are in
   // sync.  The |nudge_tracker| contains state that describes why the client is
   // out of sync and what must be done to bring it back into sync.
   virtual bool NormalSyncShare(ModelTypeSet request_types,
-                               sessions::NudgeTracker* nudge_tracker,
+                               const sessions::NudgeTracker& nudge_tracker,
                                sessions::SyncSession* session);
 
   // Performs an initial download for the |request_types|.  It is assumed that
   // the specified types have no local state, and that their associated change
   // processors are in "passive" mode, so none of the downloaded updates will be
   // applied to the model.  The |source| is sent up to the server for debug
   // purposes.  It describes the reson for performing this initial download.
   virtual bool ConfigureSyncShare(
       ModelTypeSet request_types,
       sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
@@ skipping 10 matching lines @@
   bool DownloadAndApplyUpdates(
       ModelTypeSet request_types,
       sessions::SyncSession* session,
       GetUpdatesProcessor* get_updates_processor,
       bool create_mobile_bookmarks_folder);
 
   // This function will commit batches of unsynced items to the server until the
   // number of unsynced and ready to commit items reaches zero or an error is
   // encountered.  A request to exit early will be treated as an error and will
   // abort any blocking operations.
-  SyncerError BuildAndPostCommits(ModelTypeSet request_types,
-                                  sessions::NudgeTracker* nudge_tracker,
-                                  sessions::SyncSession* session,
-                                  CommitProcessor* commit_processor);
+  SyncerError BuildAndPostCommits(
+      ModelTypeSet request_types,
+      sessions::SyncSession* session,
+      CommitProcessor* commit_processor);
 
   void HandleCycleBegin(sessions::SyncSession* session);
   bool HandleCycleEnd(
       sessions::SyncSession* session,
       sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source);
 
   syncer::CancelationSignal* const cancelation_signal_;
 
   friend class SyncerTest;
   FRIEND_TEST_ALL_PREFIXES(SyncerTest, NameClashWithResolver);
@@ skipping 16 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(SyncerTest, DeletingEntryWithLocalEdits);
   FRIEND_TEST_ALL_PREFIXES(EntryCreatedInNewFolderTest,
                            EntryCreatedInNewFolderMidSync);
 
   DISALLOW_COPY_AND_ASSIGN(Syncer);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNCER_H_