Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

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 f4733b29f9500433e5aa3a09711c7442465aec30..4b7f778d03acfb145ba06c17488927497494dcd2 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -105,15 +105,14 @@ class CONTENT_EXPORT AudioRendererHost
   // Methods called on IO thread ----------------------------------------------
 
   // Audio related IPC message handlers.
-  // 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);
 
-  // Track that the data for the audio stream referenced by |stream_id| is
+  // Creates an audio output stream with the specified format whose data is
   // produced by an entity in the render view referenced by |render_view_id|.
-  void OnAssociateStreamWithProducer(int stream_id, int render_view_id);
+  // Upon success/failure, the peer is notified via the NotifyStreamCreated
+  // message.
+  void OnCreateStream(int stream_id,
+                      int render_view_id,
+                      const media::AudioParameters& params);
 
   // Play the audio stream referenced by |stream_id|.
   void OnPlayStream(int stream_id);
@@ -131,7 +130,8 @@ class CONTENT_EXPORT AudioRendererHost
   void OnSetVolume(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.
+  // shared memory or shared socket in low latency mode and send the
+  // NotifyStreamCreated message to the peer.
   void DoCompleteCreation(media::AudioOutputController* controller);
 
   // Send a state change message to the renderer.