Remove use of DeviceManager from ChannelManager.

talk/app/webrtc/videosource_unittest.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 14 matching lines @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <string>
 #include <vector>
 
 #include "talk/app/webrtc/remotevideocapturer.h"
 #include "talk/app/webrtc/test/fakeconstraints.h"
 #include "talk/app/webrtc/videosource.h"
 #include "talk/media/base/fakemediaengine.h"
+#include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/base/fakevideorenderer.h"
-#include "talk/media/devices/fakedevicemanager.h"
 #include "talk/media/webrtc/webrtcvideoframe.h"
 #include "talk/session/media/channelmanager.h"
 #include "webrtc/base/gunit.h"
 
 using webrtc::FakeConstraints;
 using webrtc::VideoSource;
 using webrtc::MediaConstraintsInterface;
 using webrtc::MediaSourceInterface;
 using webrtc::ObserverInterface;
 using webrtc::VideoSourceInterface;
@@ skipping 76 matching lines @@
   MediaSourceInterface::SourceState state_;
   rtc::scoped_refptr<VideoSourceInterface> source_;
 };
 
 class VideoSourceTest : public testing::Test {
  protected:
   VideoSourceTest()
       : capturer_cleanup_(new TestVideoCapturer()),
         capturer_(capturer_cleanup_.get()),
         channel_manager_(new cricket::ChannelManager(
-          new cricket::FakeMediaEngine(),
-          new cricket::FakeDeviceManager(), rtc::Thread::Current())) {
+          new cricket::FakeMediaEngine(), rtc::Thread::Current())) {
   }
 
   void SetUp() {
     ASSERT_TRUE(channel_manager_->Init());
   }
 
   void CreateVideoSource() {
     CreateVideoSource(NULL);
   }
 
@@ skipping 409 matching lines @@
   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());
 }