Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(601)

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2729783003: [Mojo Video Capture] Add content_browsertest for exercising video capture (Closed)
Patch Set: incorporated miu@'s suggestions Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 12d5f829508bf1dcaa2e99ea465072b5f25af035..30284f0f760aa59a5c0c2760244da91d1f456fe8 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -1517,7 +1517,7 @@ void MediaStreamManager::HandleAccessRequestResponse(
}
}
device_info.session_id =
- GetDeviceManager(device_info.device.type)->Open(device_info);
+ GetDeviceManager(device_info.device.type)->Open(device_info.device);
TranslateDeviceIdToSourceId(request, &device_info.device);
request->devices.push_back(device_info);
@@ -1566,9 +1566,9 @@ void MediaStreamManager::WillDestroyCurrentMessageLoop() {
if (media_devices_manager_)
media_devices_manager_->StopMonitoring();
if (video_capture_manager_)
- video_capture_manager_->UnregisterListener();
+ video_capture_manager_->UnregisterListener(this);
if (audio_input_device_manager_)
- audio_input_device_manager_->UnregisterListener();
+ audio_input_device_manager_->UnregisterListener(this);
device_task_runner_ = nullptr;
audio_input_device_manager_ = nullptr;

Powered by Google App Engine
This is Rietveld 408576698