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

content/browser/renderer_host/media/audio_input_renderer_host.h

Index: content/browser/renderer_host/media/audio_input_renderer_host.h
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index d0d4438d23834e159427fab76680e79c7619177f..ff53e51cec3b483df1d26e70b757f816300961fa 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -114,23 +114,22 @@ class CONTENT_EXPORT AudioInputRendererHost
 
   // Methods called on IO thread ----------------------------------------------
 
+  // Audio related IPC message handlers.
+
   // Start the audio input device with the session id. If the device
   // starts successfully, it will trigger OnDeviceStarted() callback.
   void OnStartDevice(int stream_id, int session_id);
 
-  // Audio related IPC message handlers.
-  // Creates an audio input stream with the specified format. If this call is
-  // successful this object would keep an internal entry of the stream for the
-  // required properties.
+  // Creates an audio input stream with the specified format whose data is
+  // consumed by an entity in the render view referenced by |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,
                       const std::string& device_id,
                       bool automatic_gain_control);
 
-  // Track that the data for the audio stream referenced by |stream_id| is
-  // consumed by an entity in the render view referenced by |render_view_id|.
-  void OnAssociateStreamWithConsumer(int stream_id, int render_view_id);
-
   // Record the audio input stream referenced by |stream_id|.
   void OnRecordStream(int stream_id);
 
@@ -141,7 +140,8 @@ class CONTENT_EXPORT AudioInputRendererHost
   void OnSetVolume(int stream_id, double volume);
 
   // Complete the process of creating an audio input stream. This will set up
-  // the shared memory or shared socket in low latency mode.
+  // the shared memory or shared socket in low latency mode and send the
+  // NotifyStreamCreated message to the peer.
   void DoCompleteCreation(media::AudioInputController* controller);
 
   // Send a state change message to the renderer.