Return CancelCallbackOnce in drive

This changes return type of following functions:
* SearchByTitle
* GetRemainingFileList
* AddNewDirectory
* RemoveResourceFromDirectory
* GetFileListInDirectory

Bug: 1007686
Change-Id: I4720a98a28d78d76f200535c1b4199fb5347147d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2304668Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>

chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc

@@ -30,7 +30,7 @@ DriveServiceOnWorker::DriveServiceOnWorker(
 
 DriveServiceOnWorker::~DriveServiceOnWorker() {}
 
-google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory(
+google_apis::CancelCallbackOnce DriveServiceOnWorker::AddNewDirectory(
     const std::string& parent_resource_id,
     const std::string& directory_title,
     const drive::AddNewDirectoryOptions& options,
@@ -44,7 +44,7 @@ google_apis::CancelCallback DriveServiceOnWorker::AddNewDirectory(
                                     worker_task_runner_.get(), FROM_HERE,
                                     std::move(callback))));
 
-  return google_apis::CancelCallback();
+  return google_apis::CancelCallbackOnce();
 }
 
 google_apis::CancelCallback DriveServiceOnWorker::DeleteResource(
@@ -146,7 +146,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetChangeListByToken(
   return google_apis::CancelCallback();
 }
 
-google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList(
+google_apis::CancelCallbackOnce DriveServiceOnWorker::GetRemainingChangeList(
     const GURL& next_link,
     google_apis::ChangeListCallback callback) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
@@ -158,7 +158,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingChangeList(
           RelayCallbackToTaskRunner(worker_task_runner_.get(), FROM_HERE,
                                     std::move(callback))));
 
-  return google_apis::CancelCallback();
+  return google_apis::CancelCallbackOnce();
 }
 
 std::string DriveServiceOnWorker::GetRootResourceId() const {
@@ -182,7 +182,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingTeamDriveList(
   return google_apis::CancelCallback();
 }
 
-google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList(
+google_apis::CancelCallbackOnce DriveServiceOnWorker::GetRemainingFileList(
     const GURL& next_link,
     const google_apis::FileListCallback& callback) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
@@ -194,7 +194,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetRemainingFileList(
                      RelayCallbackToTaskRunner(worker_task_runner_.get(),
                                                FROM_HERE, callback)));
 
-  return google_apis::CancelCallback();
+  return google_apis::CancelCallbackOnce();
 }
 
 google_apis::CancelCallback DriveServiceOnWorker::GetFileResource(
@@ -212,7 +212,7 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileResource(
   return google_apis::CancelCallback();
 }
 
-google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory(
+google_apis::CancelCallbackOnce DriveServiceOnWorker::GetFileListInDirectory(
     const std::string& directory_resource_id,
     const google_apis::FileListCallback& callback) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
@@ -224,10 +224,11 @@ google_apis::CancelCallback DriveServiceOnWorker::GetFileListInDirectory(
                      RelayCallbackToTaskRunner(worker_task_runner_.get(),
                                                FROM_HERE, callback)));
 
-  return google_apis::CancelCallback();
+  return google_apis::CancelCallbackOnce();
 }
 
-google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory(
+google_apis::CancelCallbackOnce
+DriveServiceOnWorker::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
     const google_apis::EntryActionCallback& callback) {
@@ -240,10 +241,10 @@ google_apis::CancelCallback DriveServiceOnWorker::RemoveResourceFromDirectory(
                      RelayCallbackToTaskRunner(worker_task_runner_.get(),
                                                FROM_HERE, callback)));
 
-  return google_apis::CancelCallback();
+  return google_apis::CancelCallbackOnce();
 }
 
