Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates (patchset #2 id:20001 of https://codereview.chromium.org/905853002/)

Reason for revert:
Looks like this broke the build

Undefined symbols for architecture armv7:
  "syncer::sessions::test_util::SimulateDownloadUpdatesFailed(syncer::EnumSet<syncer::ModelType, (syncer::ModelType)2, (syncer::ModelType)33>, syncer::sessions::NudgeTracker const&, syncer::sessions::SyncSession*)", referenced from:
      syncer::BackoffTriggersSyncSchedulerTest_FailDownloadOnceThenSucceed_Test::TestBody() in sync_scheduler_unittest.o
      syncer::BackoffTriggersSyncSchedulerTest_FailDownloadTwice_Test::TestBody() in sync_scheduler_unittest.o
      syncer::SyncSchedulerTest_FailedRetry_Test::TestBody() in sync_scheduler_unittest.o

Original issue's description:
> Sync commit errors should temporarily re-enable
> trigger pre-commit getupdates
>
> Add a boolean variable in class DataTypeTracker, so every
> time when a data type got conflict response from server
> during commit, will set that boolean variable to true, then
> next time sync, GetUpdate will check the boolean to see if
> need to GetUpdate to resolve conflict locally.
>
> BUG=324893
>
> Committed: https://crrev.com/21f43c5af27e24c34565df26bb51fcc704c97597
> Cr-Commit-Position: refs/heads/master@{#315339}

TBR=zea@chromium.org,stanisc@chromium.org,maniscalco@chromium.org,pvalenzuela@chromium.org,gangwu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=324893

Review URL: https://codereview.chromium.org/891123003

Cr-Commit-Position: refs/heads/master@{#315346}

7 files changed, 18 insertions, 54 deletions

diff --git a/sync/sessions/data_type_tracker.cc b/sync/sessions/data_type_tracker.cc
index 8103c00..da50bbf 100644
--- a/sync/sessions/data_type_tracker.cc
+++ b/sync/sessions/data_type_tracker.cc
@@ -15,8 +15,7 @@ DataTypeTracker::DataTypeTracker()
     : local_nudge_count_(0),
       local_refresh_request_count_(0),
       payload_buffer_size_(NudgeTracker::kDefaultMaxPayloadsPerType),
-      initial_sync_required_(false),
-      sync_required_to_resolve_conflict_(false) {
+      initial_sync_required_(false) {
 }
 
 DataTypeTracker::~DataTypeTracker() { }
@@ -93,10 +92,6 @@ void DataTypeTracker::RecordInitialSyncRequired() {
   initial_sync_required_ = true;
 }
 
-void DataTypeTracker::RecordCommitConflict() {
-  sync_required_to_resolve_conflict_ = true;
-}
-
 void DataTypeTracker::RecordSuccessfulSyncCycle() {
   // If we were throttled, then we would have been excluded from this cycle's
   // GetUpdates and Commit actions.  Our state remains unchanged.
@@ -124,7 +119,6 @@ void DataTypeTracker::RecordSuccessfulSyncCycle() {
   }
 
   initial_sync_required_ = false;
-  sync_required_to_resolve_conflict_ = false;
 }
 
 // This limit will take effect on all future invalidations received.
@@ -139,7 +133,7 @@ bool DataTypeTracker::IsSyncRequired() const {
 bool DataTypeTracker::IsGetUpdatesRequired() const {
   return !IsThrottled() &&
          (HasRefreshRequestPending() || HasPendingInvalidation() ||
-          IsInitialSyncRequired() || IsSyncRequiredToResolveConflict());
+          IsInitialSyncRequired());
 }
 
 bool DataTypeTracker::HasLocalChangePending() const {
@@ -158,10 +152,6 @@ bool DataTypeTracker::IsInitialSyncRequired() const {
   return initial_sync_required_;
 }
 
-bool DataTypeTracker::IsSyncRequiredToResolveConflict() const {
-  return sync_required_to_resolve_conflict_;
-}
-
 void DataTypeTracker::SetLegacyNotificationHint(
     sync_pb::DataTypeProgressMarker* progress) const {
   DCHECK(!IsThrottled())
@@ -202,8 +192,6 @@ void DataTypeTracker::FillGetUpdatesTriggersMessage(
   msg->set_local_modification_nudges(local_nudge_count_);
   msg->set_datatype_refresh_nudges(local_refresh_request_count_);
   msg->set_initial_sync_in_progress(initial_sync_required_);
-  msg->set_sync_for_resolve_conflict_in_progress(
-      sync_required_to_resolve_conflict_);
 }
 
 bool DataTypeTracker::IsThrottled() const {
diff --git a/sync/sessions/data_type_tracker.h b/sync/sessions/data_type_tracker.h
index 0842197..c53f393 100644
--- a/sync/sessions/data_type_tracker.h
+++ b/sync/sessions/data_type_tracker.h
@@ -43,10 +43,6 @@ 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
@@ -78,9 +74,6 @@ 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;
@@ -129,9 +122,6 @@ 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_;
diff --git a/sync/sessions/nudge_tracker.cc b/sync/sessions/nudge_tracker.cc
index 6af6993..9c62b07 100644
--- a/sync/sessions/nudge_tracker.cc
+++ b/sync/sessions/nudge_tracker.cc
@@ -168,12 +168,6 @@ void NudgeTracker::RecordInitialSyncRequired(syncer::ModelType type) {
   tracker_it->second->RecordInitialSyncRequired();
 }
 
-void NudgeTracker::RecordCommitConflict(syncer::ModelType type) {
-  TypeTrackerMap::iterator tracker_it = type_trackers_.find(type);
-  DCHECK(tracker_it != type_trackers_.end());
-  tracker_it->second->RecordCommitConflict();
-}
-
 void NudgeTracker::OnInvalidationsEnabled() {
   invalidations_enabled_ = true;
 }
diff --git a/sync/sessions/nudge_tracker.h b/sync/sessions/nudge_tracker.h
index ec2277c..2bf9da1 100644
--- a/sync/sessions/nudge_tracker.h
+++ b/sync/sessions/nudge_tracker.h
@@ -70,10 +70,6 @@ class SYNC_EXPORT_PRIVATE NudgeTracker {
   // 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();
diff --git a/sync/sessions/nudge_tracker_unittest.cc b/sync/sessions/nudge_tracker_unittest.cc
index db2bc3e..c6a9dfb8 100644
--- a/sync/sessions/nudge_tracker_unittest.cc
+++ b/sync/sessions/nudge_tracker_unittest.cc
@@ -369,12 +369,6 @@ TEST_F(NudgeTrackerTest, IsSyncRequired) {
   nudge_tracker_.RecordSuccessfulSyncCycle();
   EXPECT_FALSE(nudge_tracker_.IsSyncRequired());
 
-  // Sync request for resolve conflict.
-  nudge_tracker_.RecordCommitConflict(BOOKMARKS);
-  EXPECT_TRUE(nudge_tracker_.IsSyncRequired());
-  nudge_tracker_.RecordSuccessfulSyncCycle();
-  EXPECT_FALSE(nudge_tracker_.IsSyncRequired());
-
   // Local changes.
   nudge_tracker_.RecordLocalChange(ModelTypeSet(SESSIONS));
   EXPECT_TRUE(nudge_tracker_.IsSyncRequired());
diff --git a/sync/sessions/test_util.cc b/sync/sessions/test_util.cc
index c226a12..1163ea7 100644
--- a/sync/sessions/test_util.cc
+++ b/sync/sessions/test_util.cc
@@ -46,22 +46,23 @@ void SimulateConfigureConnectionFailure(
 }
 
 void SimulateNormalSuccess(ModelTypeSet requested_types,
-                           sessions::NudgeTracker* nudge_tracker,
+                           const sessions::NudgeTracker& nudge_tracker,
                            sessions::SyncSession* session) {
   session->mutable_status_controller()->set_commit_result(SYNCER_OK);
   session->mutable_status_controller()->set_last_download_updates_result(
       SYNCER_OK);
 }
 
-void SimulateDownloadUpdatesFailed(ModelTypeSet requested_types,
-                                   sessions::NudgeTracker* nudge_tracker,
-                                   sessions::SyncSession* session) {
+void SimulateDownloadUpdatesFailed(
+    ModelTypeSet requested_types,
+    const sessions::NudgeTracker& nudge_tracker,
+    sessions::SyncSession* session) {
   session->mutable_status_controller()->set_last_download_updates_result(
       SERVER_RETURN_TRANSIENT_ERROR);
 }
 
 void SimulateCommitFailed(ModelTypeSet requested_types,
-                          sessions::NudgeTracker* nudge_tracker,
+                          const sessions::NudgeTracker& nudge_tracker,
                           sessions::SyncSession* session) {
   session->mutable_status_controller()->set_last_get_key_result(SYNCER_OK);
   session->mutable_status_controller()->set_last_download_updates_result(
@@ -70,9 +71,10 @@ void SimulateCommitFailed(ModelTypeSet requested_types,
       SERVER_RETURN_TRANSIENT_ERROR);
 }
 
-void SimulateConnectionFailure(ModelTypeSet requested_types,
-                               sessions::NudgeTracker* nudge_tracker,
-                               sessions::SyncSession* session) {
+void SimulateConnectionFailure(
+                           ModelTypeSet requested_types,
+                           const sessions::NudgeTracker& nudge_tracker,
+                           sessions::SyncSession* session) {
   session->mutable_status_controller()->set_last_download_updates_result(
       NETWORK_CONNECTION_UNAVAILABLE);
 }
@@ -116,7 +118,7 @@ void SimulatePollIntervalUpdateImpl(
 
 void SimulateSessionsCommitDelayUpdateImpl(
     ModelTypeSet requested_types,
-    sessions::NudgeTracker* nudge_tracker,
+    const sessions::NudgeTracker& nudge_tracker,
     sessions::SyncSession* session,
     const base::TimeDelta& new_delay) {
   SimulateNormalSuccess(requested_types, nudge_tracker, session);
diff --git a/sync/sessions/test_util.h b/sync/sessions/test_util.h
index 3e905dd..357637e 100644
--- a/sync/sessions/test_util.h
+++ b/sync/sessions/test_util.h
@@ -35,16 +35,16 @@ void SimulateConfigureConnectionFailure(
 
 // Normal mode sync cycle successes and failures.
 void SimulateNormalSuccess(ModelTypeSet requested_types,
-                           sessions::NudgeTracker* nudge_tracker,
+                           const sessions::NudgeTracker& nudge_tracker,
                            sessions::SyncSession* session);
 void SimulateDownloadUpdatesFailed(ModelTypeSet requested_types,
-                                   sessions::NudgeTracker* nudge_tracker,
+                                   const sessions::NudgeTracker& nudge_tracker,
                                    sessions::SyncSession* session);
 void SimulateCommitFailed(ModelTypeSet requested_types,
-                          sessions::NudgeTracker* nudge_tracker,
+                          const sessions::NudgeTracker& nudge_tracker,
                           sessions::SyncSession* session);
 void SimulateConnectionFailure(ModelTypeSet requested_types,
-                               sessions::NudgeTracker* nudge_tracker,
+                               const sessions::NudgeTracker& nudge_tracker,
                                sessions::SyncSession* session);
 
 // Poll successes and failures.
@@ -73,7 +73,7 @@ void SimulatePollIntervalUpdateImpl(
 // Works with normal cycles.
 void SimulateSessionsCommitDelayUpdateImpl(
     ModelTypeSet requested_types,
-    sessions::NudgeTracker* nudge_tracker,
+    const sessions::NudgeTracker& nudge_tracker,
     sessions::SyncSession* session,
     const base::TimeDelta& new_delay);