| Index: chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| index feb163f188ad8ce3ade42efd8571663551d65f1a..90956d369c8676a1c5191d0539000263d596aead 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
|
| @@ -37,13 +37,10 @@ google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::AddNewDirectory,
|
| - wrapper_,
|
| - parent_resource_id,
|
| - directory_title,
|
| - options,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::AddNewDirectory, wrapper_,
|
| + parent_resource_id, directory_title, options,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -56,12 +53,10 @@ google_apis::CancelCallback DriveServiceOnWorker::DeleteResource(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::DeleteResource,
|
| - wrapper_,
|
| - resource_id,
|
| - etag,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::DeleteResource, wrapper_,
|
| + resource_id, etag,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -76,17 +71,15 @@ google_apis::CancelCallback DriveServiceOnWorker::DownloadFile(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(
|
| - &DriveServiceWrapper::DownloadFile,
|
| - wrapper_,
|
| - local_cache_path,
|
| + base::BindOnce(
|
| + &DriveServiceWrapper::DownloadFile, wrapper_, local_cache_path,
|
| resource_id,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, download_action_callback),
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, get_content_callback),
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, progress_callback)));
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(), FROM_HERE,
|
| + download_action_callback),
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(), FROM_HERE,
|
| + get_content_callback),
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(), FROM_HERE,
|
| + progress_callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -97,10 +90,9 @@ google_apis::CancelCallback DriveServiceOnWorker::GetAboutResource(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::GetAboutResource,
|
| - wrapper_,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::GetAboutResource, wrapper_,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -112,11 +104,10 @@ google_apis::CancelCallback DriveServiceOnWorker::GetChangeList(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::GetChangeList,
|
| - wrapper_,
|
| - start_changestamp,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::GetChangeList, wrapper_,
|
| + start_changestamp,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -128,11 +119,10 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::GetRemainingChangeList,
|
| - wrapper_,
|
| - next_link,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::GetRemainingChangeList, wrapper_,
|
| + next_link,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -150,11 +140,10 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::GetRemainingFileList,
|
| - wrapper_,
|
| - next_link,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::GetRemainingFileList, wrapper_,
|
| + next_link,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -167,11 +156,10 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileResource(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::GetFileResource,
|
| - wrapper_,
|
| - resource_id,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::GetFileResource, wrapper_,
|
| + resource_id,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -183,11 +171,10 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::GetFileListInDirectory,
|
| - wrapper_,
|
| - directory_resource_id,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::GetFileListInDirectory, wrapper_,
|
| + directory_resource_id,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -200,12 +187,10 @@ google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::RemoveResourceFromDirectory,
|
| - wrapper_,
|
| - parent_resource_id,
|
| - resource_id,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::RemoveResourceFromDirectory,
|
| + wrapper_, parent_resource_id, resource_id,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
| @@ -218,12 +203,10 @@ google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle(
|
|
|
| ui_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&DriveServiceWrapper::SearchByTitle,
|
| - wrapper_,
|
| - title,
|
| - directory_resource_id,
|
| - RelayCallbackToTaskRunner(
|
| - worker_task_runner_.get(), FROM_HERE, callback)));
|
| + base::BindOnce(&DriveServiceWrapper::SearchByTitle, wrapper_, title,
|
| + directory_resource_id,
|
| + RelayCallbackToTaskRunner(worker_task_runner_.get(),
|
| + FROM_HERE, callback)));
|
|
|
| return google_apis::CancelCallback();
|
| }
|
|
|