SyncFS: Handle HTTP_CONFLICT as Precondition error

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.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/local_to_remote_syncer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 317 matching lines @@
       base::Bind(&LocalToRemoteSyncer::DidDeleteRemoteFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 void LocalToRemoteSyncer::DidDeleteRemoteFile(
     const SyncStatusCallback& callback,
     google_apis::GDataErrorCode error) {
   if (error != google_apis::HTTP_SUCCESS &&
       error != google_apis::HTTP_NOT_FOUND &&
-      error != google_apis::HTTP_PRECONDITION) {
+      error != google_apis::HTTP_PRECONDITION &&
+      error != google_apis::HTTP_CONFLICT) {
     callback.Run(GDataErrorCodeToSyncStatusCode(error));
     return;
   }
 
   // Handle NOT_FOUND case as SUCCESS case.
-  // For PRECONDITION case, the remote file is modified since the last sync
-  // completed.  As our policy for deletion-modification conflict resolution,
-  // ignore the local deletion.
+  // For PRECONDITION / CONFLICT case, the remote file is modified since the
+  // last sync completed.  As our policy for deletion-modification conflict
+  // resolution, ignore the local deletion.
   callback.Run(SYNC_STATUS_OK);
 }
 
 void LocalToRemoteSyncer::UploadExistingFile(
     const SyncStatusCallback& callback)  {
   DCHECK(remote_file_tracker_);
   DCHECK(remote_file_tracker_->has_synced_details());
 
   base::PostTaskAndReplyWithResult(
       sync_context_->GetBlockingTaskRunner(), FROM_HERE,
@@ skipping 22 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(),
                  callback),
       google_apis::ProgressCallback());
 }
 
 void LocalToRemoteSyncer::DidUploadExistingFile(
     const SyncStatusCallback& callback,
     google_apis::GDataErrorCode error,
     const GURL&,
     scoped_ptr<google_apis::ResourceEntry> entry) {
-  if (error == google_apis::HTTP_PRECONDITION) {
+  if (error == google_apis::HTTP_PRECONDITION ||
+      error == google_apis::HTTP_CONFLICT) {
     // The remote file has unfetched remote change.  Fetch latest metadata and
     // update database with it.
     // TODO(tzik): Consider adding local side low-priority dirtiness handling to
     // handle this as ListChangesTask.
     UpdateRemoteMetadata(callback);
     return;
   }
 
   metadata_database()->UpdateByFileResource(
       *drive::util::ConvertResourceEntryToFileResource(*entry),
@@ skipping 232 matching lines @@
   set_used_network(true);
   return sync_context_->GetDriveUploader();
 }
 
 MetadataDatabase* LocalToRemoteSyncer::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system