Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / local_to_remote_syncer.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/src/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
index c286b84..ee5aace 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
@@ -74,7 +74,7 @@ LocalToRemoteSyncer::LocalToRemoteSyncer(SyncEngineContext* sync_context,
 LocalToRemoteSyncer::~LocalToRemoteSyncer() {
 }
 
-void LocalToRemoteSyncer::RunSequential(const SyncStatusCallback& callback) {
+void LocalToRemoteSyncer::RunExclusive(const SyncStatusCallback& callback) {
   if (!IsContextReady()) {
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Local -> Remote] Context not ready.");
@@ -384,7 +384,7 @@ void LocalToRemoteSyncer::UploadExistingFile(
   DCHECK(remote_file_tracker_->has_synced_details());
 
   base::PostTaskAndReplyWithResult(
-      sync_context_->GetBlockingTaskRunner(), FROM_HERE,
+      sync_context_->GetFileTaskRunner(), FROM_HERE,
       base::Bind(&drive::util::GetMd5Digest, local_path_),
       base::Bind(&LocalToRemoteSyncer::DidGetMD5ForUpload,
                  weak_ptr_factory_.GetWeakPtr(),