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

Unified Diff: content/test/webrtc_audio_device_test.h

Issue 8478030: Add support for audio capture devices. Previously only output was supported. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix includes as pointed out by henrika Created 9 years, 1 month 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
« no previous file with comments | « no previous file | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/webrtc_audio_device_test.h
===================================================================
--- content/test/webrtc_audio_device_test.h (revision 109607)
+++ content/test/webrtc_audio_device_test.h (working copy)
@@ -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 TestBrowserThread;
}
+namespace media_stream {
+class MediaStreamManager;
+}
+
namespace net {
class URLRequestContext;
}
@@ -170,10 +176,13 @@
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.
« no previous file with comments | « no previous file | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698