Index: content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc |
diff --git a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc |
index 5ebd4a691a703c37da0474876f43befd3c0ec4b3..d45ff4fc1c2d6e17ca810ebc42de678b2dd4b323 100644 |
--- a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc |
+++ b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc |
@@ -55,7 +55,7 @@ void RenderFrameAudioOutputStreamFactory::RequestDeviceAuthorization( |
media::mojom::AudioOutputStreamProviderRequest stream_provider_request, |
int64_t session_id, |
const std::string& device_id, |
- const RequestDeviceAuthorizationCallback& callback) { |
+ RequestDeviceAuthorizationCallback callback) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
const base::TimeTicks auth_start_time = base::TimeTicks::Now(); |
@@ -63,7 +63,7 @@ void RenderFrameAudioOutputStreamFactory::RequestDeviceAuthorization( |
mojo::ReportBadMessage("session_id is not in integer range"); |
// Note: We must call the callback even though we are killing the renderer. |
// This is mandated by mojo. |
- callback.Run( |
+ std::move(callback).Run( |
media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED, |
media::AudioParameters::UnavailableDeviceParams(), std::string()); |
return; |
@@ -76,7 +76,8 @@ void RenderFrameAudioOutputStreamFactory::RequestDeviceAuthorization( |
RequestDeviceAuthorizationForOrigin, |
weak_ptr_factory_.GetWeakPtr(), auth_start_time, |
base::Passed(&stream_provider_request), |
- static_cast<int>(session_id), device_id, callback)); |
+ static_cast<int>(session_id), device_id, |
+ base::Passed(&callback))); |
} |
void RenderFrameAudioOutputStreamFactory::RequestDeviceAuthorizationForOrigin( |
@@ -84,20 +85,21 @@ void RenderFrameAudioOutputStreamFactory::RequestDeviceAuthorizationForOrigin( |
media::mojom::AudioOutputStreamProviderRequest stream_provider_request, |
int session_id, |
const std::string& device_id, |
- const RequestDeviceAuthorizationCallback& callback, |
+ RequestDeviceAuthorizationCallback callback, |
const url::Origin& origin) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
context_->RequestDeviceAuthorization( |
render_frame_id_, session_id, device_id, origin, |
base::Bind(&RenderFrameAudioOutputStreamFactory::AuthorizationCompleted, |
weak_ptr_factory_.GetWeakPtr(), auth_start_time, |
- base::Passed(&stream_provider_request), callback, origin)); |
+ base::Passed(&stream_provider_request), |
+ base::Passed(&callback), origin)); |
} |
void RenderFrameAudioOutputStreamFactory::AuthorizationCompleted( |
base::TimeTicks auth_start_time, |
media::mojom::AudioOutputStreamProviderRequest request, |
- const RequestDeviceAuthorizationCallback& callback, |
+ RequestDeviceAuthorizationCallback callback, |
const url::Origin& origin, |
media::OutputDeviceStatus status, |
bool should_send_id, |
@@ -107,9 +109,9 @@ void RenderFrameAudioOutputStreamFactory::AuthorizationCompleted( |
UMALogDeviceAuthorizationTime(auth_start_time); |
if (status != media::OUTPUT_DEVICE_STATUS_OK) { |
- callback.Run(media::OutputDeviceStatus(status), |
- media::AudioParameters::UnavailableDeviceParams(), |
- std::string()); |
+ std::move(callback).Run(media::OutputDeviceStatus(status), |
+ media::AudioParameters::UnavailableDeviceParams(), |
+ std::string()); |
return; |
} |
@@ -124,10 +126,10 @@ void RenderFrameAudioOutputStreamFactory::AuthorizationCompleted( |
base::Bind(&RenderFrameAudioOutputStreamFactory::RemoveStream, |
base::Unretained(this)))); |
- callback.Run(media::OutputDeviceStatus(status), params, |
- should_send_id |
- ? context_->GetHMACForDeviceId(origin, raw_device_id) |
- : std::string()); |
+ std::move(callback).Run( |
+ media::OutputDeviceStatus(status), params, |
+ should_send_id ? context_->GetHMACForDeviceId(origin, raw_device_id) |
+ : std::string()); |
} |
void RenderFrameAudioOutputStreamFactory::RemoveStream( |