Convert google_apis::EntryActionCallback to OnceCallback

Bug: 1007788
Change-Id: If13e051b2d2c8800a802c4a29e0bde77b8afda84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2279294
Commit-Queue: Anand K Mistry <amistry@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Auto-Submit: Anand K Mistry <amistry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791676}

chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc

@@ -50,15 +50,15 @@ google_apis::CancelCallbackOnce DriveServiceOnWorker::AddNewDirectory(
 google_apis::CancelCallback DriveServiceOnWorker::DeleteResource(
     const std::string& resource_id,
     const std::string& etag,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
 
   ui_task_runner_->PostTask(
       FROM_HERE,
-      base::BindOnce(&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,
+                                    std::move(callback))));
 
   return google_apis::CancelCallback();
 }
@@ -231,15 +231,16 @@ google_apis::CancelCallbackOnce
 DriveServiceOnWorker::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
 
   ui_task_runner_->PostTask(
       FROM_HERE,
-      base::BindOnce(&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,
+                                    std::move(callback))));
 
   return google_apis::CancelCallbackOnce();
 }
@@ -323,7 +324,7 @@ google_apis::CancelCallback DriveServiceOnWorker::Search(
 
 google_apis::CancelCallback DriveServiceOnWorker::TrashResource(
     const std::string& resource_id,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   NOTREACHED();
   return google_apis::CancelCallback();
 }
@@ -353,7 +354,7 @@ google_apis::CancelCallback DriveServiceOnWorker::UpdateResource(
 google_apis::CancelCallback DriveServiceOnWorker::AddResourceToDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   NOTREACHED();
   return google_apis::CancelCallback();
 }
@@ -436,7 +437,7 @@ google_apis::CancelCallback DriveServiceOnWorker::AddPermission(
     const std::string& resource_id,
     const std::string& email,
     google_apis::drive::PermissionRole role,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   NOTREACHED();
   return google_apis::CancelCallback();
 }

chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h

@@ -47,7 +47,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
   google_apis::CancelCallback DeleteResource(
       const std::string& resource_id,
       const std::string& etag,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
 
   google_apis::CancelCallbackOnce DownloadFile(
       const base::FilePath& local_cache_path,
@@ -97,7 +97,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
   google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
 
   google_apis::CancelCallbackOnce SearchByTitle(
       const std::string& title,
@@ -125,7 +125,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
       const google_apis::FileListCallback& callback) override;
   google_apis::CancelCallback TrashResource(
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallback CopyResource(
       const std::string& resource_id,
       const std::string& parent_resource_id,
@@ -143,7 +143,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
   google_apis::CancelCallback AddResourceToDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallback InitiateUploadNewFile(
       const std::string& content_type,
       int64_t content_length,
@@ -193,7 +193,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
       const std::string& resource_id,
       const std::string& email,
       google_apis::drive::PermissionRole role,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
 
  private:
   base::WeakPtr<DriveServiceWrapper> wrapper_;

chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.cc

@@ -31,11 +31,9 @@ void DriveServiceWrapper::AddNewDirectory(
 void DriveServiceWrapper::DeleteResource(
     const std::string& resource_id,
     const std::string& etag,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  drive_service_->DeleteResource(resource_id,
-                                 etag,
-                                 callback);
+  drive_service_->DeleteResource(resource_id, etag, std::move(callback));
 }
 
 void DriveServiceWrapper::DownloadFile(
@@ -119,10 +117,10 @@ void DriveServiceWrapper::GetFileListInDirectory(
 void DriveServiceWrapper::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  drive_service_->RemoveResourceFromDirectory(
-      parent_resource_id, resource_id, callback);
+  drive_service_->RemoveResourceFromDirectory(parent_resource_id, resource_id,
+                                              std::move(callback));
 }
 
 void DriveServiceWrapper::SearchByTitle(

chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.h

@@ -30,10 +30,9 @@ class DriveServiceWrapper : public base::SupportsWeakPtr<DriveServiceWrapper> {
                        const drive::AddNewDirectoryOptions& options,
                        google_apis::FileResourceCallback callback);
 
-  void DeleteResource(
-      const std::string& resource_id,
-      const std::string& etag,
-      const google_apis::EntryActionCallback& callback);
+  void DeleteResource(const std::string& resource_id,
+                      const std::string& etag,
+                      google_apis::EntryActionCallback callback);
 
   void DownloadFile(
       const base::FilePath& local_cache_path,
@@ -71,10 +70,9 @@ class DriveServiceWrapper : public base::SupportsWeakPtr<DriveServiceWrapper> {
       const std::string& directory_resource_id,
       const google_apis::FileListCallback& callback);
 
-  void RemoveResourceFromDirectory(
-      const std::string& parent_resource_id,
-      const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback);
+  void RemoveResourceFromDirectory(const std::string& parent_resource_id,
+                                   const std::string& resource_id,
+                                   google_apis::EntryActionCallback callback);
 
   void SearchByTitle(
       const std::string& title,

components/drive/service/drive_api_service.cc

@@ -131,10 +131,10 @@ const char kTeamDrivesListFields[] =
     "nextPageToken,kind,items(kind,id,name,capabilities)";
 
 // Ignores the |entry|, and runs the |callback|.
-void EntryActionCallbackAdapter(const EntryActionCallback& callback,
+void EntryActionCallbackAdapter(EntryActionCallback callback,
                                 DriveApiErrorCode error,
                                 std::unique_ptr<FileResource> entry) {
-  callback.Run(error);
+  std::move(callback).Run(error);
 }
 
 // The resource ID for the root directory for Drive API is defined in the spec:
@@ -518,31 +518,29 @@ CancelCallbackOnce DriveAPIService::DownloadFile(
           download_action_callback, get_content_callback, progress_callback));
 }
 
-CancelCallback DriveAPIService::DeleteResource(
-    const std::string& resource_id,
-    const std::string& etag,
-    const EntryActionCallback& callback) {
+CancelCallback DriveAPIService::DeleteResource(const std::string& resource_id,
+                                               const std::string& etag,
+                                               EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!callback.is_null());
+  DCHECK(callback);
 
   std::unique_ptr<FilesDeleteRequest> request =
       std::make_unique<FilesDeleteRequest>(sender_.get(), url_generator_,
-                                           callback);
+                                           std::move(callback));
   request->set_file_id(resource_id);
   request->set_etag(etag);
   return sender_->StartRequestWithAuthRetry(std::move(request));
 }
 
-CancelCallback DriveAPIService::TrashResource(
-    const std::string& resource_id,
-    const EntryActionCallback& callback) {
+CancelCallback DriveAPIService::TrashResource(const std::string& resource_id,
+                                              EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!callback.is_null());
+  DCHECK(callback);
 
   std::unique_ptr<FilesTrashRequest> request =
       std::make_unique<FilesTrashRequest>(
           sender_.get(), url_generator_,
-          base::BindOnce(&EntryActionCallbackAdapter, callback));
+          base::BindOnce(&EntryActionCallbackAdapter, std::move(callback)));
   request->set_file_id(resource_id);
   request->set_fields(kFileResourceFields);
   return sender_->StartRequestWithAuthRetry(std::move(request));
@@ -627,13 +625,13 @@ CancelCallback DriveAPIService::UpdateResource(
 CancelCallback DriveAPIService::AddResourceToDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) {
+    EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!callback.is_null());
+  DCHECK(callback);
 
   std::unique_ptr<ChildrenInsertRequest> request =
       std::make_unique<ChildrenInsertRequest>(sender_.get(), url_generator_,
-                                              callback);
+                                              std::move(callback));
   request->set_folder_id(parent_resource_id);
   request->set_id(resource_id);
   return sender_->StartRequestWithAuthRetry(std::move(request));
@@ -642,13 +640,13 @@ CancelCallback DriveAPIService::AddResourceToDirectory(
 CancelCallbackOnce DriveAPIService::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) {
+    EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!callback.is_null());
+  DCHECK(callback);
 
   std::unique_ptr<ChildrenDeleteRequest> request =
       std::make_unique<ChildrenDeleteRequest>(sender_.get(), url_generator_,
-                                              callback);
+                                              std::move(callback));
   request->set_child_id(resource_id);
   request->set_folder_id(parent_resource_id);
   return sender_->StartRequestWithAuthRetry(std::move(request));
@@ -775,13 +773,13 @@ google_apis::CancelCallback DriveAPIService::AddPermission(
     const std::string& resource_id,
     const std::string& email,
     google_apis::drive::PermissionRole role,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!callback.is_null());
+  DCHECK(callback);
 
   std::unique_ptr<google_apis::drive::PermissionsInsertRequest> request =
       std::make_unique<google_apis::drive::PermissionsInsertRequest>(
-          sender_.get(), url_generator_, callback);
+          sender_.get(), url_generator_, std::move(callback));
   request->set_id(resource_id);
   request->set_role(role);
   request->set_type(google_apis::drive::PERMISSION_TYPE_USER);

components/drive/service/drive_api_service.h

@@ -171,10 +171,10 @@ class DriveAPIService : public DriveServiceInterface,
   google_apis::CancelCallback DeleteResource(
       const std::string& resource_id,
       const std::string& etag,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallback TrashResource(
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce DownloadFile(
       const base::FilePath& local_cache_path,
       const std::string& resource_id,
@@ -198,11 +198,11 @@ class DriveAPIService : public DriveServiceInterface,
   google_apis::CancelCallback AddResourceToDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
@@ -255,7 +255,7 @@ class DriveAPIService : public DriveServiceInterface,
       const std::string& resource_id,
       const std::string& email,
       google_apis::drive::PermissionRole role,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   std::unique_ptr<BatchRequestConfiguratorInterface> StartBatchRequest()
       override;
 

components/drive/service/drive_service_interface.h

@@ -344,14 +344,14 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   virtual google_apis::CancelCallback DeleteResource(
       const std::string& resource_id,
       const std::string& etag,
-      const google_apis::EntryActionCallback& callback) = 0;
+      google_apis::EntryActionCallback callback) = 0;
 
   // Trashes a resource identified by its |resource_id|.
   // Upon completion, invokes |callback| with results on the calling thread.
   // |callback| must not be null.
   virtual google_apis::CancelCallback TrashResource(
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) = 0;
+      google_apis::EntryActionCallback callback) = 0;
 
   // Makes a copy of a resource with |resource_id|.
   // The new resource will be put under a directory with |parent_resource_id|,
@@ -390,7 +390,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   virtual google_apis::CancelCallback AddResourceToDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) = 0;
+      google_apis::EntryActionCallback callback) = 0;
 
   // Removes a resource (document, file, collection) identified by its
   // |resource_id| from a collection represented by the |parent_resource_id|.
@@ -399,7 +399,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
   virtual google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) = 0;
+      google_apis::EntryActionCallback callback) = 0;
 
   // Adds new collection with |directory_title| under parent directory
   // identified with |parent_resource_id|. |parent_resource_id| can be the
@@ -483,7 +483,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
       const std::string& resource_id,
       const std::string& email,
       google_apis::drive::PermissionRole role,
-      const google_apis::EntryActionCallback& callback) = 0;
+      google_apis::EntryActionCallback callback) = 0;
 
   // Starts batch request and returns |BatchRequestConfigurator|.
   virtual std::unique_ptr<BatchRequestConfiguratorInterface>

components/drive/service/dummy_drive_service.cc

@@ -128,14 +128,16 @@ CancelCallback DummyDriveService::GetStartPageToken(
   return CancelCallback();
 }
 
-CancelCallback DummyDriveService::DeleteResource(
-    const std::string& resource_id,
-    const std::string& etag,
-    const EntryActionCallback& callback) { return CancelCallback(); }
+CancelCallback DummyDriveService::DeleteResource(const std::string& resource_id,
+                                                 const std::string& etag,
+                                                 EntryActionCallback callback) {
+  return CancelCallback();
+}
 
-CancelCallback DummyDriveService::TrashResource(
-    const std::string& resource_id,
-    const EntryActionCallback& callback) { return CancelCallback(); }
+CancelCallback DummyDriveService::TrashResource(const std::string& resource_id,
+                                                EntryActionCallback callback) {
+  return CancelCallback();
+}
 
 CancelCallbackOnce DummyDriveService::DownloadFile(
     const base::FilePath& local_cache_path,
@@ -169,12 +171,14 @@ CancelCallback DummyDriveService::UpdateResource(
 CancelCallback DummyDriveService::AddResourceToDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) { return CancelCallback(); }
+    EntryActionCallback callback) {
+  return CancelCallback();
+}
 
 CancelCallbackOnce DummyDriveService::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) {
+    EntryActionCallback callback) {
   return CancelCallback();
 }
 
