Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc |
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc |
index eb56bd9802f317e91d37b0df0fc657be1bdae144..7c2e568ad044c0478dd9255f865dba276a33e822 100644 |
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc |
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc |
@@ -7,7 +7,6 @@ |
#include "base/bind.h" |
#include "base/message_loop.h" |
#include "content/browser/browser_thread_impl.h" |
-#include "content/browser/renderer_host/media/audio_input_device_manager.h" |
#include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" |
#include "content/browser/renderer_host/media/media_stream_manager.h" |
#include "content/browser/renderer_host/media/mock_media_observer.h" |
@@ -172,13 +171,8 @@ class MediaStreamDispatcherHostTest : public testing::Test { |
// Create our own MediaStreamManager. |
audio_manager_.reset(media::AudioManager::Create()); |
- scoped_refptr<media_stream::AudioInputDeviceManager> |
- audio_input_device_manager( |
- new media_stream::AudioInputDeviceManager(audio_manager_.get())); |
- scoped_refptr<media_stream::VideoCaptureManager> video_capture_manager( |
- new media_stream::VideoCaptureManager()); |
- media_stream_manager_.reset(new media_stream::MediaStreamManager( |
- audio_input_device_manager, video_capture_manager)); |
+ media_stream_manager_.reset(new media_stream::MediaStreamManager()); |
+ media_stream_manager_->UseAudioManager(audio_manager_.get()); |
// Make sure we use fake devices to avoid long delays. |
media_stream_manager_->UseFakeDevice(); |
@@ -330,7 +324,9 @@ TEST_F(MediaStreamDispatcherHostTest, FailDevice) { |
EXPECT_CALL(*host_, OnVideoDeviceFailed(kRenderId, 0)); |
int session_id = host_->video_devices_[0].session_id; |
- media_stream_manager_->video_capture_manager()->Error(session_id); |
+ media_stream_manager_->GetVideoCaptureManager( |
+ content::MEDIA_STREAM_DEVICE_TYPE_USER_VIDEO_CAPTURE)-> |
+ Error(session_id); |
WaitForResult(); |
EXPECT_EQ(host_->video_devices_.size(), 0u); |
EXPECT_EQ(host_->NumberOfStreams(), 1u); |