Removed VideoSource dependency to ChannelManager.

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.
  */
 
 #include <string>
 #include <vector>
 
 #include "webrtc/api/remotevideocapturer.h"
 #include "webrtc/api/test/fakeconstraints.h"
 #include "webrtc/api/videosource.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/engine/webrtcvideoframe.h"
-#include "webrtc/pc/channelmanager.h"
 
 using webrtc::FakeConstraints;
 using webrtc::VideoSource;
 using webrtc::MediaConstraintsInterface;
 using webrtc::MediaSourceInterface;
 using webrtc::ObserverInterface;
 using webrtc::VideoSourceInterface;
 
 namespace {
 
@@ skipping 71 matching lines @@
   }
   MediaSourceInterface::SourceState state() const { return state_; }
 
  private:
   MediaSourceInterface::SourceState state_;
   rtc::scoped_refptr<VideoSourceInterface> source_;
 };
 
 class VideoSourceTest : public testing::Test {
  protected:
-  VideoSourceTest()
-      : channel_manager_(new cricket::ChannelManager(
-          new cricket::FakeMediaEngine(), rtc::Thread::Current())) {
+  VideoSourceTest() {
     InitCapturer(false);
   }
   void InitCapturer(bool is_screencast) {
     capturer_cleanup_ = rtc::scoped_ptr<TestVideoCapturer>(
         new TestVideoCapturer(is_screencast));
     capturer_ = capturer_cleanup_.get();
   }
 
   void InitScreencast() { InitCapturer(true); }
 
-  void SetUp() {
-    ASSERT_TRUE(channel_manager_->Init());
-  }
-
   void CreateVideoSource() {
     CreateVideoSource(NULL);
   }
 
   void CreateVideoSource(
       const webrtc::MediaConstraintsInterface* constraints) {
     // VideoSource take ownership of |capturer_|
     source_ =
-        VideoSource::Create(channel_manager_.get(), capturer_cleanup_.release(),
+        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_);
   }
 
   rtc::scoped_ptr<TestVideoCapturer> capturer_cleanup_;
   TestVideoCapturer* capturer_;
   cricket::FakeVideoRenderer renderer_;
-  rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
   rtc::scoped_ptr<StateObserver> state_observer_;
   rtc::scoped_refptr<VideoSource> source_;
 };
 
 
 // Test that a VideoSource transition to kLive state when the capture
 // device have started and kEnded if it is stopped.
 // It also test that an output can receive video frames.
 TEST_F(VideoSourceTest, CapturerStartStop) {
   // Initialize without constraints.
@@ skipping 29 matching lines @@
 
   ASSERT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(2, renderer_.num_rendered_frames());
 
   source_->Stop();
 }
 
 // Test start stop with a remote VideoSource - the video source that has a
 // RemoteVideoCapturer and takes video frames from FrameInput.
 TEST_F(VideoSourceTest, StartStopRemote) {
-  source_ = VideoSource::Create(channel_manager_.get(),
+  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_);
 
   EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
@@ skipping 314 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());
 }