Wip - cl for implemening VideoTrackSource::ApplyConstraints(constraints, VideoTrack) and adopt safe…

content/renderer/media/media_stream_video_track.h

Index: content/renderer/media/media_stream_video_track.h
diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h
index 436c15f86ace9eaaf87f4f6d7de344834db4b65c..674a6aa0408fd6466a7b86ed22259f432cdca5fe 100644
--- a/content/renderer/media/media_stream_video_track.h
+++ b/content/renderer/media/media_stream_video_track.h
@@ -25,29 +25,19 @@ namespace content {
 // WebMediaStreamTrack::getExtraData() or MediaStreamVideoTrack::GetVideoTrack.
 class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
  public:
-  // Help method to create a blink::WebMediaStreamTrack and a
+  // Help method to create a blink::WebMediaStreamTrack and register to |source|
+  // to receive video frames.
   // MediaStreamVideoTrack instance. The MediaStreamVideoTrack object is owned
   // by the blink object in its WebMediaStreamTrack::ExtraData member.
-  // |callback| is triggered if the track is added to the source
-  // successfully and will receive video frames that match |constraints|
-  // or if the source fail to provide video frames.
-  // If |enabled| is true, sinks added to the track will
-  // receive video frames when the source deliver frames to the track.
-  static blink::WebMediaStreamTrack CreateVideoTrack(
-      MediaStreamVideoSource* source,
-      const blink::WebMediaConstraints& constraints,
-      const MediaStreamVideoSource::ConstraintsCallback& callback,
-      bool enabled);
+  static blink::WebMediaStreamTrack
+    CreateVideoTrack(MediaStreamVideoSource* source);
+
+  static void InitializeVideoTrack(MediaStreamVideoSource* source,
+                                   const blink::WebMediaStreamTrack& track);
 
   static MediaStreamVideoTrack* GetVideoTrack(
       const blink::WebMediaStreamTrack& track);
 
-  // Constructor for video tracks.
-  MediaStreamVideoTrack(
-      MediaStreamVideoSource* source,
-      const blink::WebMediaConstraints& constraints,
-      const MediaStreamVideoSource::ConstraintsCallback& callback,
-      bool enabled);
   ~MediaStreamVideoTrack() override;
 
   // MediaStreamTrack overrides.
@@ -59,9 +49,16 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
 
   const blink::WebMediaConstraints& constraints() const { return constraints_; }
 
+  VideoCaptureDeliverFrameCB frame_input() const;
+
+ protected:
+  friend class MediaStreamVideoSource;
+  // Constructor for video tracks.
+  MediaStreamVideoTrack(base::WeakPtr<MediaStreamVideoSource> source,
+                        bool enabled);
  private:
   // MediaStreamVideoSink is a friend to allow it to call AddSink() and
-  // RemoveSink().
+  // RemoveSink() and to create MediaStreamVideoTracks.
   friend class MediaStreamVideoSink;
   FRIEND_TEST_ALL_PREFIXES(MediaStreamRemoteVideoSourceTest, StartTrack);
   FRIEND_TEST_ALL_PREFIXES(MediaStreamRemoteVideoSourceTest, RemoteTrackStop);