Wait for parent directory sync before performing server-side copy

chrome/browser/chromeos/drive/sync_client.cc

 // Copyright (c) 2012 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/chromeos/drive/sync_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 214 matching lines @@
       break;
   }
 }
 
 void SyncClient::AddUpdateTask(const ClientContext& context,
                                const std::string& local_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   AddUpdateTaskInternal(context, local_id, delay_);
 }
 
+bool SyncClient:: WaitForUpdateTaskToComplete(
+    const std::string& local_id,
+    const FileOperationCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  SyncTasks::iterator it = tasks_.find(SyncTasks::key_type(UPDATE, local_id));
+  if (it == tasks_.end())
+    return false;
+
+  SyncTask* task = &it->second;
+  task->waiting_callbacks.push_back(callback);
+  return true;
+}
+
 base::Closure SyncClient::PerformFetchTask(const std::string& local_id,
                                            const ClientContext& context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return download_operation_->EnsureFileDownloadedByLocalId(
       local_id,
       context,
       GetFileContentInitializedCallback(),
       google_apis::GetContentCallback(),
       base::Bind(&SyncClient::OnFetchFileComplete,
                  weak_ptr_factory_.GetWeakPtr(),
@@ skipping 187 matching lines @@
       operation_observer_->OnDriveSyncError(
           file_system::DRIVE_SYNC_ERROR_SERVICE_UNAVAILABLE, local_id);
       break;
     default:
       operation_observer_->OnDriveSyncError(
           file_system::DRIVE_SYNC_ERROR_MISC, local_id);
       LOG(WARNING) << "Failed: type = " << type << ", id = " << local_id
                    << ": " << FileErrorToString(error);
   }
 
+  for (size_t i = 0; i < it->second.waiting_callbacks.size(); ++i) {
+    base::MessageLoopProxy::current()->PostTask(
+        FROM_HERE, base::Bind(it->second.waiting_callbacks[i], error));
+  }
+  it->second.waiting_callbacks.clear();
+
   if (it->second.should_run_again) {
     DVLOG(1) << "Running again: type = " << type << ", id = " << local_id;
     it->second.state = PENDING;
     it->second.should_run_again = false;
     base::MessageLoopProxy::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&SyncClient::StartTask, weak_ptr_factory_.GetWeakPtr(), key),
         retry_delay);
   } else {
     for (size_t i = 0; i < it->second.dependent_tasks.size(); ++i)
@@ skipping 14 matching lines @@
     base::PostTaskAndReplyWithResult(
         blocking_task_runner_,
         FROM_HERE,
         base::Bind(&FileCache::Unpin, base::Unretained(cache_), local_id),
         base::Bind(&util::EmptyFileOperationCallback));
   }
 }
 
 }  // namespace internal
 }  // namespace drive