-google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle(
+google_apis::CancelCallbackOnce DriveServiceOnWorker::SearchByTitle(
     const std::string& title,
     const std::string& directory_resource_id,
     const google_apis::FileListCallback& callback) {
@@ -256,7 +257,7 @@ google_apis::CancelCallback DriveServiceOnWorker::SearchByTitle(
                      RelayCallbackToTaskRunner(worker_task_runner_.get(),
                                                FROM_HERE, callback)));
 
-  return google_apis::CancelCallback();
+  return google_apis::CancelCallbackOnce();
 }
 
 bool DriveServiceOnWorker::HasRefreshToken() const {

chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

@@ -38,7 +38,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
       base::SequencedTaskRunner* worker_task_runner);
   ~DriveServiceOnWorker() override;
 
-  google_apis::CancelCallback AddNewDirectory(
+  google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
       const drive::AddNewDirectoryOptions& options,
@@ -72,7 +72,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
       const std::string& start_page_token,
       google_apis::ChangeListCallback callback) override;
 
-  google_apis::CancelCallback GetRemainingChangeList(
+  google_apis::CancelCallbackOnce GetRemainingChangeList(
       const GURL& next_link,
       google_apis::ChangeListCallback callback) override;
 
@@ -82,7 +82,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
       const std::string& page_token,
       google_apis::TeamDriveListCallback callback) override;
 
-  google_apis::CancelCallback GetRemainingFileList(
+  google_apis::CancelCallbackOnce GetRemainingFileList(
       const GURL& next_link,
       const google_apis::FileListCallback& callback) override;
 
@@ -90,16 +90,16 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
       const std::string& resource_id,
       google_apis::FileResourceCallback callback) override;
 
