Commit 325e3a47 authored by kylechar's avatar kylechar Committed by Commit Bot

Use base::BindOnce for PostTask callbacks.

TaskRunner::PostTask() takes a OnceCallback. Replace usage of
base::Bind(), which produces a RepeatingCallback, with base::BindOnce()
when the callback is created as a temporary inside of PostTask(). The
following regex was used to find instances that could be replaced:

(Post(?:Delayed)?Task)\((?:\n\s*)?FROM_HERE,(?:\n)?\s*base::Bind\(

Also replace any usage of base::Passed(&var) with std::move(var) for
variables passed to base::BindOnce(). base::Passed() isn't needed for
move-only types with OnceCallbacks.

This CL was uploaded by git cl split.

R=rogerta@chromium.org

Bug: 714018
Change-Id: I6b26b0eb43cb5167e8c115781c956bfe13d6bdfc
Reviewed-on: https://chromium-review.googlesource.com/c/1475637
Auto-Submit: kylechar <kylechar@chromium.org>
Reviewed-by: default avatarRoger Tawa <rogerta@chromium.org>
Commit-Queue: Roger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632809}
parent 20add697
...@@ -137,7 +137,7 @@ void AuthService::StartAuthentication(const AuthStatusCallback& callback) { ...@@ -137,7 +137,7 @@ void AuthService::StartAuthentication(const AuthStatusCallback& callback) {
if (HasAccessToken()) { if (HasAccessToken()) {
// We already have access token. Give it back to the caller asynchronously. // We already have access token. Give it back to the caller asynchronously.
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, HTTP_SUCCESS, access_token_)); FROM_HERE, base::BindOnce(callback, HTTP_SUCCESS, access_token_));
} else if (HasRefreshToken()) { } else if (HasRefreshToken()) {
// We have refresh token, let's get an access token. // We have refresh token, let's get an access token.
new AuthRequest(identity_manager_, account_id_, url_loader_factory_, new AuthRequest(identity_manager_, account_id_, url_loader_factory_,
...@@ -146,7 +146,7 @@ void AuthService::StartAuthentication(const AuthStatusCallback& callback) { ...@@ -146,7 +146,7 @@ void AuthService::StartAuthentication(const AuthStatusCallback& callback) {
scopes_); scopes_);
} else { } else {
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, DRIVE_NOT_READY, std::string())); FROM_HERE, base::BindOnce(callback, DRIVE_NOT_READY, std::string()));
} }
} }
......
...@@ -303,8 +303,9 @@ void UrlFetchRequestBase::StartAfterPrepare( ...@@ -303,8 +303,9 @@ void UrlFetchRequestBase::StartAfterPrepare(
// asynchronously because client code does not assume result callback is // asynchronously because client code does not assume result callback is
// called synchronously. // called synchronously.
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&UrlFetchRequestBase::CompleteRequestWithError, FROM_HERE,
weak_ptr_factory_.GetWeakPtr(), error_code)); base::BindOnce(&UrlFetchRequestBase::CompleteRequestWithError,
weak_ptr_factory_.GetWeakPtr(), error_code));
return; return;
} }
......
...@@ -446,9 +446,9 @@ OAuth2TokenService::StartRequestForMultilogin( ...@@ -446,9 +446,9 @@ OAuth2TokenService::StartRequestForMultilogin(
// If we can get refresh token from the delegate, inform cosumer right away. // If we can get refresh token from the delegate, inform cosumer right away.
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&RequestImpl::InformConsumer, request.get()->AsWeakPtr(), base::BindOnce(&RequestImpl::InformConsumer, request.get()->AsWeakPtr(),
GoogleServiceAuthError(GoogleServiceAuthError::NONE), GoogleServiceAuthError(GoogleServiceAuthError::NONE),
token_response)); token_response));
return std::move(request); return std::move(request);
} }
...@@ -515,8 +515,8 @@ OAuth2TokenService::StartRequestForClientWithContext( ...@@ -515,8 +515,8 @@ OAuth2TokenService::StartRequestForClientWithContext(
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&RequestImpl::InformConsumer, request->AsWeakPtr(), error, base::BindOnce(&RequestImpl::InformConsumer, request->AsWeakPtr(),
OAuth2AccessTokenConsumer::TokenResponse())); error, OAuth2AccessTokenConsumer::TokenResponse()));
return std::move(request); return std::move(request);
} }
...@@ -580,9 +580,9 @@ void OAuth2TokenService::InformConsumerWithCachedTokenResponse( ...@@ -580,9 +580,9 @@ void OAuth2TokenService::InformConsumerWithCachedTokenResponse(
} }
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&RequestImpl::InformConsumer, request->AsWeakPtr(), base::BindOnce(&RequestImpl::InformConsumer, request->AsWeakPtr(),
GoogleServiceAuthError(GoogleServiceAuthError::NONE), GoogleServiceAuthError(GoogleServiceAuthError::NONE),
*cache_token_response)); *cache_token_response));
} }
std::vector<std::string> OAuth2TokenService::GetAccounts() const { std::vector<std::string> OAuth2TokenService::GetAccounts() const {
......
...@@ -111,8 +111,8 @@ void OAuth2TokenServiceRequest::Core::Start() { ...@@ -111,8 +111,8 @@ void OAuth2TokenServiceRequest::Core::Start() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
token_service_task_runner_->PostTask( token_service_task_runner_->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&OAuth2TokenServiceRequest::Core::StartOnTokenServiceThread, base::BindOnce(
this)); &OAuth2TokenServiceRequest::Core::StartOnTokenServiceThread, this));
} }
void OAuth2TokenServiceRequest::Core::Stop() { void OAuth2TokenServiceRequest::Core::Stop() {
...@@ -127,8 +127,8 @@ void OAuth2TokenServiceRequest::Core::Stop() { ...@@ -127,8 +127,8 @@ void OAuth2TokenServiceRequest::Core::Stop() {
// will be destroyed on the owner thread. // will be destroyed on the owner thread.
token_service_task_runner_->PostTask( token_service_task_runner_->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&OAuth2TokenServiceRequest::Core::StopOnTokenServiceThread, base::BindOnce(&OAuth2TokenServiceRequest::Core::StopOnTokenServiceThread,
this)); this));
} }
bool OAuth2TokenServiceRequest::Core::IsStopped() const { bool OAuth2TokenServiceRequest::Core::IsStopped() const {
...@@ -227,8 +227,8 @@ void RequestCore::OnGetTokenSuccess( ...@@ -227,8 +227,8 @@ void RequestCore::OnGetTokenSuccess(
DCHECK(token_service_task_runner()->RunsTasksInCurrentSequence()); DCHECK(token_service_task_runner()->RunsTasksInCurrentSequence());
DCHECK_EQ(request_.get(), request); DCHECK_EQ(request_.get(), request);
owning_task_runner()->PostTask( owning_task_runner()->PostTask(
FROM_HERE, base::Bind(&RequestCore::InformOwnerOnGetTokenSuccess, this, FROM_HERE, base::BindOnce(&RequestCore::InformOwnerOnGetTokenSuccess,
token_response)); this, token_response));
request_.reset(); request_.reset();
} }
...@@ -238,7 +238,7 @@ void RequestCore::OnGetTokenFailure(const OAuth2TokenService::Request* request, ...@@ -238,7 +238,7 @@ void RequestCore::OnGetTokenFailure(const OAuth2TokenService::Request* request,
DCHECK_EQ(request_.get(), request); DCHECK_EQ(request_.get(), request);
owning_task_runner()->PostTask( owning_task_runner()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&RequestCore::InformOwnerOnGetTokenFailure, this, error)); base::BindOnce(&RequestCore::InformOwnerOnGetTokenFailure, this, error));
request_.reset(); request_.reset();
} }
......
...@@ -207,7 +207,7 @@ void CheckinRequest::RetryWithBackoff() { ...@@ -207,7 +207,7 @@ void CheckinRequest::RetryWithBackoff() {
DCHECK(!weak_ptr_factory_.HasWeakPtrs()); DCHECK(!weak_ptr_factory_.HasWeakPtrs());
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&CheckinRequest::Start, weak_ptr_factory_.GetWeakPtr()), base::BindOnce(&CheckinRequest::Start, weak_ptr_factory_.GetWeakPtr()),
backoff_entry_.GetTimeUntilRelease()); backoff_entry_.GetTimeUntilRelease());
} }
......
...@@ -144,8 +144,8 @@ void ConnectionFactoryImpl::ConnectWithBackoff() { ...@@ -144,8 +144,8 @@ void ConnectionFactoryImpl::ConnectWithBackoff() {
backoff_entry_->GetTimeUntilRelease().InMilliseconds()); backoff_entry_->GetTimeUntilRelease().InMilliseconds());
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&ConnectionFactoryImpl::ConnectWithBackoff, base::BindOnce(&ConnectionFactoryImpl::ConnectWithBackoff,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
backoff_entry_->GetTimeUntilRelease()); backoff_entry_->GetTimeUntilRelease());
return; return;
} }
......
...@@ -133,9 +133,8 @@ void ConnectionHandlerImpl::Login( ...@@ -133,9 +133,8 @@ void ConnectionHandlerImpl::Login(
base::Bind(&ConnectionHandlerImpl::OnMessageSent, base::Bind(&ConnectionHandlerImpl::OnMessageSent,
weak_ptr_factory_.GetWeakPtr())) != net::ERR_IO_PENDING) { weak_ptr_factory_.GetWeakPtr())) != net::ERR_IO_PENDING) {
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&ConnectionHandlerImpl::OnMessageSent,
base::Bind(&ConnectionHandlerImpl::OnMessageSent, weak_ptr_factory_.GetWeakPtr()));
weak_ptr_factory_.GetWeakPtr()));
} }
read_timeout_timer_.Start(FROM_HERE, read_timeout_timer_.Start(FROM_HERE,
...@@ -262,9 +261,8 @@ void ConnectionHandlerImpl::WaitForData(ProcessingState state) { ...@@ -262,9 +261,8 @@ void ConnectionHandlerImpl::WaitForData(ProcessingState state) {
<< " more bytes."; << " more bytes.";
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&ConnectionHandlerImpl::WaitForData, base::BindOnce(&ConnectionHandlerImpl::WaitForData,
weak_ptr_factory_.GetWeakPtr(), weak_ptr_factory_.GetWeakPtr(), MCS_PROTO_BYTES));
MCS_PROTO_BYTES));
return; return;
} }
...@@ -383,9 +381,8 @@ void ConnectionHandlerImpl::OnGotMessageBytes() { ...@@ -383,9 +381,8 @@ void ConnectionHandlerImpl::OnGotMessageBytes() {
// that tag. // that tag.
if (protobuf.get() && message_size_ == 0) { if (protobuf.get() && message_size_ == 0) {
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&ConnectionHandlerImpl::GetNextMessage,
base::Bind(&ConnectionHandlerImpl::GetNextMessage, weak_ptr_factory_.GetWeakPtr()));
weak_ptr_factory_.GetWeakPtr()));
read_callback_.Run(std::move(protobuf)); read_callback_.Run(std::move(protobuf));
return; return;
} }
...@@ -456,9 +453,8 @@ void ConnectionHandlerImpl::OnGotMessageBytes() { ...@@ -456,9 +453,8 @@ void ConnectionHandlerImpl::OnGotMessageBytes() {
input_stream_->RebuildBuffer(); input_stream_->RebuildBuffer();
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&ConnectionHandlerImpl::GetNextMessage,
base::Bind(&ConnectionHandlerImpl::GetNextMessage, weak_ptr_factory_.GetWeakPtr()));
weak_ptr_factory_.GetWeakPtr()));
if (message_tag_ == kLoginResponseTag) { if (message_tag_ == kLoginResponseTag) {
if (handshake_complete_) { if (handshake_complete_) {
LOG(ERROR) << "Unexpected login response."; LOG(ERROR) << "Unexpected login response.";
......
This diff is collapsed.
...@@ -194,8 +194,8 @@ void HeartbeatManager::RestartTimer() { ...@@ -194,8 +194,8 @@ void HeartbeatManager::RestartTimer() {
// Linux so we need to poll to check for missed heartbeats. // Linux so we need to poll to check for missed heartbeats.
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&HeartbeatManager::CheckForMissedHeartbeat, base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
} }
...@@ -217,8 +217,8 @@ void HeartbeatManager::CheckForMissedHeartbeat() { ...@@ -217,8 +217,8 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
// Otherwise check again later. // Otherwise check again later.
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&HeartbeatManager::CheckForMissedHeartbeat, base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
} }
......
...@@ -550,9 +550,8 @@ void MCSClient::MaybeSendMessage() { ...@@ -550,9 +550,8 @@ void MCSClient::MaybeSendMessage() {
base::Bind(&MCSClient::OnGCMUpdateFinished, base::Bind(&MCSClient::OnGCMUpdateFinished,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&MCSClient::MaybeSendMessage,
base::Bind(&MCSClient::MaybeSendMessage, weak_ptr_factory_.GetWeakPtr()));
weak_ptr_factory_.GetWeakPtr()));
return; return;
} }
DVLOG(1) << "Pending output message found, sending."; DVLOG(1) << "Pending output message found, sending.";
...@@ -724,15 +723,14 @@ void MCSClient::HandlePacketFromWire( ...@@ -724,15 +723,14 @@ void MCSClient::HandlePacketFromWire(
// Pass the login response on up. // Pass the login response on up.
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(message_received_callback_, FROM_HERE, base::BindOnce(message_received_callback_,
MCSMessage(tag, std::move(protobuf)))); MCSMessage(tag, std::move(protobuf))));
// If there are pending messages, attempt to send one. // If there are pending messages, attempt to send one.
if (!to_send_.empty()) { if (!to_send_.empty()) {
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&MCSClient::MaybeSendMessage,
base::Bind(&MCSClient::MaybeSendMessage, weak_ptr_factory_.GetWeakPtr()));
weak_ptr_factory_.GetWeakPtr()));
} }
heartbeat_manager_.Start( heartbeat_manager_.Start(
...@@ -794,8 +792,8 @@ void MCSClient::HandlePacketFromWire( ...@@ -794,8 +792,8 @@ void MCSClient::HandlePacketFromWire(
DCHECK(protobuf.get()); DCHECK(protobuf.get());
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(message_received_callback_, FROM_HERE, base::BindOnce(message_received_callback_,
MCSMessage(tag, std::move(protobuf)))); MCSMessage(tag, std::move(protobuf))));
return; return;
} }
default: default:
...@@ -901,9 +899,8 @@ void MCSClient::HandleSelectiveAck(const PersistentIdList& id_list) { ...@@ -901,9 +899,8 @@ void MCSClient::HandleSelectiveAck(const PersistentIdList& id_list) {
to_resend_.pop_back(); to_resend_.pop_back();
} }
base::ThreadTaskRunnerHandle::Get()->PostTask( base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, FROM_HERE, base::BindOnce(&MCSClient::MaybeSendMessage,
base::Bind(&MCSClient::MaybeSendMessage, weak_ptr_factory_.GetWeakPtr()));
weak_ptr_factory_.GetWeakPtr()));
} }
void MCSClient::HandleServerConfirmedReceipt(StreamId device_stream_id) { void MCSClient::HandleServerConfirmedReceipt(StreamId device_stream_id) {
......
...@@ -232,7 +232,8 @@ void RegistrationRequest::RetryWithBackoff() { ...@@ -232,7 +232,8 @@ void RegistrationRequest::RetryWithBackoff() {
DCHECK(!weak_ptr_factory_.HasWeakPtrs()); DCHECK(!weak_ptr_factory_.HasWeakPtrs());
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&RegistrationRequest::Start, weak_ptr_factory_.GetWeakPtr()), base::BindOnce(&RegistrationRequest::Start,
weak_ptr_factory_.GetWeakPtr()),
backoff_entry_.GetTimeUntilRelease()); backoff_entry_.GetTimeUntilRelease());
} }
......
...@@ -259,7 +259,8 @@ void UnregistrationRequest::RetryWithBackoff() { ...@@ -259,7 +259,8 @@ void UnregistrationRequest::RetryWithBackoff() {
DCHECK(!weak_ptr_factory_.HasWeakPtrs()); DCHECK(!weak_ptr_factory_.HasWeakPtrs());
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::Bind(&UnregistrationRequest::Start, weak_ptr_factory_.GetWeakPtr()), base::BindOnce(&UnregistrationRequest::Start,
weak_ptr_factory_.GetWeakPtr()),
backoff_entry_.GetTimeUntilRelease()); backoff_entry_.GetTimeUntilRelease());
} }
......
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