From 4bbf3face06e75b5b31469544141df787cddabca Mon Sep 17 00:00:00 2001 From: "perkj@chromium.org" Date: Tue, 23 Apr 2013 09:06:28 +0000 Subject: [PATCH] Enable RTCPeerConnectionHandlerTest.RemoveAndAddVideoTrackFromRemoteStream and RTCPeerConnectionHandlerTest.RemoveAndAddAudioTrackFromRemoteStream unit tests since the dependend Blink patch has landed. BUG=233514 Review URL: https://chromiumcodereview.appspot.com/14192041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195770 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/media/rtc_peer_connection_handler_unittest.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc index 01dff8a612e2..1ea089b8ae5b 100644 --- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc +++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc @@ -689,10 +689,7 @@ TEST_F(RTCPeerConnectionHandlerTest, RemoteTrackState) { video_tracks[0].source().readyState()); } -// TODO(perkj): Enable this test once https://codereview.chromium.org/14314003 -// is landed. -TEST_F(RTCPeerConnectionHandlerTest, - DISABLED_RemoveAndAddAudioTrackFromRemoteStream) { +TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) { std::string remote_stream_label("remote_stream"); scoped_refptr remote_stream( AddRemoteMockMediaStream(remote_stream_label, "video", "audio")); @@ -722,10 +719,7 @@ TEST_F(RTCPeerConnectionHandlerTest, EXPECT_EQ(1u, modified_audio_tracks2.size()); } -// TODO(perkj): Enable this test once https://codereview.chromium.org/14314003 -// is landed. -TEST_F(RTCPeerConnectionHandlerTest, - DISABLED_RemoveAndAddVideoTrackFromRemoteStream) { +TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddVideoTrackFromRemoteStream) { std::string remote_stream_label("remote_stream"); scoped_refptr remote_stream( AddRemoteMockMediaStream(remote_stream_label, "video", "video")); -- 2.11.4.GIT