-  google_apis::CancelCallback GetFileListInDirectory(
+  google_apis::CancelCallbackOnce GetFileListInDirectory(
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
 
-  google_apis::CancelCallback RemoveResourceFromDirectory(
+  google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
 
-  google_apis::CancelCallback SearchByTitle(
+  google_apis::CancelCallbackOnce SearchByTitle(
       const std::string& title,
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;

chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc

@@ -60,7 +60,7 @@ FakeDriveServiceWrapper::FakeDriveServiceWrapper()
 
 FakeDriveServiceWrapper::~FakeDriveServiceWrapper() {}
 
-CancelCallback FakeDriveServiceWrapper::AddNewDirectory(
+CancelCallbackOnce FakeDriveServiceWrapper::AddNewDirectory(
     const std::string& parent_resource_id,
     const std::string& directory_name,
     const drive::AddNewDirectoryOptions& options,

chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

@@ -26,7 +26,7 @@ class FakeDriveServiceWrapper : public drive::FakeDriveService {
   ~FakeDriveServiceWrapper() override;
 
   // DriveServiceInterface overrides.
-  google_apis::CancelCallback AddNewDirectory(
+  google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_name,
       const drive::AddNewDirectoryOptions& options,

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc

@@ -65,7 +65,7 @@ SyncEngineInitializer::SyncEngineInitializer(
 
 SyncEngineInitializer::~SyncEngineInitializer() {
   if (!cancel_callback_.is_null())
-    cancel_callback_.Run();
+    std::move(cancel_callback_).Run();
 }
 
 void SyncEngineInitializer::RunPreflight(std::unique_ptr<SyncTaskToken> token) {
@@ -122,7 +122,7 @@ void SyncEngineInitializer::DidGetAboutResource(
     std::unique_ptr<SyncTaskToken> token,
     google_apis::DriveApiErrorCode error,
     std::unique_ptr<google_apis::AboutResource> about_resource) {
-  cancel_callback_.Reset();
+  std::move(cancel_callback_).Reset();
 
   SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
@@ -161,7 +161,7 @@ void SyncEngineInitializer::DidFindSyncRoot(
     std::unique_ptr<SyncTaskToken> token,
     google_apis::DriveApiErrorCode error,
     std::unique_ptr<google_apis::FileList> file_list) {
-  cancel_callback_.Reset();
+  std::move(cancel_callback_).Reset();
 
   SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
@@ -241,7 +241,7 @@ void SyncEngineInitializer::DidCreateSyncRoot(
     google_apis::DriveApiErrorCode error,
     std::unique_ptr<google_apis::FileResource> entry) {
   DCHECK(!sync_root_folder_);
-  cancel_callback_.Reset();
+  std::move(cancel_callback_).Reset();
 
   SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
@@ -270,7 +270,7 @@ void SyncEngineInitializer::DetachSyncRoot(
 void SyncEngineInitializer::DidDetachSyncRoot(
     std::unique_ptr<SyncTaskToken> token,
     google_apis::DriveApiErrorCode error) {
-  cancel_callback_.Reset();
+  std::move(cancel_callback_).Reset();
 
   SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
@@ -299,7 +299,7 @@ void SyncEngineInitializer::DidListAppRootFolders(
     std::unique_ptr<SyncTaskToken> token,
     google_apis::DriveApiErrorCode error,
     std::unique_ptr<google_apis::FileList> file_list) {
-  cancel_callback_.Reset();
+  std::move(cancel_callback_).Reset();
 
   SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h

@@ -99,7 +99,7 @@ class SyncEngineInitializer : public SyncTask {
   SyncEngineContext* sync_context_;  // Not owned.
   leveldb::Env* env_override_;
 
-  google_apis::CancelCallback cancel_callback_;
+  google_apis::CancelCallbackOnce cancel_callback_;
   base::FilePath database_path_;
 
   int find_sync_root_retry_count_;

components/drive/service/drive_api_service.cc

@@ -315,7 +315,7 @@ CancelCallbackOnce DriveAPIService::GetAllFileList(
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
-CancelCallback DriveAPIService::GetFileListInDirectory(
+CancelCallbackOnce DriveAPIService::GetFileListInDirectory(
     const std::string& directory_resource_id,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -361,7 +361,7 @@ CancelCallback DriveAPIService::Search(
       kFileListFields, callback);
 }
 
-CancelCallback DriveAPIService::SearchByTitle(
+CancelCallbackOnce DriveAPIService::SearchByTitle(
     const std::string& title,
     const std::string& directory_resource_id,
     const FileListCallback& callback) {
@@ -419,7 +419,7 @@ CancelCallback DriveAPIService::GetChangeListByToken(
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
-CancelCallback DriveAPIService::GetRemainingChangeList(
+CancelCallbackOnce DriveAPIService::GetRemainingChangeList(
     const GURL& next_link,
     ChangeListCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -450,7 +450,7 @@ CancelCallback DriveAPIService::GetRemainingTeamDriveList(
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
-CancelCallback DriveAPIService::GetRemainingFileList(
+CancelCallbackOnce DriveAPIService::GetRemainingFileList(
     const GURL& next_link,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -546,7 +546,7 @@ CancelCallback DriveAPIService::TrashResource(
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
-CancelCallback DriveAPIService::AddNewDirectory(
+CancelCallbackOnce DriveAPIService::AddNewDirectory(
     const std::string& parent_resource_id,
     const std::string& directory_title,
     const AddNewDirectoryOptions& options,
@@ -637,7 +637,7 @@ CancelCallback DriveAPIService::AddResourceToDirectory(
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
-CancelCallback DriveAPIService::RemoveResourceFromDirectory(
+CancelCallbackOnce DriveAPIService::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
     const EntryActionCallback& callback) {

components/drive/service/drive_api_service.h

@@ -134,13 +134,13 @@ class DriveAPIService : public DriveServiceInterface,
   google_apis::CancelCallbackOnce GetAllFileList(
       const std::string& team_drive_id,
       const google_apis::FileListCallback& callback) override;
-  google_apis::CancelCallback GetFileListInDirectory(
+  google_apis::CancelCallbackOnce GetFileListInDirectory(
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
   google_apis::CancelCallback Search(
       const std::string& search_query,
       const google_apis::FileListCallback& callback) override;
-  google_apis::CancelCallback SearchByTitle(
+  google_apis::CancelCallbackOnce SearchByTitle(
       const std::string& title,
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
@@ -154,10 +154,10 @@ class DriveAPIService : public DriveServiceInterface,
   google_apis::CancelCallback GetRemainingTeamDriveList(
       const std::string& page_token,
       google_apis::TeamDriveListCallback callback) override;
-  google_apis::CancelCallback GetRemainingChangeList(
+  google_apis::CancelCallbackOnce GetRemainingChangeList(
       const GURL& next_link,
       google_apis::ChangeListCallback callback) override;
-  google_apis::CancelCallback GetRemainingFileList(
+  google_apis::CancelCallbackOnce GetRemainingFileList(
       const GURL& next_link,
       const google_apis::FileListCallback& callback) override;
   google_apis::CancelCallback GetFileResource(
@@ -199,11 +199,11 @@ class DriveAPIService : public DriveServiceInterface,
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
-  google_apis::CancelCallback RemoveResourceFromDirectory(
+  google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
-  google_apis::CancelCallback AddNewDirectory(
+  google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
       const AddNewDirectoryOptions& options,

components/drive/service/drive_service_interface.h

@@ -229,7 +229,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   //
   // |directory_resource_id| must not be empty.
   // |callback| must not be null.
-  virtual google_apis::CancelCallback GetFileListInDirectory(
+  virtual google_apis::CancelCallbackOnce GetFileListInDirectory(
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) = 0;
 
@@ -254,7 +254,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   // GetRemainingFileList.
   //
   // |title| must not be empty, and |callback| must not be null.
-  virtual google_apis::CancelCallback SearchByTitle(
+  virtual google_apis::CancelCallbackOnce SearchByTitle(
       const std::string& title,
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) = 0;
@@ -290,7 +290,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   // completion.
   //
   // |next_link| must not be empty. |callback| must not be null.
-  virtual google_apis::CancelCallback GetRemainingChangeList(
+  virtual google_apis::CancelCallbackOnce GetRemainingChangeList(
       const GURL& next_link,
       google_apis::ChangeListCallback callback) = 0;
 
@@ -309,7 +309,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   // |callback| will be called upon completion.
   //
   // |next_link| must not be empty. |callback| must not be null.
-  virtual google_apis::CancelCallback GetRemainingFileList(
+  virtual google_apis::CancelCallbackOnce GetRemainingFileList(
       const GURL& next_link,
       const google_apis::FileListCallback& callback) = 0;
 
@@ -396,7 +396,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   // |resource_id| from a collection represented by the |parent_resource_id|.
   // Upon completion, invokes |callback| with results on the calling thread.
   // |callback| must not be null.
-  virtual google_apis::CancelCallback RemoveResourceFromDirectory(
+  virtual google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) = 0;
@@ -409,7 +409,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   // This function cannot be named as "CreateDirectory" as it conflicts with
   // a macro on Windows.
   // |callback| must not be null.
-  virtual google_apis::CancelCallback AddNewDirectory(
+  virtual google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
       const AddNewDirectoryOptions& options,

components/drive/service/dummy_drive_service.cc

@@ -64,18 +64,22 @@ CancelCallbackOnce DummyDriveService::GetAllFileList(
   return CancelCallbackOnce();
 }
 
-CancelCallback DummyDriveService::GetFileListInDirectory(
+CancelCallbackOnce DummyDriveService::GetFileListInDirectory(
     const std::string& directory_resource_id,
-    const FileListCallback& callback) { return CancelCallback(); }
+    const FileListCallback& callback) {
+  return CancelCallbackOnce();
+}
 
 CancelCallback DummyDriveService::Search(
     const std::string& search_query,
     const FileListCallback& callback) { return CancelCallback(); }
 
-CancelCallback DummyDriveService::SearchByTitle(
+CancelCallbackOnce DummyDriveService::SearchByTitle(
     const std::string& title,
     const std::string& directory_resource_id,
-    const FileListCallback& callback) { return CancelCallback(); }
+    const FileListCallback& callback) {
+  return CancelCallbackOnce();
+}
 
 CancelCallback DummyDriveService::GetChangeList(int64_t start_changestamp,
                                                 ChangeListCallback callback) {
@@ -89,10 +93,10 @@ CancelCallback DummyDriveService::GetChangeListByToken(
   return CancelCallback();
 }
 
-CancelCallback DummyDriveService::GetRemainingChangeList(
+CancelCallbackOnce DummyDriveService::GetRemainingChangeList(
     const GURL& next_link,
     ChangeListCallback callback) {
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
 CancelCallback DummyDriveService::GetRemainingTeamDriveList(
@@ -101,9 +105,11 @@ CancelCallback DummyDriveService::GetRemainingTeamDriveList(
   return CancelCallback();
 }
 
-CancelCallback DummyDriveService::GetRemainingFileList(
+CancelCallbackOnce DummyDriveService::GetRemainingFileList(
     const GURL& next_link,
-    const FileListCallback& callback) { return CancelCallback(); }
+    const FileListCallback& callback) {
+  return CancelCallback();
+}
 
 CancelCallback DummyDriveService::GetFileResource(
     const std::string& resource_id,
@@ -165,17 +171,19 @@ CancelCallback DummyDriveService::AddResourceToDirectory(
     const std::string& resource_id,
     const EntryActionCallback& callback) { return CancelCallback(); }
 
-CancelCallback DummyDriveService::RemoveResourceFromDirectory(
+CancelCallbackOnce DummyDriveService::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) { return CancelCallback(); }
+    const EntryActionCallback& callback) {
+  return CancelCallback();
+}
 
-CancelCallback DummyDriveService::AddNewDirectory(
+CancelCallbackOnce DummyDriveService::AddNewDirectory(
     const std::string& parent_resource_id,
     const std::string& directory_title,
     const AddNewDirectoryOptions& options,
     FileResourceCallback callback) {
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
 CancelCallback DummyDriveService::InitiateUploadNewFile(

components/drive/service/dummy_drive_service.h

@@ -38,13 +38,13 @@ class DummyDriveService : public DriveServiceInterface {
   google_apis::CancelCallbackOnce GetAllFileList(
       const std::string& team_drive_id,
       const google_apis::FileListCallback& callback) override;
-  google_apis::CancelCallback GetFileListInDirectory(
+  google_apis::CancelCallbackOnce GetFileListInDirectory(
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
   google_apis::CancelCallback Search(
       const std::string& search_query,
       const google_apis::FileListCallback& callback) override;
-  google_apis::CancelCallback SearchByTitle(
+  google_apis::CancelCallbackOnce SearchByTitle(
       const std::string& title,
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
@@ -55,13 +55,13 @@ class DummyDriveService : public DriveServiceInterface {
       const std::string& team_drive_id,
       const std::string& start_page_token,
       google_apis::ChangeListCallback callback) override;
-  google_apis::CancelCallback GetRemainingChangeList(
+  google_apis::CancelCallbackOnce GetRemainingChangeList(
       const GURL& next_link,
       google_apis::ChangeListCallback callback) override;
   google_apis::CancelCallback GetRemainingTeamDriveList(
       const std::string& page_token,
       google_apis::TeamDriveListCallback callback) override;
-  google_apis::CancelCallback GetRemainingFileList(
+  google_apis::CancelCallbackOnce GetRemainingFileList(
       const GURL& next_link,
       const google_apis::FileListCallback& callback) override;
   google_apis::CancelCallback GetFileResource(
@@ -103,11 +103,11 @@ class DummyDriveService : public DriveServiceInterface {
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
-  google_apis::CancelCallback RemoveResourceFromDirectory(
+  google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
-  google_apis::CancelCallback AddNewDirectory(
+  google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
       const AddNewDirectoryOptions& options,

components/drive/service/fake_drive_service.cc

@@ -423,7 +423,7 @@ CancelCallbackOnce FakeDriveService::GetAllFileList(
   return CancelCallbackOnce();
 }
 
-CancelCallback FakeDriveService::GetFileListInDirectory(
+CancelCallbackOnce FakeDriveService::GetFileListInDirectory(
     const std::string& directory_resource_id,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -437,7 +437,7 @@ CancelCallback FakeDriveService::GetFileListInDirectory(
                         0,              // start offset
                         default_max_results_, &directory_load_count_,
                         base::BindOnce(&FileListCallbackAdapter, callback));
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
 CancelCallback FakeDriveService::Search(
@@ -457,7 +457,7 @@ CancelCallback FakeDriveService::Search(
   return CancelCallback();
 }
 
-CancelCallback FakeDriveService::SearchByTitle(
+CancelCallbackOnce FakeDriveService::SearchByTitle(
     const std::string& title,
     const std::string& directory_resource_id,
     const FileListCallback& callback) {
@@ -474,7 +474,7 @@ CancelCallback FakeDriveService::SearchByTitle(
                         0,              // start offset
                         default_max_results_, nullptr,
                         base::BindOnce(&FileListCallbackAdapter, callback));
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
 CancelCallback FakeDriveService::GetChangeList(int64_t start_changestamp,
@@ -513,7 +513,7 @@ CancelCallback FakeDriveService::GetChangeListByToken(
   return CancelCallback();
 }
 
-CancelCallback FakeDriveService::GetRemainingChangeList(
+CancelCallbackOnce FakeDriveService::GetRemainingChangeList(
     const GURL& next_link,
     ChangeListCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -558,7 +558,7 @@ CancelCallback FakeDriveService::GetRemainingChangeList(
   GetChangeListInternal(start_changestamp, search_query, directory_resource_id,
                         team_drive_id, start_offset, max_results, nullptr,
                         std::move(callback));
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
 CancelCallback FakeDriveService::GetRemainingTeamDriveList(
@@ -577,7 +577,7 @@ CancelCallback FakeDriveService::GetRemainingTeamDriveList(
   return CancelCallback();
 }
 
-CancelCallback FakeDriveService::GetRemainingFileList(
+CancelCallbackOnce FakeDriveService::GetRemainingFileList(
     const GURL& next_link,
     const FileListCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -1012,7 +1012,7 @@ CancelCallback FakeDriveService::AddResourceToDirectory(
   return CancelCallback();
 }
 
-CancelCallback FakeDriveService::RemoveResourceFromDirectory(
+CancelCallbackOnce FakeDriveService::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
     const EntryActionCallback& callback) {
@@ -1022,14 +1022,14 @@ CancelCallback FakeDriveService::RemoveResourceFromDirectory(
   if (offline_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(callback, DRIVE_NO_CONNECTION));
-    return CancelCallback();
+    return CancelCallbackOnce();
   }
 
   EntryInfo* entry = FindEntryByResourceId(resource_id);
   if (!entry) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
-    return CancelCallback();
+    return CancelCallbackOnce();
   }
 
   ChangeResource* change = &entry->change_resource;
@@ -1044,16 +1044,16 @@ CancelCallback FakeDriveService::RemoveResourceFromDirectory(
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::BindOnce(&FakeDriveService::NotifyObservers,
                                     weak_ptr_factory_.GetWeakPtr()));
-      return CancelCallback();
+      return CancelCallbackOnce();
     }
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
-CancelCallback FakeDriveService::AddNewDirectory(
+CancelCallbackOnce FakeDriveService::AddNewDirectory(
     const std::string& parent_resource_id,
     const std::string& directory_title,
     const AddNewDirectoryOptions& options,
@@ -1387,7 +1387,7 @@ void FakeDriveService::AddNewFileWithResourceId(
                                 weak_ptr_factory_.GetWeakPtr()));
 }
 
-CancelCallback FakeDriveService::AddNewDirectoryWithResourceId(
+CancelCallbackOnce FakeDriveService::AddNewDirectoryWithResourceId(
     const std::string& resource_id,
     const std::string& parent_resource_id,
     const std::string& directory_title,
@@ -1400,7 +1400,7 @@ CancelCallback FakeDriveService::AddNewDirectoryWithResourceId(
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(std::move(callback), DRIVE_NO_CONNECTION,
                                   std::unique_ptr<FileResource>()));
-    return CancelCallback();
+    return CancelCallbackOnce();
   }
 
   const EntryInfo* new_entry = AddNewEntry(resource_id,
@@ -1413,7 +1413,7 @@ CancelCallback FakeDriveService::AddNewDirectoryWithResourceId(
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND,
                                   std::unique_ptr<FileResource>()));
-    return CancelCallback();
+    return CancelCallbackOnce();
   }
 
   const google_apis::DriveApiErrorCode result =
@@ -1428,7 +1428,7 @@ CancelCallback FakeDriveService::AddNewDirectoryWithResourceId(
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&FakeDriveService::NotifyObservers,
                                 weak_ptr_factory_.GetWeakPtr()));
-  return CancelCallback();
+  return CancelCallbackOnce();
 }
 
 void FakeDriveService::SetLastModifiedTime(const std::string& resource_id,

components/drive/service/fake_drive_service.h

@@ -138,7 +138,7 @@ class FakeDriveService : public DriveServiceInterface {
   google_apis::CancelCallbackOnce GetAllFileList(
       const std::string& team_drive_id,
       const google_apis::FileListCallback& callback) override;
-  google_apis::CancelCallback GetFileListInDirectory(
+  google_apis::CancelCallbackOnce GetFileListInDirectory(
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
   // See the comment for EntryMatchWidthQuery() in .cc file for details about
@@ -146,7 +146,7 @@ class FakeDriveService : public DriveServiceInterface {
   google_apis::CancelCallback Search(
       const std::string& search_query,
       const google_apis::FileListCallback& callback) override;
-  google_apis::CancelCallback SearchByTitle(
+  google_apis::CancelCallbackOnce SearchByTitle(
       const std::string& title,
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback) override;
@@ -157,13 +157,13 @@ class FakeDriveService : public DriveServiceInterface {
       const std::string& team_drive_id,
       const std::string& start_page_token,
       google_apis::ChangeListCallback callback) override;
-  google_apis::CancelCallback GetRemainingChangeList(
+  google_apis::CancelCallbackOnce GetRemainingChangeList(
       const GURL& next_link,
       google_apis::ChangeListCallback callback) override;
   google_apis::CancelCallback GetRemainingTeamDriveList(
       const std::string& page_token,
       google_apis::TeamDriveListCallback callback) override;
-  google_apis::CancelCallback GetRemainingFileList(
+  google_apis::CancelCallbackOnce GetRemainingFileList(
       const GURL& next_link,
       const google_apis::FileListCallback& callback) override;
   google_apis::CancelCallback GetFileResource(
@@ -205,11 +205,11 @@ class FakeDriveService : public DriveServiceInterface {
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
-  google_apis::CancelCallback RemoveResourceFromDirectory(
+  google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const google_apis::EntryActionCallback& callback) override;
-  google_apis::CancelCallback AddNewDirectory(
+  google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
       const AddNewDirectoryOptions& options,
@@ -289,7 +289,7 @@ class FakeDriveService : public DriveServiceInterface {
 
   // Adds a new directory with the given |resource_id|.
   // |callback| must not be null.
-  google_apis::CancelCallback AddNewDirectoryWithResourceId(
+  google_apis::CancelCallbackOnce AddNewDirectoryWithResourceId(
       const std::string& resource_id,
       const std::string& parent_resource_id,
       const std::string& directory_title,