| Index: content/browser/renderer_host/media/media_stream_dispatcher_host.h
|
| ===================================================================
|
| --- content/browser/renderer_host/media/media_stream_dispatcher_host.h (revision 207505)
|
| +++ content/browser/renderer_host/media/media_stream_dispatcher_host.h (working copy)
|
| @@ -16,6 +16,7 @@
|
| #include "content/public/browser/browser_message_filter.h"
|
|
|
| namespace content {
|
| +class MediaStreamManager;
|
|
|
| // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by
|
| // MediaStreamImpl. It's the complement of MediaStreamDispatcher
|
| @@ -23,7 +24,8 @@
|
| class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
|
| public MediaStreamRequester {
|
| public:
|
| - explicit MediaStreamDispatcherHost(int render_process_id);
|
| + MediaStreamDispatcherHost(int render_process_id,
|
| + MediaStreamManager* media_stream_manager);
|
|
|
| // MediaStreamRequester implementation.
|
| virtual void StreamGenerated(
|
| @@ -66,12 +68,8 @@
|
| MediaStreamType type,
|
| const GURL& security_origin);
|
|
|
| - // Returns the media stream manager to forward events to,
|
| - // creating one if needed. It is a virtual function so that the unit tests
|
| - // can inject their own MediaStreamManager.
|
| - virtual MediaStreamManager* GetManager();
|
| -
|
| int render_process_id_;
|
| + MediaStreamManager* media_stream_manager_;
|
|
|
| struct StreamRequest;
|
| typedef std::map<std::string, StreamRequest> StreamMap;
|
|
|