Add video frame refresh to MediaStream and VideoCapture stacks.

content/renderer/media/media_stream_video_track_unittest.cc

Index: content/renderer/media/media_stream_video_track_unittest.cc
diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc
index 1b5071b3145ef453260425755e506fa2c7d03469..3d24352e6554329c99b8eb74604b9f626e96cae3 100644
--- a/content/renderer/media/media_stream_video_track_unittest.cc
+++ b/content/renderer/media/media_stream_video_track_unittest.cc
@@ -109,14 +109,14 @@ class MediaStreamVideoTrackTest : public ::testing::Test {
 TEST_F(MediaStreamVideoTrackTest, AddAndRemoveSink) {
   MockMediaStreamVideoSink sink;
   blink::WebMediaStreamTrack track = CreateTrack();
-  MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
+  sink.ConnectToTrack(track);
 
   DeliverVideoFrameAndWaitForRenderer(&sink);
   EXPECT_EQ(1, sink.number_of_frames());
 
   DeliverVideoFrameAndWaitForRenderer(&sink);
 
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
+  sink.DisconnectFromTrack();
 
   scoped_refptr<media::VideoFrame> frame =
       media::VideoFrame::CreateBlackFrame(
@@ -160,13 +160,12 @@ TEST_F(MediaStreamVideoTrackTest, ResetCallbackOnThread) {
 
   base::RunLoop run_loop;
   bool correct = false;
-  MediaStreamVideoSink::AddToVideoTrack(
-      &sink,
-      base::Bind(
-          &CheckThreadVideoFrameReceiver,
-          base::Owned(new CheckThreadHelper(run_loop.QuitClosure(), &correct))),
-      track);
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
+  sink.ConnectToTrackWithCallback(
+      track,
+      base::Bind(&CheckThreadVideoFrameReceiver,
+                 base::Owned(new CheckThreadHelper(run_loop.QuitClosure(),
+                                                   &correct))));
+  sink.DisconnectFromTrack();
   run_loop.Run();
   EXPECT_TRUE(correct) << "Not called on correct thread.";
 }
@@ -174,7 +173,7 @@ TEST_F(MediaStreamVideoTrackTest, ResetCallbackOnThread) {
 TEST_F(MediaStreamVideoTrackTest, SetEnabled) {
   MockMediaStreamVideoSink sink;
   blink::WebMediaStreamTrack track = CreateTrack();
-  MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
+  sink.ConnectToTrack(track);
 
   MediaStreamVideoTrack* video_track =
       MediaStreamVideoTrack::GetVideoTrack(track);
@@ -195,25 +194,24 @@ TEST_F(MediaStreamVideoTrackTest, SetEnabled) {
   DeliverVideoFrameAndWaitForRenderer(&sink);
   EXPECT_EQ(3, sink.number_of_frames());
   EXPECT_EQ(kColorValue, *sink.last_frame()->data(media::VideoFrame::kYPlane));
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
+  sink.DisconnectFromTrack();
 }
 
 TEST_F(MediaStreamVideoTrackTest, SourceStopped) {
   MockMediaStreamVideoSink sink;
   blink::WebMediaStreamTrack track = CreateTrack();
-  MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
+  sink.ConnectToTrack(track);
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink.state());
 
   mock_source()->StopSource();
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink.state());
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
+  sink.DisconnectFromTrack();
 }
 
 TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
   MockMediaStreamVideoSink sink1;
   blink::WebMediaStreamTrack track1 = CreateTrack();
-  MediaStreamVideoSink::AddToVideoTrack(
-      &sink1, sink1.GetDeliverFrameCB(), track1);
+  sink1.ConnectToTrack(track1);
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink1.state());
 
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
@@ -221,8 +219,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
 
   MockMediaStreamVideoSink sink2;
   blink::WebMediaStreamTrack track2 = CreateTrack();
-  MediaStreamVideoSink::AddToVideoTrack(
-      &sink2, sink2.GetDeliverFrameCB(), track2);
+  sink2.ConnectToTrack(track2);
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink2.state());
 
   MediaStreamVideoTrack* const native_track1 =
@@ -231,7 +228,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink1.state());
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
             blink_source().getReadyState());
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink1, track1);
+  sink1.DisconnectFromTrack();
 
   MediaStreamVideoTrack* const native_track2 =
         MediaStreamVideoTrack::GetVideoTrack(track2);
@@ -239,7 +236,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink2.state());
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
             blink_source().getReadyState());
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink2, track2);
+  sink2.DisconnectFromTrack();
 }
 
 TEST_F(MediaStreamVideoTrackTest, CheckTrackRequestsFrame) {
@@ -251,11 +248,11 @@ TEST_F(MediaStreamVideoTrackTest, CheckTrackRequestsFrame) {
   base::RunLoop run_loop;
   base::Closure quit_closure = run_loop.QuitClosure();
   EXPECT_CALL(sink, OnVideoFrame()).WillOnce(RunClosure(quit_closure));
-  MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
+  sink.ConnectToTrack(track);
   run_loop.Run();
   EXPECT_EQ(1, sink.number_of_frames());
 
-  MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
+  sink.DisconnectFromTrack();
 }
 
 }  // namespace content