[SyncFS] Fix backgrounding race of ConflictResolver

chrome/browser/sync_file_system/drive_backend/sync_worker.cc

 // Copyright 2014 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_worker.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "chrome/browser/drive/drive_service_interface.h"
@@ skipping 602 matching lines @@
     time_to_check_changes_ =
         now + base::TimeDelta::FromSeconds(kListChangesRetryDelaySeconds);
     return true;
   }
   return false;
 }
 
 void SyncWorker::DidResolveConflict(SyncStatusCode status) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
-  if (status == SYNC_STATUS_OK)
+  if (status == SYNC_STATUS_OK || status == SYNC_STATUS_RETRY)
     should_check_conflict_ = true;
 }
 
 void SyncWorker::DidFetchChanges(SyncStatusCode status) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   if (status == SYNC_STATUS_OK)
     should_check_conflict_ = true;
   listing_remote_changes_ = false;
 }
@@ skipping 83 matching lines @@
   return context_->GetDriveUploader();
 }
 
 MetadataDatabase* SyncWorker::GetMetadataDatabase() {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   return context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system