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

content/browser/renderer_host/media/audio_input_renderer_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // AudioInputRendererHost serves audio related requests from audio capturer
 // which lives inside the render process and provide access to audio hardware.
 //
 // Create stream sequence (AudioInputController = AIC):
 //
 // AudioInputHostMsg_CreateStream -> OnCreateStream -> AIC::CreateLowLatency ->
@@ skipping 96 matching lines @@
   friend class base::DeleteHelper<AudioInputRendererHost>;
 
   struct AudioEntry;
   typedef std::map<int, AudioEntry*> AudioEntryMap;
   typedef std::map<int, int> SessionEntryMap;
 
   virtual ~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|. If
+  // this call is successful this object would keep an internal entry of the

[palmer, 2013/03/05 21:09:32]

Would keep, or does keep?

How does the caller know if the call was successful?

[miu, 2013/03/06 22:36:52]

Clarified the comment.

+  // stream for the required properties.
   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);
 
   // Close the audio stream referenced by |stream_id|.
   void OnCloseStream(int stream_id);
 
   // Set the volume of the audio stream referenced by |stream_id|.
   void OnSetVolume(int stream_id, double volume);
 
   // Complete the process of creating an audio input stream. This will set up
@@ skipping 49 matching lines @@
 
   // A map of session IDs to audio session sources.
   SessionEntryMap session_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputRendererHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_RENDERER_HOST_H_