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

webrtc/api/videosourceinterface.h

Index: webrtc/api/videosourceinterface.h
diff --git a/webrtc/api/videosourceinterface.h b/webrtc/api/videosourceinterface.h
index 3e319fcc3c1824bcb373d9ec637f994d7ed35727..d55f0aaa5257d07e492e2a032091cd73114c45b8 100644
--- a/webrtc/api/videosourceinterface.h
+++ b/webrtc/api/videosourceinterface.h
@@ -13,7 +13,7 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/videorenderer.h"
+#include "webrtc/media/base/videosourceinterface.h"
 
 namespace webrtc {
 
@@ -21,31 +21,28 @@ namespace webrtc {
 // The same source can be used in multiple VideoTracks.
 // The methods are only supposed to be called by the PeerConnection
 // implementation.
-class VideoSourceInterface : public MediaSourceInterface {
+class VideoSourceInterface :
+    public MediaSourceInterface,
+    public rtc::VideoSourceInterface<cricket::VideoFrame> {
  public:
   // Get access to the source implementation of cricket::VideoCapturer.
   // This can be used for receiving frames and state notifications.
   // But it should not be used for starting or stopping capturing.
   virtual cricket::VideoCapturer* GetVideoCapturer() = 0;
 
-  // Stop the video capturer.
   virtual void Stop() = 0;
   virtual void Restart() = 0;
 
-  // Adds |output| to the source to receive frames.
-  virtual void AddSink(
-      rtc::VideoSinkInterface<cricket::VideoFrame>* output) = 0;
-  virtual void RemoveSink(
-      rtc::VideoSinkInterface<cricket::VideoFrame>* output) = 0;
   virtual const cricket::VideoOptions* options() const = 0;
-  // TODO(nisse): Dummy implementation. Delete as soon as chrome's
-  // MockVideoSource is updated.
-  virtual cricket::VideoRenderer* FrameInput() { return nullptr; }
 
  protected:
   virtual ~VideoSourceInterface() {}
 };
 
+// TODO(perkj): Rename webrtc::VideoSourceInterface to
+// webrtc::VideoTrackSourceInterface
+using VideoTrackSourceInterface = VideoSourceInterface;
+
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_VIDEOSOURCEINTERFACE_H_