@@ -251,7 +255,9 @@ CancelCallback DummyDriveService::AddPermission(
     const std::string& resource_id,
     const std::string& email,
     google_apis::drive::PermissionRole role,
-    const EntryActionCallback& callback) { return CancelCallback(); }
+    EntryActionCallback callback) {
+  return CancelCallback();
+}
 std::unique_ptr<BatchRequestConfiguratorInterface>
 DummyDriveService::StartBatchRequest() {
   return std::unique_ptr<BatchRequestConfiguratorInterface>();

components/drive/service/dummy_drive_service.h

@@ -75,10 +75,10 @@ class DummyDriveService : public DriveServiceInterface {
   google_apis::CancelCallback DeleteResource(
       const std::string& resource_id,
       const std::string& etag,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallback TrashResource(
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce DownloadFile(
       const base::FilePath& local_cache_path,
       const std::string& resource_id,
@@ -102,11 +102,11 @@ class DummyDriveService : public DriveServiceInterface {
   google_apis::CancelCallback AddResourceToDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
@@ -159,7 +159,7 @@ class DummyDriveService : public DriveServiceInterface {
       const std::string& resource_id,
       const std::string& email,
       google_apis::drive::PermissionRole role,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   std::unique_ptr<BatchRequestConfiguratorInterface> StartBatchRequest()
       override;
 };

components/drive/service/fake_drive_service.cc

@@ -667,43 +667,42 @@ CancelCallback FakeDriveService::GetStartPageToken(
   return CancelCallback();
 }
 
-CancelCallback FakeDriveService::DeleteResource(
-    const std::string& resource_id,
-    const std::string& etag,
-    const EntryActionCallback& callback) {
+CancelCallback FakeDriveService::DeleteResource(const std::string& resource_id,
+                                                const std::string& etag,
+                                                EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(callback);
 
   if (offline_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, DRIVE_NO_CONNECTION));
+        FROM_HERE, base::BindOnce(std::move(callback), DRIVE_NO_CONNECTION));
     return CancelCallback();
   }
 
   EntryInfo* entry = FindEntryByResourceId(resource_id);
   if (!entry) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
     return CancelCallback();
   }
 
   ChangeResource* change = &entry->change_resource;
   if (change->is_deleted()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
     return CancelCallback();
   }
 
   const FileResource* file = change->file();
   if (!etag.empty() && etag != file->etag()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_PRECONDITION));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_PRECONDITION));
     return CancelCallback();
   }
 
   if (entry->user_permission != google_apis::drive::PERMISSION_ROLE_OWNER) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_FORBIDDEN));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_FORBIDDEN));
     return CancelCallback();
   }
 
