Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource

content/renderer/media/media_stream_dependency_factory.h

Index: content/renderer/media/media_stream_dependency_factory.h
diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h
index 0a0b120c376f62da4b43cfa21bcb7e468d849b72..b6a6a157d30e8d1cfff752e719c700d70e67f2cb 100644
--- a/content/renderer/media/media_stream_dependency_factory.h
+++ b/content/renderer/media/media_stream_dependency_factory.h
@@ -74,19 +74,17 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
   blink::WebRTCPeerConnectionHandler* CreateRTCPeerConnectionHandler(
       blink::WebRTCPeerConnectionHandlerClient* client);
 
-  // CreateNativeMediaSources creates libjingle representations of
-  // the underlying sources to the tracks in |web_stream|.
-  // |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
+  // CreateNativeMediaStreamAudioSources creates a MediaStream source object

[Ronghua Wu (Left Chromium), 2014/01/16 23:02:37]

Looking at the implementation of this method, it's more of initialize the source
instead of creating a new one.

[perkj_chrome, 2014/01/17 13:19:45]

Done.

+  // for audio input.
+  // The sources are stored in the extra data field of
   // WebMediaStreamSource.
-  // |audio_constraints| and |video_constraints| set parameters for the sources.
-  void CreateNativeMediaSources(
+  bool CreateNativeMediaStreamAudioSources(
       int render_view_id,
       const blink::WebMediaConstraints& audio_constraints,
-      const blink::WebMediaConstraints& video_constraints,
-      blink::WebMediaStream* web_stream,
-      const MediaSourcesCreatedCallback& sources_created);
+      const blink::WebVector<blink::WebMediaStreamSource>& audio_sources);
+
+  virtual cricket::VideoCapturer* CreateVideoCapturer(

[Ronghua Wu (Left Chromium), 2014/01/16 23:02:37]

add comment

[perkj_chrome, 2014/01/17 13:19:45]

done. Note that this is kind of temporary. I can not create the RTCVideoCapturer
in the source object itself because it can not be mocked for MediaStreamImpl
unit tests easely. Since it will go away in my next cl I don't want to spend
time on it now.

+      const StreamDeviceInfo& info);
 
   // Creates a libjingle representation of a MediaStream and stores
   // it in the extra data field of |web_stream|.
@@ -176,13 +174,6 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
       CreateLocalAudioSource(
           const webrtc::MediaConstraintsInterface* constraints);
 
-  // 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);
-
   // 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