Create CanvasCaptureMediaStreamTrack in a regular MediaStream

content/renderer/media/canvas_capture_handler.cc

 // Copyright 2015 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.
 
 #include "content/renderer/media/canvas_capture_handler.h"
 
 #include "base/bind_helpers.h"
 #include "content/public/renderer/media_stream_api.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/render_thread_impl.h"
@@ skipping 68 matching lines @@
   const media::VideoCapturerSource::VideoCaptureDeliverFrameCB
       new_frame_callback_;
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<CanvasCaptureHandlerDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasCaptureHandlerDelegate);
 };
 
 CanvasCaptureHandler::CanvasCaptureHandler(const blink::WebSize& size,
                                            double frame_rate,
-                                           blink::WebMediaStream* stream)
+                                           blink::WebMediaStreamTrack* track)
     : ask_for_new_frame_(false),
       size_(size),
       io_task_runner_(content::RenderThread::Get()->GetIOMessageLoopProxy()),
       weak_ptr_factory_(this) {
   scoped_ptr<media::VideoCapturerSource> video_source(
       new CanvasCaptureHandler::VideoCapturerSource(
           weak_ptr_factory_.GetWeakPtr(), frame_rate));
-  content::AddVideoTrackToMediaStream(video_source.Pass(), false, true, stream);
+  content::AddVideoCapturerSourceToVideoTrack(video_source.Pass(), false, true,
+                                              track);
 }
 
 CanvasCaptureHandler::~CanvasCaptureHandler() {
   DVLOG(3) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
   io_task_runner_->DeleteSoon(FROM_HERE, delegate_.release());
 }
 
 void CanvasCaptureHandler::sendNewFrame(const blink::WebSkImage& image) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 61 matching lines @@
 
   io_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CanvasCaptureHandler::CanvasCaptureHandlerDelegate::
                      SendNewFrameOnIOThread,
                  delegate_->GetWeakPtrForIOThread(), video_frame,
                  base::TimeTicks()));
 }
 
 }  // namespace content