| 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 758c568f3075d11c4de7a7b3b8944d0ff3a6be9d..84948aaac86e0de738289ab854ee191cbb28fe57 100644
|
| --- a/content/renderer/media/media_stream_video_track_unittest.cc
|
| +++ b/content/renderer/media/media_stream_video_track_unittest.cc
|
| @@ -84,7 +84,8 @@ class MediaStreamVideoTrackTest : public ::testing::Test {
|
| TEST_F(MediaStreamVideoTrackTest, AddAndRemoveSink) {
|
| MockMediaStreamVideoSink sink;
|
| blink::WebMediaStreamTrack track = CreateTrack();
|
| - MediaStreamVideoSink::AddToVideoTrack(&sink, track);
|
| + MediaStreamVideoSink::AddToVideoTrack(
|
| + &sink, sink.GetDeliverFrameCB(), track);
|
|
|
| DeliverVideoFrameAndWaitForRenderer(&sink);
|
| EXPECT_EQ(1, sink.number_of_frames());
|
| @@ -106,7 +107,8 @@ TEST_F(MediaStreamVideoTrackTest, AddAndRemoveSink) {
|
| TEST_F(MediaStreamVideoTrackTest, SetEnabled) {
|
| MockMediaStreamVideoSink sink;
|
| blink::WebMediaStreamTrack track = CreateTrack();
|
| - MediaStreamVideoSink::AddToVideoTrack(&sink, track);
|
| + MediaStreamVideoSink::AddToVideoTrack(
|
| + &sink, sink.GetDeliverFrameCB(), track);
|
|
|
| MediaStreamVideoTrack* video_track =
|
| MediaStreamVideoTrack::GetVideoTrack(track);
|
| @@ -137,7 +139,8 @@ TEST_F(MediaStreamVideoTrackTest, SetEnabled) {
|
| TEST_F(MediaStreamVideoTrackTest, SourceStopped) {
|
| MockMediaStreamVideoSink sink;
|
| blink::WebMediaStreamTrack track = CreateTrack();
|
| - MediaStreamVideoSink::AddToVideoTrack(&sink, track);
|
| + MediaStreamVideoSink::AddToVideoTrack(
|
| + &sink, sink.GetDeliverFrameCB(), track);
|
| EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink.state());
|
|
|
| mock_source()->StopSource();
|
| @@ -148,7 +151,8 @@ TEST_F(MediaStreamVideoTrackTest, SourceStopped) {
|
| TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
|
| MockMediaStreamVideoSink sink1;
|
| blink::WebMediaStreamTrack track1 = CreateTrack();
|
| - MediaStreamVideoSink::AddToVideoTrack(&sink1, track1);
|
| + MediaStreamVideoSink::AddToVideoTrack(
|
| + &sink1, sink1.GetDeliverFrameCB(), track1);
|
| EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink1.state());
|
|
|
| EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
|
| @@ -156,7 +160,8 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
|
|
|
| MockMediaStreamVideoSink sink2;
|
| blink::WebMediaStreamTrack track2 = CreateTrack();
|
| - MediaStreamVideoSink::AddToVideoTrack(&sink2, track2);
|
| + MediaStreamVideoSink::AddToVideoTrack(
|
| + &sink2, sink2.GetDeliverFrameCB(), track2);
|
| EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink2.state());
|
|
|
| MediaStreamVideoTrack* native_track1 =
|
|
|