Index: content/browser/renderer_host/media/audio_input_renderer_host.cc |
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
index 8362330b8797520bd23066b3a487326424fa6586..4af7b61e349cddd8d0daa75dc834d315219bdd64 100644 |
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc |
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
@@ -24,10 +24,10 @@ AudioInputRendererHost::AudioEntry::AudioEntry() |
AudioInputRendererHost::AudioEntry::~AudioEntry() {} |
AudioInputRendererHost::AudioInputRendererHost( |
- content::ResourceContext* resource_context, |
- media::AudioManager* audio_manager) |
- : resource_context_(resource_context), |
- audio_manager_(audio_manager) { |
+ media::AudioManager* audio_manager, |
+ media_stream::MediaStreamManager* media_stream_manager) |
+ : audio_manager_(audio_manager), |
+ media_stream_manager_(media_stream_manager) { |
} |
AudioInputRendererHost::~AudioInputRendererHost() { |
@@ -182,17 +182,12 @@ void AudioInputRendererHost::OnStartDevice(int stream_id, int session_id) { |
VLOG(1) << "AudioInputRendererHost::OnStartDevice(stream_id=" |
<< stream_id << ", session_id = " << session_id << ")"; |
- // Get access to the AudioInputDeviceManager to start the device. |
- media_stream::AudioInputDeviceManager* audio_input_man = |
- media_stream::MediaStreamManager::GetForResourceContext( |
- resource_context_, audio_manager_)->audio_input_device_manager(); |
- |
// Add the session entry to the map. |
session_entries_[session_id] = stream_id; |
// Start the device with the session_id. If the device is started |
// successfully, OnDeviceStarted() callback will be triggered. |
- audio_input_man->Start(session_id, this); |
+ media_stream_manager_->audio_input_device_manager()->Start(session_id, this); |
} |
void AudioInputRendererHost::OnCreateStream( |
@@ -349,10 +344,7 @@ void AudioInputRendererHost::OnDeviceStopped(int session_id) { |
void AudioInputRendererHost::StopAndDeleteDevice(int session_id) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
- media_stream::AudioInputDeviceManager* audio_input_man = |
- media_stream::MediaStreamManager::GetForResourceContext( |
- resource_context_, audio_manager_)->audio_input_device_manager(); |
- audio_input_man->Stop(session_id); |
+ media_stream_manager_->audio_input_device_manager()->Stop(session_id); |
// Delete the session entry. |
session_entries_.erase(session_id); |