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

sync/sessions/data_type_tracker.h

Index: sync/sessions/data_type_tracker.h
diff --git a/sync/sessions/data_type_tracker.h b/sync/sessions/data_type_tracker.h
index c53f39318532d4b9383274eaae512d99e1b45d31..0842197a72846792e81fe0e8940c1dad53ef41d7 100644
--- a/sync/sessions/data_type_tracker.h
+++ b/sync/sessions/data_type_tracker.h
@@ -43,6 +43,10 @@ class DataTypeTracker {
   // Takes note that initial sync is pending for this type.
   void RecordInitialSyncRequired();
 
+  // Takes note that the conflict happended for this type, need to sync to
+  // resolve conflict locally.
+  void RecordCommitConflict();
+
   // Records that a sync cycle has been performed successfully.
   // Generally, this means that all local changes have been committed and all
   // remote changes have been downloaded, so we can clear any flags related to
@@ -74,6 +78,9 @@ class DataTypeTracker {
   // Returns true if this type is requesting an initial sync.
   bool IsInitialSyncRequired() const;
 
+  // Returns true if this type is requesting a sync to resolve conflict issue.
+  bool IsSyncRequiredToResolveConflict() const;
+
   // Fills in the legacy invalidaiton payload information fields.
   void SetLegacyNotificationHint(
       sync_pb::DataTypeProgressMarker* progress) const;
@@ -122,6 +129,9 @@ class DataTypeTracker {
   // sync.
   bool initial_sync_required_;
 
+  // Set to true if this type need to get update to resolve conflict issue.
+  bool sync_required_to_resolve_conflict_;
+
   // If !unthrottle_time_.is_null(), this type is throttled and may not download
   // or commit data until the specified time.
   base::TimeTicks unthrottle_time_;