| Index: content/renderer/media/media_stream_impl.h
|
| diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
|
| index fdb479b56cdc7daaef145b4fb889701165eeaabe..0d9d078c88d9ac516f33e747ba870d2fc52d81d8 100644
|
| --- a/content/renderer/media/media_stream_impl.h
|
| +++ b/content/renderer/media/media_stream_impl.h
|
| @@ -54,6 +54,7 @@ class WebPeerConnectionHandler;
|
| class WebPeerConnectionHandlerClient;
|
| }
|
|
|
| +class AudioDeviceFactoryInterface;
|
| class MediaStreamDispatcher;
|
| class MediaStreamDependencyFactory;
|
| class PeerConnectionHandlerBase;
|
| @@ -82,7 +83,8 @@ class CONTENT_EXPORT MediaStreamImpl
|
| MediaStreamDispatcher* media_stream_dispatcher,
|
| content::P2PSocketDispatcher* p2p_socket_dispatcher,
|
| VideoCaptureImplManager* vc_manager,
|
| - MediaStreamDependencyFactory* dependency_factory);
|
| + MediaStreamDependencyFactory* dependency_factory,
|
| + AudioDeviceFactoryInterface* audio_device_factory);
|
| virtual ~MediaStreamImpl();
|
|
|
| virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
|
| @@ -221,6 +223,10 @@ class CONTENT_EXPORT MediaStreamImpl
|
| // for the lifetime of RenderView.
|
| content::P2PSocketDispatcher* p2p_socket_dispatcher_;
|
|
|
| + // audio_device_factory is a weak reference, owned by RenderView. It's valid
|
| + // for the lifetime of RenderView.
|
| + AudioDeviceFactoryInterface* audio_device_factory_;
|
| +
|
| // We own network_manager_, must be deleted on the worker thread.
|
| // The network manager uses |p2p_socket_dispatcher_|.
|
| content::IpcNetworkManager* network_manager_;
|
|
|