@@ -711,29 +710,28 @@ CancelCallback FakeDriveService::DeleteResource(
   AddNewChangestamp(change, file->team_drive_id());
   change->set_file(std::unique_ptr<FileResource>());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(callback, HTTP_NO_CONTENT));
+      FROM_HERE, base::BindOnce(std::move(callback), HTTP_NO_CONTENT));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&FakeDriveService::NotifyObservers,
                                 weak_ptr_factory_.GetWeakPtr()));
   return CancelCallback();
 }
 
-CancelCallback FakeDriveService::TrashResource(
-    const std::string& resource_id,
-    const EntryActionCallback& callback) {
+CancelCallback FakeDriveService::TrashResource(const std::string& resource_id,
+                                               EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(callback);
 
   if (offline_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, DRIVE_NO_CONNECTION));
+        FROM_HERE, base::BindOnce(std::move(callback), DRIVE_NO_CONNECTION));
     return CancelCallback();
   }
 
   EntryInfo* entry = FindEntryByResourceId(resource_id);
   if (!entry) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
     return CancelCallback();
   }
 
@@ -741,20 +739,20 @@ CancelCallback FakeDriveService::TrashResource(
   FileResource* file = change->mutable_file();
   if (change->is_deleted() || file->labels().is_trashed()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
     return CancelCallback();
   }
 
   if (entry->user_permission != google_apis::drive::PERMISSION_ROLE_OWNER) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_FORBIDDEN));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_FORBIDDEN));
     return CancelCallback();
   }
 
   file->mutable_labels()->set_trashed(true);
   AddNewChangestamp(change, file->team_drive_id());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(callback, HTTP_SUCCESS));
