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

BUG=339327
R=kinuko@chromium.org, nhiroki@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247877 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync_file_system/drive_backend/sync_engine.cc

@@ -570,6 +570,7 @@ void SyncEngine::MaybeStartFetchChanges() {
   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,
@@ -590,8 +591,8 @@ void SyncEngine::MaybeStartFetchChanges() {
 }
 
 void SyncEngine::DidResolveConflict(SyncStatusCode status) {
-  if (status == SYNC_STATUS_NO_CONFLICT)
-    should_check_conflict_ = false;
+  if (status == SYNC_STATUS_OK)
+    should_check_conflict_ = true;
 }
 
 void SyncEngine::DidFetchChanges(SyncStatusCode status) {