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

sync/protocol/sync.proto

 // 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.
 //
 // Sync protocol for communication between sync client and server.
 
 // Update proto_value_conversions{.h,.cc,_unittest.cc} if you change
 // any fields in this file.
 
 syntax = "proto2";
@@ skipping 474 matching lines @@
   // This flag is set if this GetUpdate request is due at least in part due
   // to the fact that this type has not finished initial sync yet, and the
   // client would like to initialize itself with the server data.
   //
   // Only some types support performing an initial sync as part of a normal
   // GetUpdate request.  Many types must be in configure mode when fetching
   // initial sync data.
   //
   // Introduced in M38.
   optional bool initial_sync_in_progress = 7;
-
-  // This flag is set if this GetUpdate request is due to client receiving
-  // conflict response from server, so client needs to sync and then resolve
-  // conflict locally, and then commit again.
-  //
-  // Introduced in M42.
-  optional bool sync_for_resolve_conflict_in_progress = 8;
 }
 
 message GarbageCollectionDirective {
   enum Type {
     UNKNOWN = 0;
     VERSION_WATERMARK = 1;
     AGE_WATERMARK = 2;
     MAX_ITEM_COUNT = 3;
   }
 
@@ skipping 457 matching lines @@
     // Currently only meaningful if |error_type| is throttled. If this field
     // is absent then the whole client (all datatypes) is throttled.
     repeated int32 error_data_type_ids = 5;
   }
   optional Error error = 13;
 
   // The new per-client state for this client. If set, should be persisted and
   // sent with any subsequent ClientToServerMessages.
   optional ChipBag new_bag_of_chips = 14;
 };