+      FROM_HERE, base::BindOnce(std::move(callback), HTTP_SUCCESS));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&FakeDriveService::NotifyObservers,
                                 weak_ptr_factory_.GetWeakPtr()));
@@ -977,20 +975,20 @@ CancelCallback FakeDriveService::UpdateResource(
 CancelCallback FakeDriveService::AddResourceToDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) {
+    EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(callback);
 
   if (offline_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, DRIVE_NO_CONNECTION));
+        FROM_HERE, base::BindOnce(std::move(callback), DRIVE_NO_CONNECTION));
     return CancelCallback();
   }
 
   EntryInfo* entry = FindEntryByResourceId(resource_id);
   if (!entry) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
     return CancelCallback();
   }
 
@@ -1005,7 +1003,7 @@ CancelCallback FakeDriveService::AddResourceToDirectory(
 
   AddNewChangestamp(change, change->file()->team_drive_id());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(callback, HTTP_SUCCESS));
+      FROM_HERE, base::BindOnce(std::move(callback), HTTP_SUCCESS));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(&FakeDriveService::NotifyObservers,
                                 weak_ptr_factory_.GetWeakPtr()));
@@ -1015,20 +1013,20 @@ CancelCallback FakeDriveService::AddResourceToDirectory(
 CancelCallbackOnce FakeDriveService::RemoveResourceFromDirectory(
     const std::string& parent_resource_id,
     const std::string& resource_id,
-    const EntryActionCallback& callback) {
+    EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(callback);
 
   if (offline_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, DRIVE_NO_CONNECTION));
+        FROM_HERE, base::BindOnce(std::move(callback), DRIVE_NO_CONNECTION));
     return CancelCallbackOnce();
   }
 
   EntryInfo* entry = FindEntryByResourceId(resource_id);
   if (!entry) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+        FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
     return CancelCallbackOnce();
   }
 
