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

webrtc/api/videosource.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 376 matching lines @@
   }
   if (!worker_thread_->Invoke<bool>(
       rtc::Bind(&cricket::VideoCapturer::StartCapturing,
                 video_capturer_.get(), format_))) {
     SetState(kEnded);
     return;
   }
   started_ = true;
 }
 
-void VideoSource::AddSink(
-    rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
-  // TODO(perkj): Use fake rtc::VideoSinkWants for now. This will change once
-  // webrtc::VideoSourceInterface inherit rtc::VideoSourceInterface.
+void VideoSource::AddOrUpdateSink(
+    rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+    const rtc::VideoSinkWants& wants) {
   worker_thread_->Invoke<void>(
       rtc::Bind(&cricket::VideoCapturer::AddOrUpdateSink,
-                video_capturer_.get(), output, rtc::VideoSinkWants()));
+                video_capturer_.get(), sink, wants));
 }
 
 void VideoSource::RemoveSink(
     rtc::VideoSinkInterface<cricket::VideoFrame>* output) {
   worker_thread_->Invoke<void>(
         rtc::Bind(&cricket::VideoCapturer::RemoveSink,
                   video_capturer_.get(), output));
 }
 
 // OnStateChange listens to the cricket::VideoCapturer::SignalStateChange.
@@ skipping 12 matching lines @@
 }
 
 void VideoSource::SetState(SourceState new_state) {
   if (state_ != new_state) {
     state_ = new_state;
     FireOnChanged();
   }
 }
 
 }  // namespace webrtc