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 cc8cd51f38a6627f0772832d7f99737cb3849dc6..1300f92d8bb2d466dc42262447574764c7000955 100644
--- a/content/renderer/media/media_stream_dependency_factory.h
+++ b/content/renderer/media/media_stream_dependency_factory.h
@@ -74,19 +74,25 @@ 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
+  // 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(
+      const StreamDeviceInfo& info);
+
+  // Asks the PeerConnection factory to create a Local Video Source.
+  // Takes ownership of |capturer|.
+  // TODO(perkj): Temporary until we don't need a webrtc::VideoSourceInterface.
+  virtual scoped_refptr<webrtc::VideoSourceInterface>
+      CreateLocalVideoSource(
+          cricket::VideoCapturer* capturer,
+          const blink::WebMediaConstraints& video_constraints);
 
   // Creates a libjingle representation of a MediaStream and stores
   // it in the extra data field of |web_stream|.
@@ -169,13 +175,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