SyncFS: Handle HTTP_CONFLICT as Precondition error

chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
index 53d209ec12eff11038423cfa71076acc5edc26b0..fa24d74f2e88e97e0d0712c59d9a0113fb6fe019 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
@@ -202,7 +202,8 @@ void ConflictResolver::RemoveNonPrimaryFiles(
 void ConflictResolver::DidRemoveFile(const SyncStatusCallback& callback,
                                      const std::string& file_id,
                                      google_apis::GDataErrorCode error) {
-  if (error == google_apis::HTTP_PRECONDITION) {
+  if (error == google_apis::HTTP_PRECONDITION ||
+      error == google_apis::HTTP_CONFLICT) {
     callback.Run(SYNC_STATUS_RETRY);
     return;
   }