[SyncFS] Break up overwriting file/folder creation to two phase

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 159 matching lines @@
       return;
     }
 
     DCHECK(active_ancestor_details.file_kind() == FILE_KIND_FILE);
     remote_parent_folder_tracker_ =
         FindTrackerByID(metadata_database(),
                         active_ancestor_tracker->parent_tracker_id());
     remote_file_tracker_ = active_ancestor_tracker.Pass();
     target_path_ = active_ancestor_path;
     token->RecordLog("Detected non-folder file in its path.");
-    DeleteRemoteFile(base::Bind(&LocalToRemoteSyncer::DidDeleteForCreateFolder,
+    DeleteRemoteFile(base::Bind(&LocalToRemoteSyncer::CompleteWithRetryStatus,
                                 weak_ptr_factory_.GetWeakPtr(),
                                 base::Passed(&token)));
     return;
   }
 
   if (missing_components.empty()) {
     // The original target has remote active file/folder.
     remote_parent_folder_tracker_ =
         FindTrackerByID(metadata_database(),
                         active_ancestor_tracker->parent_tracker_id());
@@ skipping 120 matching lines @@
     if (synced_details.file_kind() == FILE_KIND_FILE) {
       // Non-conflicting local file update to existing remote regular file.
       UploadExistingFile(token.Pass());
       return;
     }
 
     DCHECK_EQ(FILE_KIND_FOLDER, synced_details.file_kind());
     // Non-conflicting local file update to existing remote *folder*.
     // Assuming this case as local folder deletion + local file creation, delete
     // the remote folder and upload the file.
-    DeleteRemoteFile(base::Bind(&LocalToRemoteSyncer::DidDeleteForUploadNewFile,
+    DeleteRemoteFile(base::Bind(&LocalToRemoteSyncer::CompleteWithRetryStatus,
                                 weak_ptr_factory_.GetWeakPtr(),
                                 base::Passed(&token)));
     return;
   }
 
   DCHECK(local_change_.IsDirectory());
   if (synced_details.file_kind() == FILE_KIND_FILE) {
     // Non-conflicting local folder creation to existing remote *file*.
     // Assuming this case as local file deletion + local folder creation, delete
     // the remote file and create a remote folder.
-    DeleteRemoteFile(base::Bind(&LocalToRemoteSyncer::DidDeleteForCreateFolder,
+    DeleteRemoteFile(base::Bind(&LocalToRemoteSyncer::CompleteWithRetryStatus,
                                 weak_ptr_factory_.GetWeakPtr(),
                                 base::Passed(&token)));
     return;
   }
 
   // Non-conflicting local folder creation to existing remote folder.
   DCHECK_EQ(FILE_KIND_FOLDER, synced_details.file_kind());
   SyncCompleted(token.Pass(), SYNC_STATUS_OK);
 }
 
@@ skipping 191 matching lines @@
     return;
   }
 
   metadata_database()->UpdateByFileResource(
       *entry,
       base::Bind(&LocalToRemoteSyncer::CompleteWithRetryStatus,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Passed(&token)));
 }
 
-void LocalToRemoteSyncer::DidDeleteForUploadNewFile(
-    scoped_ptr<SyncTaskToken> token,
-    SyncStatusCode status) {
-  if (status == SYNC_STATUS_HAS_CONFLICT) {
-    UpdateRemoteMetadata(
-        remote_file_tracker_->file_id(),
-        token.Pass());
-    return;
-  }
-
-  if (status != SYNC_STATUS_OK) {
-    SyncCompleted(token.Pass(), status);
-    return;
-  }
-
-  UploadNewFile(token.Pass());
-}
-
-void LocalToRemoteSyncer::DidDeleteForCreateFolder(
-    scoped_ptr<SyncTaskToken> token,
-    SyncStatusCode status) {
-  if (status == SYNC_STATUS_HAS_CONFLICT) {
-    UpdateRemoteMetadata(remote_file_tracker_->file_id(), token.Pass());
-    return;
-  }
-
-  if (status != SYNC_STATUS_OK) {
-    SyncCompleted(token.Pass(), status);
-    return;
-  }
-
-  CreateRemoteFolder(token.Pass());
-}
-
 void LocalToRemoteSyncer::UploadNewFile(scoped_ptr<SyncTaskToken> token) {
   DCHECK(remote_parent_folder_tracker_);
 
   sync_action_ = SYNC_ACTION_ADDED;
   base::FilePath title = fileapi::VirtualPath::BaseName(target_path_);
   drive_uploader()->UploadNewFile(
       remote_parent_folder_tracker_->file_id(),
       local_path_,
       title.AsUTF8Unsafe(),
       GetMimeTypeFromTitle(title),
@@ skipping 125 matching lines @@
 void LocalToRemoteSyncer::CompleteWithRetryStatus(
     scoped_ptr<SyncTaskToken> token,
     SyncStatusCode status) {
   if (status == SYNC_STATUS_OK)
     status = SYNC_STATUS_RETRY;
   SyncCompleted(token.Pass(), status);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system