Remove WebRtcVideoSendStream2::VideoSink inheritance. Remove sending black frame on source remova…

webrtc/media/base/videoengine_unittest.h

Index: webrtc/media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index aaa03b3e867357bfb57c47d52ad6ed2e530480c0..8cb02567738c7961435b85807fe502b97122ddc3 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -817,14 +817,12 @@ class VideoMediaChannelTest : public testing::Test,
     rtc::Thread::Current()->ProcessMessages(30);
     // Remove the capturer.
     EXPECT_TRUE(channel_->SetVideoSend(kSsrc, true, nullptr, nullptr));
-    // Wait for one black frame for removing the capturer.
-    EXPECT_FRAME_WAIT(2, kVideoWidth, kVideoHeight, kTimeout);
 
     // No capturer was added, so this SetVideoSend shouldn't do anything.
     EXPECT_TRUE(channel_->SetVideoSend(kSsrc, true, nullptr, nullptr));
     rtc::Thread::Current()->ProcessMessages(300);
     // Verify no more frames were sent.
-    EXPECT_EQ(2, renderer_.num_rendered_frames());
+    EXPECT_EQ(1, renderer_.num_rendered_frames());
   }
 
   // Tests that we can add and remove capturer as unique sources.