Commit 01978e36 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by Commit Bot

Return CancelCallbackOnce in GetAllTeamDriveList

Bug: 1007686
Change-Id: Ibcb774c35eaaab97a832728304781718ee699fce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2300994Reviewed-by: default avatarNaoki Fukino <fukino@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Cr-Commit-Position: refs/heads/master@{#790590}
parent cecbee74
...@@ -300,10 +300,10 @@ void DriveServiceOnWorker::ClearRefreshToken() { ...@@ -300,10 +300,10 @@ void DriveServiceOnWorker::ClearRefreshToken() {
NOTREACHED(); NOTREACHED();
} }
google_apis::CancelCallback DriveServiceOnWorker::GetAllTeamDriveList( google_apis::CancelCallbackOnce DriveServiceOnWorker::GetAllTeamDriveList(
google_apis::TeamDriveListCallback callback) { google_apis::TeamDriveListCallback callback) {
NOTREACHED(); NOTREACHED();
return google_apis::CancelCallback(); return google_apis::CancelCallbackOnce();
} }
google_apis::CancelCallback DriveServiceOnWorker::GetAllFileList( google_apis::CancelCallback DriveServiceOnWorker::GetAllFileList(
......
...@@ -115,7 +115,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface { ...@@ -115,7 +115,7 @@ class DriveServiceOnWorker : public drive::DriveServiceInterface {
void RequestAccessToken(google_apis::AuthStatusCallback callback) override; void RequestAccessToken(google_apis::AuthStatusCallback callback) override;
void ClearAccessToken() override; void ClearAccessToken() override;
void ClearRefreshToken() override; void ClearRefreshToken() override;
google_apis::CancelCallback GetAllTeamDriveList( google_apis::CancelCallbackOnce GetAllTeamDriveList(
google_apis::TeamDriveListCallback callback) override; google_apis::TeamDriveListCallback callback) override;
google_apis::CancelCallback GetAllFileList( google_apis::CancelCallback GetAllFileList(
const std::string& team_drive_id, const std::string& team_drive_id,
......
...@@ -281,7 +281,7 @@ std::string DriveAPIService::GetRootResourceId() const { ...@@ -281,7 +281,7 @@ std::string DriveAPIService::GetRootResourceId() const {
return kDriveApiRootDirectoryResourceId; return kDriveApiRootDirectoryResourceId;
} }
CancelCallback DriveAPIService::GetAllTeamDriveList( CancelCallbackOnce DriveAPIService::GetAllTeamDriveList(
TeamDriveListCallback callback) { TeamDriveListCallback callback) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(callback); DCHECK(callback);
......
...@@ -129,7 +129,7 @@ class DriveAPIService : public DriveServiceInterface, ...@@ -129,7 +129,7 @@ class DriveAPIService : public DriveServiceInterface,
void ClearAccessToken() override; void ClearAccessToken() override;
void ClearRefreshToken() override; void ClearRefreshToken() override;
std::string GetRootResourceId() const override; std::string GetRootResourceId() const override;
google_apis::CancelCallback GetAllTeamDriveList( google_apis::CancelCallbackOnce GetAllTeamDriveList(
google_apis::TeamDriveListCallback callback) override; google_apis::TeamDriveListCallback callback) override;
google_apis::CancelCallback GetAllFileList( google_apis::CancelCallback GetAllFileList(
const std::string& team_drive_id, const std::string& team_drive_id,
......
...@@ -204,7 +204,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface { ...@@ -204,7 +204,7 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface {
// GetRemainingDriveList. // GetRemainingDriveList.
// //
// |callback| must not be null. // |callback| must not be null.
virtual google_apis::CancelCallback GetAllTeamDriveList( virtual google_apis::CancelCallbackOnce GetAllTeamDriveList(
google_apis::TeamDriveListCallback callback) = 0; google_apis::TeamDriveListCallback callback) = 0;
// Fetches a file list of the account. |callback| will be called upon // Fetches a file list of the account. |callback| will be called upon
......
...@@ -53,9 +53,9 @@ std::string DummyDriveService::GetRootResourceId() const { ...@@ -53,9 +53,9 @@ std::string DummyDriveService::GetRootResourceId() const {
return "dummy_root"; return "dummy_root";
} }
CancelCallback DummyDriveService::GetAllTeamDriveList( CancelCallbackOnce DummyDriveService::GetAllTeamDriveList(
TeamDriveListCallback callback) { TeamDriveListCallback callback) {
return CancelCallback(); return CancelCallbackOnce();
} }
CancelCallback DummyDriveService::GetAllFileList( CancelCallback DummyDriveService::GetAllFileList(
......
...@@ -33,7 +33,7 @@ class DummyDriveService : public DriveServiceInterface { ...@@ -33,7 +33,7 @@ class DummyDriveService : public DriveServiceInterface {
void ClearAccessToken() override; void ClearAccessToken() override;
void ClearRefreshToken() override; void ClearRefreshToken() override;
std::string GetRootResourceId() const override; std::string GetRootResourceId() const override;
google_apis::CancelCallback GetAllTeamDriveList( google_apis::CancelCallbackOnce GetAllTeamDriveList(
google_apis::TeamDriveListCallback callback) override; google_apis::TeamDriveListCallback callback) override;
google_apis::CancelCallback GetAllFileList( google_apis::CancelCallback GetAllFileList(
const std::string& team_drive_id, const std::string& team_drive_id,
......
...@@ -391,7 +391,7 @@ void FakeDriveService::GetTeamDriveListInternal( ...@@ -391,7 +391,7 @@ void FakeDriveService::GetTeamDriveListInternal(
base::BindOnce(std::move(callback), HTTP_SUCCESS, std::move(result))); base::BindOnce(std::move(callback), HTTP_SUCCESS, std::move(result)));
} }
CancelCallback FakeDriveService::GetAllTeamDriveList( CancelCallbackOnce FakeDriveService::GetAllTeamDriveList(
TeamDriveListCallback callback) { TeamDriveListCallback callback) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(callback); DCHECK(callback);
...@@ -399,7 +399,7 @@ CancelCallback FakeDriveService::GetAllTeamDriveList( ...@@ -399,7 +399,7 @@ CancelCallback FakeDriveService::GetAllTeamDriveList(
GetTeamDriveListInternal(0, default_max_results_, GetTeamDriveListInternal(0, default_max_results_,
&team_drive_list_load_count_, std::move(callback)); &team_drive_list_load_count_, std::move(callback));
return CancelCallback(); return CancelCallbackOnce();
} }
CancelCallback FakeDriveService::GetAllFileList( CancelCallback FakeDriveService::GetAllFileList(
......
...@@ -133,7 +133,7 @@ class FakeDriveService : public DriveServiceInterface { ...@@ -133,7 +133,7 @@ class FakeDriveService : public DriveServiceInterface {
bool HasRefreshToken() const override; bool HasRefreshToken() const override;
void ClearAccessToken() override; void ClearAccessToken() override;
void ClearRefreshToken() override; void ClearRefreshToken() override;
google_apis::CancelCallback GetAllTeamDriveList( google_apis::CancelCallbackOnce GetAllTeamDriveList(
google_apis::TeamDriveListCallback callback) override; google_apis::TeamDriveListCallback callback) override;
google_apis::CancelCallback GetAllFileList( google_apis::CancelCallback GetAllFileList(
const std::string& team_drive_id, const std::string& team_drive_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment