| Index: talk/media/webrtc/webrtcvideoengine2_unittest.cc
|
| diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
|
| index 71581de2e3e85f80d19c1c0e6eadab6c3a8f37ae..3c5361f9e7b736ce25d1783024ee82e681c64b01 100644
|
| --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc
|
| +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc
|
| @@ -848,7 +848,6 @@ TEST_F(WebRtcVideoChannel2BaseTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) {
|
| codec.width /= 2;
|
| codec.height /= 2;
|
| EXPECT_TRUE(SetSend(true));
|
| - EXPECT_TRUE(channel_->SetRender(true));
|
| EXPECT_EQ(0, renderer_.num_rendered_frames());
|
| EXPECT_TRUE(SendFrame());
|
| EXPECT_FRAME_WAIT(1, codec.width, codec.height, kTimeout);
|
| @@ -1422,10 +1421,6 @@ TEST_F(WebRtcVideoChannel2Test, DISABLED_AddRemoveRecvStreamConference) {
|
| FAIL() << "Not implemented."; // TODO(pbos): Implement.
|
| }
|
|
|
| -TEST_F(WebRtcVideoChannel2Test, DISABLED_SetRender) {
|
| - FAIL() << "Not implemented."; // TODO(pbos): Implement.
|
| -}
|
| -
|
| TEST_F(WebRtcVideoChannel2Test, DISABLED_SetBandwidthAuto) {
|
| FAIL() << "Not implemented."; // TODO(pbos): Implement.
|
| }
|
| @@ -1796,7 +1791,6 @@ TEST_F(WebRtcVideoChannel2Test, EstimatesNtpStartTimeAndElapsedTimeCorrectly) {
|
| FakeVideoReceiveStream* stream = AddRecvStream();
|
| cricket::FakeVideoRenderer renderer;
|
| EXPECT_TRUE(channel_->SetRenderer(last_ssrc_, &renderer));
|
| - EXPECT_TRUE(channel_->SetRender(true));
|
|
|
| webrtc::VideoFrame video_frame;
|
| CreateBlackFrame(&video_frame, 4, 4);
|
|
|