Index: content/browser/renderer_host/media/media_stream_manager.cc |
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc |
index 5818cef620e58357d7f789e52d61c7e64d4cb19e..8c3388dad76c240a7a00193311258df672204ae1 100644 |
--- a/content/browser/renderer_host/media/media_stream_manager.cc |
+++ b/content/browser/renderer_host/media/media_stream_manager.cc |
@@ -380,8 +380,9 @@ class MediaStreamManager::DeviceRequest { |
// static |
void MediaStreamManager::SendMessageToNativeLog(const std::string& message) { |
if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
- BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::SendMessageToNativeLog, message)); |
+ BrowserThread::PostTask( |
+ BrowserThread::IO, FROM_HERE, |
+ base::BindOnce(&MediaStreamManager::SendMessageToNativeLog, message)); |
return; |
} |
@@ -503,10 +504,9 @@ std::string MediaStreamManager::MakeMediaAccessRequest( |
// and thus can not handle a response. Using base::Unretained is safe since |
// MediaStreamManager is deleted on the UI thread, after the IO thread has |
// been stopped. |
- BrowserThread::PostTask( |
- BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::SetupRequest, |
- base::Unretained(this), label)); |
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
+ base::BindOnce(&MediaStreamManager::SetupRequest, |
+ base::Unretained(this), label)); |
return label; |
} |
@@ -544,10 +544,9 @@ void MediaStreamManager::GenerateStream(MediaStreamRequester* requester, |
// and thus can not handle a response. Using base::Unretained is safe since |
// MediaStreamManager is deleted on the UI thread, after the IO thread has |
// been stopped. |
- BrowserThread::PostTask( |
- BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::SetupRequest, |
- base::Unretained(this), label)); |
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
+ base::BindOnce(&MediaStreamManager::SetupRequest, |
+ base::Unretained(this), label)); |
} |
void MediaStreamManager::CancelRequest(int render_process_id, |
@@ -740,10 +739,9 @@ void MediaStreamManager::OpenDevice(MediaStreamRequester* requester, |
// and thus can not handle a response. Using base::Unretained is safe since |
// MediaStreamManager is deleted on the UI thread, after the IO thread has |
// been stopped. |
- BrowserThread::PostTask( |
- BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::SetupRequest, |
- base::Unretained(this), label)); |
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
+ base::BindOnce(&MediaStreamManager::SetupRequest, |
+ base::Unretained(this), label)); |
} |
bool MediaStreamManager::TranslateSourceIdToDeviceId( |
@@ -927,8 +925,8 @@ void MediaStreamManager::ReadOutputParamsAndPostRequestToUI( |
// UI thread, after the IO thread has been stopped. |
audio_system_->GetOutputStreamParameters( |
media::AudioDeviceDescription::kDefaultDeviceId, |
- base::Bind(&MediaStreamManager::PostRequestToUI, base::Unretained(this), |
- label, request, enumeration)); |
+ base::BindOnce(&MediaStreamManager::PostRequestToUI, |
+ base::Unretained(this), label, request, enumeration)); |
} else { |
PostRequestToUI(label, request, enumeration, media::AudioParameters()); |
} |
@@ -975,8 +973,8 @@ void MediaStreamManager::PostRequestToUI( |
request->ui_proxy->RequestAccess( |
request->DetachUIRequest(), |
- base::Bind(&MediaStreamManager::HandleAccessRequestResponse, |
- base::Unretained(this), label, output_parameters)); |
+ base::BindOnce(&MediaStreamManager::HandleAccessRequestResponse, |
+ base::Unretained(this), label, output_parameters)); |
} |
void MediaStreamManager::SetupRequest(const std::string& label) { |
@@ -1236,9 +1234,9 @@ void MediaStreamManager::InitializeMaybeAsync( |
if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::InitializeMaybeAsync, |
- base::Unretained(this), |
- base::Passed(&video_capture_provider))); |
+ base::BindOnce(&MediaStreamManager::InitializeMaybeAsync, |
+ base::Unretained(this), |
+ std::move(video_capture_provider))); |
return; |
} |
@@ -1418,15 +1416,17 @@ void MediaStreamManager::UseFakeUIForTests( |
void MediaStreamManager::RegisterNativeLogCallback( |
int renderer_host_id, |
const base::Callback<void(const std::string&)>& callback) { |
- BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::DoNativeLogCallbackRegistration, |
- base::Unretained(this), renderer_host_id, callback)); |
+ BrowserThread::PostTask( |
+ BrowserThread::IO, FROM_HERE, |
+ base::BindOnce(&MediaStreamManager::DoNativeLogCallbackRegistration, |
+ base::Unretained(this), renderer_host_id, callback)); |
} |
void MediaStreamManager::UnregisterNativeLogCallback(int renderer_host_id) { |
- BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
- base::Bind(&MediaStreamManager::DoNativeLogCallbackUnregistration, |
- base::Unretained(this), renderer_host_id)); |
+ BrowserThread::PostTask( |
+ BrowserThread::IO, FROM_HERE, |
+ base::BindOnce(&MediaStreamManager::DoNativeLogCallbackUnregistration, |
+ base::Unretained(this), renderer_host_id)); |
} |
void MediaStreamManager::AddLogMessageOnIOThread(const std::string& message) { |
@@ -1771,11 +1771,11 @@ void MediaStreamManager::OnStreamStarted(const std::string& label) { |
if (request->ui_proxy) { |
request->ui_proxy->OnStarted( |
- base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser, |
- base::Unretained(this), label), |
- base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId, |
- base::Unretained(this), request->video_type(), |
- request->devices)); |
+ base::BindOnce(&MediaStreamManager::StopMediaStreamFromBrowser, |
+ base::Unretained(this), label), |
+ base::BindOnce(&MediaStreamManager::OnMediaStreamUIWindowId, |
+ base::Unretained(this), request->video_type(), |
+ request->devices)); |
} |
} |