@@ -1040,7 +1038,7 @@ CancelCallbackOnce FakeDriveService::RemoveResourceFromDirectory(
       parents->erase(parents->begin() + i);
       AddNewChangestamp(change, file->team_drive_id());
       base::ThreadTaskRunnerHandle::Get()->PostTask(
-          FROM_HERE, base::BindOnce(callback, HTTP_NO_CONTENT));
+          FROM_HERE, base::BindOnce(std::move(callback), HTTP_NO_CONTENT));
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::BindOnce(&FakeDriveService::NotifyObservers,
                                     weak_ptr_factory_.GetWeakPtr()));
@@ -1049,7 +1047,7 @@ CancelCallbackOnce FakeDriveService::RemoveResourceFromDirectory(
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(callback, HTTP_NOT_FOUND));
+      FROM_HERE, base::BindOnce(std::move(callback), HTTP_NOT_FOUND));
   return CancelCallbackOnce();
 }
 
@@ -1917,7 +1915,7 @@ google_apis::CancelCallback FakeDriveService::AddPermission(
     const std::string& resource_id,
     const std::string& email,
     google_apis::drive::PermissionRole role,
-    const google_apis::EntryActionCallback& callback) {
+    google_apis::EntryActionCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(callback);
 

components/drive/service/fake_drive_service.h

@@ -177,10 +177,10 @@ class FakeDriveService : public DriveServiceInterface {
   google_apis::CancelCallback DeleteResource(
       const std::string& resource_id,
       const std::string& etag,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallback TrashResource(
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce DownloadFile(
       const base::FilePath& local_cache_path,
       const std::string& resource_id,
@@ -204,11 +204,11 @@ class FakeDriveService : public DriveServiceInterface {
   google_apis::CancelCallback AddResourceToDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   google_apis::CancelCallbackOnce AddNewDirectory(
       const std::string& parent_resource_id,
       const std::string& directory_title,
@@ -261,7 +261,7 @@ class FakeDriveService : public DriveServiceInterface {
       const std::string& resource_id,
       const std::string& email,
       google_apis::drive::PermissionRole role,
-      const google_apis::EntryActionCallback& callback) override;
+      google_apis::EntryActionCallback callback) override;
   std::unique_ptr<BatchRequestConfiguratorInterface> StartBatchRequest()
       override;
 

google_apis/drive/base_requests.cc

@@ -588,10 +588,10 @@ UrlFetchRequestBase::GetWeakPtr() {
 //============================ EntryActionRequest ============================
 
 EntryActionRequest::EntryActionRequest(RequestSender* sender,
-                                       const EntryActionCallback& callback)
+                                       EntryActionCallback callback)
     : UrlFetchRequestBase(sender, ProgressCallback(), ProgressCallback()),
-      callback_(callback) {
-  DCHECK(!callback_.is_null());
+      callback_(std::move(callback)) {
+  DCHECK(callback_);
 }
 
 EntryActionRequest::~EntryActionRequest() {}
@@ -600,12 +600,12 @@ void EntryActionRequest::ProcessURLFetchResults(
     const network::mojom::URLResponseHead* response_head,
     base::FilePath response_file,
     std::string response_body) {
-  callback_.Run(GetErrorCode());
+  std::move(callback_).Run(GetErrorCode());
   OnProcessURLFetchResultsComplete();
 }
 
 void EntryActionRequest::RunCallbackOnPrematureFailure(DriveApiErrorCode code) {
-  callback_.Run(code);
+  std::move(callback_).Run(code);
 }
 
 //========================= InitiateUploadRequestBase ========================

google_apis/drive/base_requests.h

@@ -323,7 +323,7 @@ class BatchableDelegate {
 //============================ EntryActionRequest ============================
 
 // Callback type for requests that return only error status, like: Delete/Move.
-typedef base::Callback<void(DriveApiErrorCode error)> EntryActionCallback;
+using EntryActionCallback = base::OnceCallback<void(DriveApiErrorCode error)>;
 
 // This class performs a simple action over a given entry (document/file).
 // It is meant to be used for requests that return no JSON blobs.
@@ -331,8 +331,7 @@ class EntryActionRequest : public UrlFetchRequestBase {
  public:
   // |callback| is called when the request is finished either by success or by
   // failure. It must not be null.
-  EntryActionRequest(RequestSender* sender,
-                     const EntryActionCallback& callback);
+  EntryActionRequest(RequestSender* sender, EntryActionCallback callback);
   ~EntryActionRequest() override;
 
  protected:
@@ -344,7 +343,7 @@ class EntryActionRequest : public UrlFetchRequestBase {
   void RunCallbackOnPrematureFailure(DriveApiErrorCode code) override;
 
  private:
-  const EntryActionCallback callback_;
+  EntryActionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(EntryActionRequest);
 };

google_apis/drive/base_requests_unittest.cc

@@ -39,10 +39,10 @@ const char kInvalidJsonString[] = "$$$";
 class FakeUrlFetchRequest : public UrlFetchRequestBase {
  public:
   FakeUrlFetchRequest(RequestSender* sender,
-                      const EntryActionCallback& callback,
+                      EntryActionCallback callback,
                       const GURL& url)
       : UrlFetchRequestBase(sender, ProgressCallback(), ProgressCallback()),
-        callback_(callback),
+        callback_(std::move(callback)),
         url_(url) {}
 
   ~FakeUrlFetchRequest() override {}
@@ -53,10 +53,10 @@ class FakeUrlFetchRequest : public UrlFetchRequestBase {
       const network::mojom::URLResponseHead* response_head,
       base::FilePath response_file,
       std::string response_body) override {
-    callback_.Run(GetErrorCode());
+    std::move(callback_).Run(GetErrorCode());
   }
   void RunCallbackOnPrematureFailure(DriveApiErrorCode code) override {
-    callback_.Run(code);
+    std::move(callback_).Run(code);
   }
 
   EntryActionCallback callback_;

google_apis/drive/drive_api_requests.cc

@@ -573,11 +573,9 @@ GURL FilesListNextPageRequest::GetURLInternal() const {
 FilesDeleteRequest::FilesDeleteRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
-    const EntryActionCallback& callback)
-    : EntryActionRequest(sender, callback),
-      url_generator_(url_generator) {
-  DCHECK(!callback.is_null());
-}
+    EntryActionCallback callback)
+    : EntryActionRequest(sender, std::move(callback)),
+      url_generator_(url_generator) {}
 
 FilesDeleteRequest::~FilesDeleteRequest() {}
 
@@ -667,11 +665,9 @@ GURL ChangesListNextPageRequest::GetURLInternal() const {
 ChildrenInsertRequest::ChildrenInsertRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
-    const EntryActionCallback& callback)
-    : EntryActionRequest(sender, callback),
-      url_generator_(url_generator) {
-  DCHECK(!callback.is_null());
-}
+    EntryActionCallback callback)
+    : EntryActionRequest(sender, std::move(callback)),
+      url_generator_(url_generator) {}
 
 ChildrenInsertRequest::~ChildrenInsertRequest() {}
 
@@ -701,11 +697,9 @@ bool ChildrenInsertRequest::GetContentData(std::string* upload_content_type,
 ChildrenDeleteRequest::ChildrenDeleteRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
-    const EntryActionCallback& callback)
-    : EntryActionRequest(sender, callback),
-      url_generator_(url_generator) {
-  DCHECK(!callback.is_null());
-}
+    EntryActionCallback callback)
+    : EntryActionRequest(sender, std::move(callback)),
+      url_generator_(url_generator) {}
 
 ChildrenDeleteRequest::~ChildrenDeleteRequest() {}
 
@@ -1012,12 +1006,11 @@ DownloadFileRequest::~DownloadFileRequest() {
 PermissionsInsertRequest::PermissionsInsertRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
-    const EntryActionCallback& callback)
-    : EntryActionRequest(sender, callback),
+    EntryActionCallback callback)
+    : EntryActionRequest(sender, std::move(callback)),
       url_generator_(url_generator),
       type_(PERMISSION_TYPE_USER),
-      role_(PERMISSION_ROLE_READER) {
-}
+      role_(PERMISSION_ROLE_READER) {}
 
 PermissionsInsertRequest::~PermissionsInsertRequest() {
 }

google_apis/drive/drive_api_requests.h

@@ -602,7 +602,7 @@ class FilesDeleteRequest : public EntryActionRequest {
  public:
   FilesDeleteRequest(RequestSender* sender,
                      const DriveApiUrlGenerator& url_generator,
-                     const EntryActionCallback& callback);
+                     EntryActionCallback callback);
   ~FilesDeleteRequest() override;
 
   // Required parameter.
@@ -764,7 +764,7 @@ class ChildrenInsertRequest : public EntryActionRequest {
  public:
   ChildrenInsertRequest(RequestSender* sender,
                         const DriveApiUrlGenerator& url_generator,
-                        const EntryActionCallback& callback);
+                        EntryActionCallback callback);
   ~ChildrenInsertRequest() override;
 
   // Required parameter.
@@ -802,7 +802,7 @@ class ChildrenDeleteRequest : public EntryActionRequest {
   // |callback| must not be null.
   ChildrenDeleteRequest(RequestSender* sender,
                         const DriveApiUrlGenerator& url_generator,
-                        const EntryActionCallback& callback);
+                        EntryActionCallback callback);
   ~ChildrenDeleteRequest() override;
 
   // Required parameter.
@@ -1121,7 +1121,7 @@ class PermissionsInsertRequest : public EntryActionRequest {
   // See https://developers.google.com/drive/v2/reference/permissions/insert.
   PermissionsInsertRequest(RequestSender* sender,
                            const DriveApiUrlGenerator& url_generator,
-                           const EntryActionCallback& callback);
+                           EntryActionCallback callback);
   ~PermissionsInsertRequest() override;
 
   void set_id(const std::string& id) { id_ = id; }