Index: content/browser/renderer_host/media/audio_renderer_host.cc |
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc |
index 43555fcdb199dc73592b7e48f748d4cb73d16585..85ac36e4431161cbb53b86d4a9318ab94e6e273a 100644 |
--- a/content/browser/renderer_host/media/audio_renderer_host.cc |
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc |
@@ -146,14 +146,11 @@ AudioRendererHost::~AudioRendererHost() { |
} |
void AudioRendererHost::GetOutputControllers( |
- int render_view_id, |
- const RenderViewHost::GetAudioOutputControllersCallback& callback) const { |
+ const RenderProcessHost::GetAudioOutputControllersCallback& |
+ callback) const { |
BrowserThread::PostTaskAndReplyWithResult( |
- BrowserThread::IO, |
- FROM_HERE, |
- base::Bind(&AudioRendererHost::DoGetOutputControllers, this, |
- render_view_id), |
- callback); |
+ BrowserThread::IO, FROM_HERE, |
+ base::Bind(&AudioRendererHost::DoGetOutputControllers, this), callback); |
} |
void AudioRendererHost::OnChannelClosing() { |
@@ -281,17 +278,15 @@ void AudioRendererHost::DoNotifyStreamStateChanged(int stream_id, |
UpdateNumPlayingStreams(entry, is_playing); |
} |
-RenderViewHost::AudioOutputControllerList |
-AudioRendererHost::DoGetOutputControllers(int render_view_id) const { |
+RenderProcessHost::AudioOutputControllerList |
+AudioRendererHost::DoGetOutputControllers() const { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
- RenderViewHost::AudioOutputControllerList controllers; |
+ RenderProcessHost::AudioOutputControllerList controllers; |
for (AudioEntryMap::const_iterator it = audio_entries_.begin(); |
it != audio_entries_.end(); |
++it) { |
- AudioEntry* entry = it->second; |
- if (entry->render_view_id() == render_view_id) |
- controllers.push_back(entry->controller()); |
+ controllers.push_back(it->second->controller()); |
} |
return controllers; |