Part 1: Plumb render view ID to render host

content/browser/renderer_host/media/audio_renderer_host.h

Index: content/browser/renderer_host/media/audio_renderer_host.h
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index f9a650feb792790f51c4ad855481f408a5a9cd9f..ae200033629ad41078d8323173c0eae96c7aa942 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -122,22 +122,24 @@ class CONTENT_EXPORT AudioRendererHost
   // Creates an audio output stream with the specified format. If this call is
   // successful this object would keep an internal entry of the stream for the
   // required properties.
-  void OnCreateStream(int stream_id, const media::AudioParameters& params);
+  void OnCreateStream(int render_view_id,
+                      int stream_id,
+                      const media::AudioParameters& params);
 
   // Play the audio stream referenced by |stream_id|.
-  void OnPlayStream(int stream_id);
+  void OnPlayStream(int render_view_id, int stream_id);

[tommi (sloooow) - chröme, 2012/07/31 10:52:41]

just including the render view id in OnCreateStream should be enough and just
store it with the AudioEntry.

[sail, 2012/07/31 22:02:08]

Done.

 
   // Pause the audio stream referenced by |stream_id|.
-  void OnPauseStream(int stream_id);
+  void OnPauseStream(int render_view_id, int stream_id);
 
   // Discard all audio data in stream referenced by |stream_id|.
-  void OnFlushStream(int stream_id);
+  void OnFlushStream(int render_view_id, int stream_id);
 
   // Close the audio stream referenced by |stream_id|.
-  void OnCloseStream(int stream_id);
+  void OnCloseStream(int render_view_id, int stream_id);
 
   // Set the volume of the audio stream referenced by |stream_id|.
-  void OnSetVolume(int stream_id, double volume);
+  void OnSetVolume(int render_view_id, int stream_id, double volume);
 
   // Complete the process of creating an audio stream. This will set up the
   // shared memory or shared socket in low latency mode.