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

webrtc/api/videosource_unittest.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 119 matching lines @@
     // VideoSource take ownership of |capturer_|
     source_ =
         VideoSource::Create(rtc::Thread::Current(), capturer_cleanup_.release(),
                             constraints, false);
 
     ASSERT_TRUE(source_.get() != NULL);
     EXPECT_EQ(capturer_, source_->GetVideoCapturer());
 
     state_observer_.reset(new StateObserver(source_));
     source_->RegisterObserver(state_observer_.get());
-    source_->AddSink(&renderer_);
+    source_->AddOrUpdateSink(&renderer_, rtc::VideoSinkWants());
   }
 
   rtc::scoped_ptr<TestVideoCapturer> capturer_cleanup_;
   TestVideoCapturer* capturer_;
   cricket::FakeVideoRenderer renderer_;
   rtc::scoped_ptr<StateObserver> state_observer_;
   rtc::scoped_refptr<VideoSource> source_;
 };
 
 
@@ skipping 42 matching lines @@
 // RemoteVideoCapturer and takes video frames from FrameInput.
 TEST_F(VideoSourceTest, StartStopRemote) {
   source_ = VideoSource::Create(rtc::Thread::Current(),
                                 new webrtc::RemoteVideoCapturer(), NULL, true);
 
   ASSERT_TRUE(source_.get() != NULL);
   EXPECT_TRUE(NULL != source_->GetVideoCapturer());
 
   state_observer_.reset(new StateObserver(source_));
   source_->RegisterObserver(state_observer_.get());
-  source_->AddSink(&renderer_);
+  source_->AddOrUpdateSink(&renderer_, rtc::VideoSinkWants());
 
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
 
   source_->GetVideoCapturer()->Stop();
   EXPECT_EQ_WAIT(MediaSourceInterface::kEnded, state_observer_->state(),
                  kMaxWaitMs);
 }
 
 // Test that a VideoSource transition to kEnded if the capture device
@@ skipping 306 matching lines @@
   FakeConstraints constraints;
   constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
 
   CreateVideoSource(&constraints);
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
                  kMaxWaitMs);
   const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
   ASSERT_TRUE(format != NULL);
   EXPECT_EQ(30, format->framerate());
 }