Change webrtc::VideoSourceInterface to inherit rtc::VideoSourceInterface.

webrtc/api/videosource.h

Index: webrtc/api/videosource.h
diff --git a/webrtc/api/videosource.h b/webrtc/api/videosource.h
index 7ff479a45fa2a20956fdd8035f39398cf32ca2f4..634c47ae371268e3ccf04dea21c2ccb0b2d4145c 100644
--- a/webrtc/api/videosource.h
+++ b/webrtc/api/videosource.h
@@ -30,13 +30,6 @@
 // The state is set depending on the result of starting the capturer.
 // If the constraint can't be met or the capturer fails to start, the state
 // transition to kEnded, otherwise it transitions to kLive.
-
-namespace cricket {
-
-class ChannelManager;
-
-}  // namespace cricket
-
 namespace webrtc {
 
 class MediaConstraintsInterface;
@@ -66,10 +59,9 @@ class VideoSource : public Notifier<VideoSourceInterface>,
   void Stop() override;
   void Restart() override;
 
-  // |output| will be served video frames as long as the underlying capturer
-  // is running video frames.
-  virtual void AddSink(rtc::VideoSinkInterface<cricket::VideoFrame>* output);
-  virtual void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* output);
+  void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+                       const rtc::VideoSinkWants& wants) override;
+  void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
 
  protected:
   VideoSource(rtc::Thread* worker_thread,