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

content/renderer/media/media_stream_dependency_factory.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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 53 matching lines @@
       WebKit::WebRTCPeerConnectionHandlerClient* client);
 
   // CreateNativeMediaSources creates libjingle representations of
   // the underlying sources to the tracks in |description|.
   // |sources_created| is invoked when the sources have either been created and
   // transitioned to a live state or failed.
   // The libjingle sources is stored in the extra data field of
   // WebMediaStreamSource.
   // |audio_constraints| and |video_constraints| set parameters for the sources.
   void CreateNativeMediaSources(
+      int render_view_id,
       const WebKit::WebMediaConstraints& audio_constraints,
       const WebKit::WebMediaConstraints& video_constraints,
       WebKit::WebMediaStream* description,
       const MediaSourcesCreatedCallback& sources_created);
 
   // Creates a libjingle representation of a MediaStream and stores
   // it in the extra data field of |description|.
   void CreateNativeLocalMediaStream(
       WebKit::WebMediaStream* description);
 
@@ skipping 43 matching lines @@
   // Asks the PeerConnection factory to create a Local Video Source.
   virtual scoped_refptr<webrtc::VideoSourceInterface>
       CreateLocalVideoSource(
           int video_session_id,
           bool is_screen_cast,
           const webrtc::MediaConstraintsInterface* constraints);
 
   // Initializes the source using audio parameters for the selected
   // capture device and specifies which capture device to use as capture
   // source.
-  virtual bool InitializeAudioSource(const StreamDeviceInfo& device_info);
+  virtual bool InitializeAudioSource(int render_view_id,
+                                     const StreamDeviceInfo& device_info);
 
   // Creates a media::AudioCapturerSource with an implementation that is
   // specific for a WebAudio source. The created WebAudioCapturerSource
   // instance will function as audio source instead of the default
   // WebRtcAudioCapturer.
   virtual bool CreateWebAudioSource(WebKit::WebMediaStreamSource* source);
 
   // Asks the PeerConnection factory to create a Local AudioTrack object.
   virtual scoped_refptr<webrtc::AudioTrackInterface>
       CreateLocalAudioTrack(const std::string& id,
@@ skipping 35 matching lines @@
   talk_base::Thread* signaling_thread_;
   talk_base::Thread* worker_thread_;
   base::Thread chrome_worker_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_