Part 1: Plumb render view ID to render host

content/browser/renderer_host/media/audio_renderer_host.cc

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 27b88250a4c5be080d31686ba6489616ddbbd3bd..17b6d0b11337824c034b32dec7961444506b13cb 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -192,7 +192,9 @@ bool AudioRendererHost::OnMessageReceived(const IPC::Message& message,
 }
 
 void AudioRendererHost::OnCreateStream(
-    int stream_id, const media::AudioParameters& params) {
+    int render_view_id,
+    int stream_id,
+    const media::AudioParameters& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(LookupById(stream_id) == NULL);
 
@@ -240,7 +242,7 @@ void AudioRendererHost::OnCreateStream(
     media_observer_->OnSetAudioStreamStatus(this, stream_id, "created");
 }
 
-void AudioRendererHost::OnPlayStream(int stream_id) {
+void AudioRendererHost::OnPlayStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
@@ -254,7 +256,7 @@ void AudioRendererHost::OnPlayStream(int stream_id) {
     media_observer_->OnSetAudioStreamPlaying(this, stream_id, true);
 }
 
-void AudioRendererHost::OnPauseStream(int stream_id) {
+void AudioRendererHost::OnPauseStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
@@ -268,7 +270,7 @@ void AudioRendererHost::OnPauseStream(int stream_id) {
     media_observer_->OnSetAudioStreamPlaying(this, stream_id, false);
 }
 
-void AudioRendererHost::OnFlushStream(int stream_id) {
+void AudioRendererHost::OnFlushStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);
@@ -282,7 +284,7 @@ void AudioRendererHost::OnFlushStream(int stream_id) {
     media_observer_->OnSetAudioStreamStatus(this, stream_id, "flushed");
 }
 
-void AudioRendererHost::OnCloseStream(int stream_id) {
+void AudioRendererHost::OnCloseStream(int render_view_id, int stream_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (media_observer_)
@@ -294,7 +296,9 @@ void AudioRendererHost::OnCloseStream(int stream_id) {
     CloseAndDeleteStream(entry);
 }
 
-void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
+void AudioRendererHost::OnSetVolume(int render_view_id,
+                                    int stream_id,
+                                    double volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   AudioEntry* entry = LookupById(stream_id);