summaryrefslogtreecommitdiffstats
path: root/content/test/webrtc_audio_device_test.h
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 11:57:32 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 11:57:32 +0000
commit811ac5acc00f81ba808b3df9e1a03591ed847200 (patch)
tree53d9eff1d9efa2a72360c63ed203b82923fee9c1 /content/test/webrtc_audio_device_test.h
parenteccf3473fd5391d0111893503a67b220ef286cad (diff)
downloadchromium_src-811ac5acc00f81ba808b3df9e1a03591ed847200.zip
chromium_src-811ac5acc00f81ba808b3df9e1a03591ed847200.tar.gz
chromium_src-811ac5acc00f81ba808b3df9e1a03591ed847200.tar.bz2
Add support for audio capture devices. Previously only output was supported.
Review URL: http://codereview.chromium.org/8478030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/webrtc_audio_device_test.h')
-rw-r--r--content/test/webrtc_audio_device_test.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index 14df695..d2c1f36 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -13,13 +13,15 @@
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "base/message_loop.h"
+#include "base/synchronization/waitable_event.h"
#include "content/browser/renderer_host/media/mock_media_observer.h"
-#include "content/renderer/media/audio_renderer_impl.h"
#include "content/renderer/mock_content_renderer_client.h"
#include "ipc/ipc_channel.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/common_types.h"
+class AudioInputRendererHost;
class AudioRendererHost;
class RenderThreadImpl;
class WebRTCMockRenderProcess;
@@ -36,6 +38,10 @@ class ResourceContext;
class TestBrowserThread;
}
+namespace media_stream {
+class MediaStreamManager;
+}
+
namespace net {
class URLRequestContext;
}
@@ -170,10 +176,13 @@ class WebRTCAudioDeviceTest
scoped_ptr<WebRTCMockRenderProcess> mock_process_;
base::WaitableEvent event_;
scoped_ptr<MockMediaObserver> media_observer_;
+ scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
scoped_ptr<content::ResourceContext> resource_context_;
scoped_refptr<net::URLRequestContext> test_request_context_;
scoped_ptr<IPC::Channel> channel_;
scoped_refptr<AudioRendererHost> audio_render_host_;
+ scoped_refptr<AudioInputRendererHost> audio_input_renderer_host_;
+
AudioUtilInterface* audio_util_callback_; // Weak reference.
// Initialized on the main test thread that we mark as the UI thread.