Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1620)

Unified Diff: content/test/webrtc_audio_device_test.cc

Issue 10912004: Begin adding support for tab mirroring via the MediaStream audio/video capturing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/webrtc_audio_device_test.cc
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 9190872b16eb28b9c11f361475498eb56470a51a..f2c6a1e72c0db7c820a57b0f05f2362d01aec93b 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -12,12 +12,10 @@
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
#include "base/win/scoped_com_initializer.h"
-#include "content/browser/renderer_host/media/audio_input_device_manager.h"
#include "content/browser/renderer_host/media/audio_input_renderer_host.h"
#include "content/browser/renderer_host/media/audio_renderer_host.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/renderer_host/media/mock_media_observer.h"
-#include "content/browser/renderer_host/media/video_capture_manager.h"
#include "content/common/view_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_paths.h"
@@ -137,14 +135,8 @@ void WebRTCAudioDeviceTest::SetUp() {
// Create our own AudioManager and 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());
// Construct the resource context on the UI thread.
resource_context_.reset(new MockResourceContext);

Powered by Google App Engine
This is Rietveld 408576698