Commit 9fd7d0b6 authored by Jan Wilken Dörrie's avatar Jan Wilken Dörrie Committed by Commit Bot

[base] Apply BindOnceRewriter in //chrome/browser/media

This change applies the BindOnceRewriter in //chrome/browser/media.
This rewriter replaces calls to base::Bind and base::BindRepeating with
calls to base::BindOnce, in case the result is immediately assigned to a
base::OnceCallback. Given that base::RepeatingCallback is implicitly
convertible to base::OnceCallback, there is no change in functionality.

Steps:
  1. run_tool.py --tool base_bind_rewriters \
                 --tool-arg='--rewriter=bind_to_bind_once'
  2. git cl format

This CL was uploaded by git cl split.

R=raymes@chromium.org, tommi@chromium.org

Bug: 714018
Change-Id: Ie7f42f27b2b92a1c0529a1e712ed627a4fe05803
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132255
Auto-Submit: Jan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: default avatarTommi <tommi@chromium.org>
Commit-Queue: Tommi <tommi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755397}
parent b759260c
......@@ -490,9 +490,9 @@ void MediaEngagementContentsObserver::UpdatePlayerTimer(
new_timer->Start(
FROM_HERE,
MediaEngagementContentsObserver::kSignificantMediaPlaybackTime,
base::Bind(&MediaEngagementContentsObserver::
OnSignificantMediaPlaybackTimeForPlayer,
base::Unretained(this), id));
base::BindOnce(&MediaEngagementContentsObserver::
OnSignificantMediaPlaybackTimeForPlayer,
base::Unretained(this), id));
audible_row->second.second = std::move(new_timer);
} else if (audible_row->second.second) {
......@@ -522,9 +522,9 @@ void MediaEngagementContentsObserver::UpdatePageTimer() {
playback_timer_.Start(
FROM_HERE,
MediaEngagementContentsObserver::kSignificantMediaPlaybackTime,
base::Bind(&MediaEngagementContentsObserver::
OnSignificantMediaPlaybackTimeForPage,
base::Unretained(this)));
base::BindOnce(&MediaEngagementContentsObserver::
OnSignificantMediaPlaybackTimeForPage,
base::Unretained(this)));
} else {
if (!playback_timer_.IsRunning())
return;
......@@ -556,9 +556,9 @@ void MediaEngagementContentsObserver::UpdateAudioContextTimer() {
audio_context_timer_.Start(
FROM_HERE,
MediaEngagementContentsObserver::kSignificantMediaPlaybackTime,
base::Bind(&MediaEngagementContentsObserver::
OnSignificantAudioContextPlaybackTimeForPage,
base::Unretained(this)));
base::BindOnce(&MediaEngagementContentsObserver::
OnSignificantAudioContextPlaybackTimeForPage,
base::Unretained(this)));
} else if (audio_context_timer_.IsRunning()) {
audio_context_timer_.Stop();
}
......
......@@ -95,8 +95,8 @@ TEST_F(MidiSysexPermissionContextTests, TestInsecureRequestingUrl) {
web_contents()->GetMainFrame()->GetRoutingID(), -1);
permission_context.RequestPermission(
web_contents(), id, url, true,
base::Bind(&TestPermissionContext::TrackPermissionDecision,
base::Unretained(&permission_context)));
base::BindOnce(&TestPermissionContext::TrackPermissionDecision,
base::Unretained(&permission_context)));
EXPECT_TRUE(permission_context.permission_set());
EXPECT_FALSE(permission_context.permission_granted());
......
......@@ -233,10 +233,10 @@ void DialServiceImpl::DialSocket::SendOneRequest(
}
is_writing_ = true;
int result =
socket_->SendTo(send_buffer.get(), send_buffer->size(), send_address,
base::Bind(&DialServiceImpl::DialSocket::OnSocketWrite,
base::Unretained(this), send_buffer->size()));
int result = socket_->SendTo(
send_buffer.get(), send_buffer->size(), send_address,
base::BindOnce(&DialServiceImpl::DialSocket::OnSocketWrite,
base::Unretained(this), send_buffer->size()));
bool result_ok = CheckResult("SendTo", result);
if (result_ok && result > 0) {
// Synchronous write.
......@@ -301,8 +301,8 @@ bool DialServiceImpl::DialSocket::ReadSocket() {
is_reading_ = true;
result = socket_->RecvFrom(
recv_buffer_.get(), kDialRecvBufferSize, &recv_address_,
base::Bind(&DialServiceImpl::DialSocket::OnSocketRead,
base::Unretained(this)));
base::BindOnce(&DialServiceImpl::DialSocket::OnSocketRead,
base::Unretained(this)));
result_ok = CheckResult("RecvFrom", result);
if (result != net::ERR_IO_PENDING)
is_reading_ = false;
......
......@@ -81,10 +81,11 @@ void DiscoveryNetworkMonitorMetricObserver::OnNetworksChanged(
const std::string& network_id) {
auto now = tick_clock_->NowTicks();
if (network_id == DiscoveryNetworkMonitor::kNetworkIdDisconnected) {
disconnect_timer_.Start(FROM_HERE, kConfirmDisconnectTimeout,
base::Bind(&DiscoveryNetworkMonitorMetricObserver::
ConfirmDisconnectedToReportMetrics,
base::Unretained(this), now));
disconnect_timer_.Start(
FROM_HERE, kConfirmDisconnectTimeout,
base::BindOnce(&DiscoveryNetworkMonitorMetricObserver::
ConfirmDisconnectedToReportMetrics,
base::Unretained(this), now));
return;
} else if (last_event_time_) {
metrics_->RecordTimeBetweenNetworkChangeEvents(now - *last_event_time_);
......
......@@ -554,9 +554,9 @@ const MediaRoute* CastActivityManager::FindMirroringRouteForTab(
void CastActivityManager::SendRouteMessage(const std::string& media_route_id,
const std::string& message) {
GetDataDecoder().ParseJson(
message, base::BindRepeating(&CastActivityManager::SendRouteJsonMessage,
weak_ptr_factory_.GetWeakPtr(),
media_route_id, message));
message,
base::BindOnce(&CastActivityManager::SendRouteJsonMessage,
weak_ptr_factory_.GetWeakPtr(), media_route_id, message));
}
void CastActivityManager::SendRouteJsonMessage(
......
......@@ -104,8 +104,8 @@ void CastSessionClientImpl::OnMessage(
GetDataDecoder().ParseJson(
message->get_message(),
base::BindRepeating(&CastSessionClientImpl::HandleParsedClientMessage,
weak_ptr_factory_.GetWeakPtr()));
base::BindOnce(&CastSessionClientImpl::HandleParsedClientMessage,
weak_ptr_factory_.GetWeakPtr()));
}
void CastSessionClientImpl::DidClose(PresentationConnectionCloseReason reason) {
......
......@@ -180,9 +180,8 @@ void MirroringActivityRecord::Send(mirroring::mojom::CastMessagePtr message) {
GetDataDecoder().ParseJson(
message->json_format_data,
base::BindRepeating(&MirroringActivityRecord::HandleParseJsonResult,
weak_ptr_factory_.GetWeakPtr(),
route().media_route_id()));
base::BindOnce(&MirroringActivityRecord::HandleParseJsonResult,
weak_ptr_factory_.GetWeakPtr(), route().media_route_id()));
}
void MirroringActivityRecord::OnAppMessage(
......
......@@ -201,9 +201,8 @@ void DialMediaRouteProvider::SendRouteMessage(const std::string& media_route_id,
const std::string& message) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
GetDataDecoder().ParseJson(
message,
base::BindRepeating(&DialMediaRouteProvider::HandleParsedRouteMessage,
weak_ptr_factory_.GetWeakPtr(), media_route_id));
message, base::BindOnce(&DialMediaRouteProvider::HandleParsedRouteMessage,
weak_ptr_factory_.GetWeakPtr(), media_route_id));
}
void DialMediaRouteProvider::HandleParsedRouteMessage(
......
......@@ -147,7 +147,7 @@ void ExtensionMediaRouteProviderProxy::StopObservingMediaRoutes(
void ExtensionMediaRouteProviderProxy::StartListeningForRouteMessages(
const std::string& route_id) {
request_manager_->RunOrDefer(
base::Bind(
base::BindOnce(
&ExtensionMediaRouteProviderProxy::DoStartListeningForRouteMessages,
weak_factory_.GetWeakPtr(), route_id),
MediaRouteProviderWakeReason::START_LISTENING_FOR_ROUTE_MESSAGES);
......
......@@ -139,8 +139,8 @@ void DesktopMediaListAsh::CaptureThumbnail(content::DesktopMediaID id,
++pending_window_capture_requests_;
ui::GrabWindowSnapshotAndScaleAsync(
window, window_rect, scaled_rect.size(),
base::Bind(&DesktopMediaListAsh::OnThumbnailCaptured,
weak_factory_.GetWeakPtr(), id));
base::BindOnce(&DesktopMediaListAsh::OnThumbnailCaptured,
weak_factory_.GetWeakPtr(), id));
}
void DesktopMediaListAsh::OnThumbnailCaptured(content::DesktopMediaID id,
......
......@@ -96,14 +96,15 @@ void DesktopMediaPickerController::ShowPickerDialog() {
return;
}
picker_->Show(params_, std::move(source_lists_),
base::Bind(&DesktopMediaPickerController::OnPickerDialogResults,
// A weak pointer is used here, because although
// |picker_| can't outlive this object, it can
// schedule this callback to be invoked
// asynchronously after it has potentially been
// destroyed.
weak_factory_.GetWeakPtr(), std::string()));
picker_->Show(
params_, std::move(source_lists_),
base::BindOnce(&DesktopMediaPickerController::OnPickerDialogResults,
// A weak pointer is used here, because although
// |picker_| can't outlive this object, it can
// schedule this callback to be invoked
// asynchronously after it has potentially been
// destroyed.
weak_factory_.GetWeakPtr(), std::string()));
}
void DesktopMediaPickerController::OnPickerDialogResults(
......
......@@ -170,7 +170,7 @@ void MediaStreamDevicesController::RequestPermissions(
permission_manager->RequestPermissions(
content_settings_types, rfh, request.security_origin,
request.user_gesture,
base::Bind(
base::BindOnce(
&MediaStreamDevicesController::RequestAndroidPermissionsIfNeeded,
web_contents, base::Passed(&controller), will_prompt_for_audio,
will_prompt_for_video));
......
......@@ -376,8 +376,8 @@ void NativeDesktopMediaList::CaptureAuraWindowThumbnail(
pending_aura_capture_requests_++;
ui::GrabWindowSnapshotAndScaleAsyncAura(
window, window_rect, scaled_rect.size(),
base::Bind(&NativeDesktopMediaList::OnAuraThumbnailCaptured,
weak_factory_.GetWeakPtr(), id));
base::BindOnce(&NativeDesktopMediaList::OnAuraThumbnailCaptured,
weak_factory_.GetWeakPtr(), id));
}
void NativeDesktopMediaList::OnAuraThumbnailCaptured(const DesktopMediaID& id,
......
......@@ -168,16 +168,17 @@ void PermissionBubbleMediaAccessHandler::ProcessQueuedAccessRequest(
if (blink::IsScreenCaptureMediaType(request.video_type)) {
ScreenCaptureInfoBarDelegateAndroid::Create(
web_contents, request,
base::Bind(&PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
base::Unretained(this), web_contents, request_id));
base::BindOnce(
&PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
base::Unretained(this), web_contents, request_id));
return;
}
#endif
MediaStreamDevicesController::RequestPermissions(
request,
base::Bind(&PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
base::Unretained(this), web_contents, request_id));
request, base::BindOnce(
&PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
base::Unretained(this), web_contents, request_id));
}
void PermissionBubbleMediaAccessHandler::UpdateMediaRequestState(
......
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