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

content/browser/renderer_host/media/audio_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.
 //
 // AudioRendererHost serves audio related requests from AudioRenderer which
 // lives inside the render process and provide access to audio hardware.
 //
 // This class is owned by BrowserRenderProcessHost, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread, so we
 // need to be extra careful about the lifetime of this object. AudioManager is a
@@ skipping 87 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, MockStreamDataConversation);
 
   struct AudioEntry;
   typedef std::map<int, AudioEntry*> AudioEntryMap;
 
   virtual ~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.
+
+  // 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|.
+  // Upon success/failure, the peer is notified via the NotifyStreamCreated
+  // message.
   void OnCreateStream(int stream_id,
+                      int render_view_id,
                       const media::AudioParameters& params);
 
-  // Track that the data for the audio stream referenced by |stream_id| is
-  // produced by an entity in the render view referenced by |render_view_id|.
-  void OnAssociateStreamWithProducer(int stream_id, int render_view_id);
-
   // Play the audio stream referenced by |stream_id|.
   void OnPlayStream(int stream_id);
 
   // Pause the audio stream referenced by |stream_id|.
   void OnPauseStream(int stream_id);
 
   // Discard all audio data in stream referenced by |stream_id|.
   void OnFlushStream(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 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.
   void DoSendPlayingMessage(media::AudioOutputController* controller);
   void DoSendPausedMessage(media::AudioOutputController* controller);
   void DoSendDeviceChangeMessage(media::AudioOutputController* controller,
                                  int new_buffer_size, int new_sample_rate);
 
   // Handle error coming from audio stream.
   void DoHandleError(media::AudioOutputController* controller, int error_code);
@@ skipping 35 matching lines @@
 
   // A map of stream IDs to audio sources.
   AudioEntryMap audio_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_