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

sync/engine/syncer_unittest.cc

Index: sync/engine/syncer_unittest.cc
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 5f049ecf070fa13c97b6acf9031c3f553299ad78..471df65d03486650e81851fa997d5de506f36061 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -262,8 +262,11 @@
     // Pretend we've seen a local change, to make the nudge_tracker look normal.
     nudge_tracker_.RecordLocalChange(ModelTypeSet(BOOKMARKS));
 
-    EXPECT_TRUE(syncer_->NormalSyncShare(context_->GetEnabledTypes(),
-                                         &nudge_tracker_, session_.get()));
+    EXPECT_TRUE(
+        syncer_->NormalSyncShare(
+            context_->GetEnabledTypes(),
+            nudge_tracker_,
+            session_.get()));
   }
 
   void SyncShareConfigure() {
@@ -639,7 +642,8 @@
   ResetSession();
   syncer_->NormalSyncShare(
       Difference(context_->GetEnabledTypes(), ModelTypeSet(BOOKMARKS)),
-      &nudge_tracker_, session_.get());
+      nudge_tracker_,
+      session_.get());
 
   {
     // Nothing should have been committed as bookmarks is throttled.
@@ -2863,25 +2867,6 @@
   EXPECT_EQ(0, mock_server_->last_request().debug_info().events_size());
 }
 
-// Tests that commit failure with conflict will trigger GetUpdates for next
-// sycle of sync
-TEST_F(SyncerTest, CommitFailureWithConflict) {
-  ConfigureNoGetUpdatesRequired();
-  CreateUnsyncedDirectory("X", "id_X");
-  EXPECT_FALSE(nudge_tracker_.IsGetUpdatesRequired());
-
-  SyncShareNudge();
-  EXPECT_FALSE(nudge_tracker_.IsGetUpdatesRequired());
-
-  CreateUnsyncedDirectory("Y", "id_Y");
-  mock_server_->set_conflict_n_commits(1);
-  SyncShareNudge();
-  EXPECT_TRUE(nudge_tracker_.IsGetUpdatesRequired());
-
-  nudge_tracker_.RecordSuccessfulSyncCycle();
-  EXPECT_FALSE(nudge_tracker_.IsGetUpdatesRequired());
-}
-
 // Tests that sending debug info events on Commit works.
 TEST_F(SyncerTest, SendDebugInfoEventsOnCommit_HappyCase) {
   // Make sure GetUpdate isn't call as it would "steal" debug info events before