[SyncFS] Don't re-run conflict resolution on resolution error

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/drive/drive_api_service.h"
@@ skipping 552 matching lines @@
 
   if (!metadata_database_)
     return;
 
   if (listing_remote_changes_)
     return;
 
   base::TimeTicks now = base::TimeTicks::Now();
   if (!should_check_remote_change_ && now < time_to_check_changes_) {
     if (!metadata_database_->HasDirtyTracker() && should_check_conflict_) {
+      should_check_conflict_ = false;
       task_manager_->ScheduleSyncTaskIfIdle(
           scoped_ptr<SyncTask>(new ConflictResolver(this)),
           base::Bind(&SyncEngine::DidResolveConflict,
                      weak_ptr_factory_.GetWeakPtr()));
     }
     return;
   }
 
   if (task_manager_->ScheduleSyncTaskIfIdle(
           scoped_ptr<SyncTask>(new ListChangesTask(this)),
           base::Bind(&SyncEngine::DidFetchChanges,
                      weak_ptr_factory_.GetWeakPtr()))) {
     should_check_remote_change_ = false;
     listing_remote_changes_ = true;
     time_to_check_changes_ =
         now + base::TimeDelta::FromSeconds(kListChangesRetryDelaySeconds);
   }
 }
 
 void SyncEngine::DidResolveConflict(SyncStatusCode status) {

[nhiroki, 2014/01/30 04:24:35]

How about having "DCHECK(!should_check_conflict_);" here?

[nhiroki, 2014/01/30 04:53:27]

Hmm... this seems overkill...? Anyway, your change looks reasonable. lgtm

-  if (status == SYNC_STATUS_NO_CONFLICT)
-    should_check_conflict_ = false;
+  if (status == SYNC_STATUS_OK)
+    should_check_conflict_ = true;
 }
 
 void SyncEngine::DidFetchChanges(SyncStatusCode status) {
   if (status == SYNC_STATUS_OK)
     should_check_conflict_ = true;
   listing_remote_changes_ = false;
 }
 
 void SyncEngine::UpdateServiceStateFromSyncStatusCode(
       SyncStatusCode status,
@@ skipping 93 matching lines @@
         tracker.tracker_kind() == TRACKER_KIND_APP_ROOT;
     if (is_app_enabled && !is_app_root_tracker_enabled)
       EnableOrigin(origin, base::Bind(&EmptyStatusCallback));
     else if (!is_app_enabled && is_app_root_tracker_enabled)
       DisableOrigin(origin, base::Bind(&EmptyStatusCallback));
   }
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system