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

content/renderer/media/canvas_capture_handler.h

Index: content/renderer/media/canvas_capture_handler.h
diff --git a/content/renderer/media/canvas_capture_handler.h b/content/renderer/media/canvas_capture_handler.h
index 4446b1be9814adff5ef1057672b8d827338524f3..44f8e87a4799e953d8836a0d5ec4e527a335d9cc 100644
--- a/content/renderer/media/canvas_capture_handler.h
+++ b/content/renderer/media/canvas_capture_handler.h
@@ -41,12 +41,15 @@ class CONTENT_EXPORT CanvasCaptureHandler final
 
   // Creates a CanvasCaptureHandler instance and updates UMA histogram.
   static CanvasCaptureHandler* CreateCanvasCaptureHandler(
-      const blink::WebSize& size,
-      double frame_rate,
-      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
-      blink::WebMediaStreamTrack* track);
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
 
   // blink::WebCanvasCaptureHandler Implementation.
+  // A VideoCapturerSource instance is created, which is responsible for handing
+  // stop&start callbacks back to CanvasCaptureHandler. That VideoCapturerSource
+  // is then plugged into a MediaStreamTrack passed as |track|, and it is owned
+  // by the Blink side MediaStreamSource.
+  blink::WebMediaStreamTrack createTrack(const blink::WebSize& size,
+                                         double frame_rate) override;
   void sendNewFrame(const SkImage* image) override;
   bool needsNewFrame() const override;
 
@@ -61,20 +64,10 @@ class CONTENT_EXPORT CanvasCaptureHandler final
   blink::WebSize GetSourceSize() const { return size_; }
 
  private:
-  // A VideoCapturerSource instance is created, which is responsible for handing
-  // stop&start callbacks back to CanvasCaptureHandler. That VideoCapturerSource
-  // is then plugged into a MediaStreamTrack passed as |track|, and it is owned
-  // by the Blink side MediaStreamSource.
-  CanvasCaptureHandler(
-      const blink::WebSize& size,
-      double frame_rate,
-      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
-      blink::WebMediaStreamTrack* track);
+  explicit CanvasCaptureHandler(
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
 
   void CreateNewFrame(const SkImage* image);
-  void AddVideoCapturerSourceToVideoTrack(
-      std::unique_ptr<media::VideoCapturerSource> source,
-      blink::WebMediaStreamTrack* web_track);
 
   // Object that does all the work of running |new_frame_callback_|.
   // Destroyed on |frame_callback_task_runner_| after the class is destroyed.
@@ -83,7 +76,7 @@ class CONTENT_EXPORT CanvasCaptureHandler final
   media::VideoCaptureFormat capture_format_;
   bool ask_for_new_frame_;
 
-  const blink::WebSize size_;
+  blink::WebSize size_;
   gfx::Size last_size;
   std::vector<uint8_t> temp_data_;
   size_t temp_data_stride_;