diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 17:59:46 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 17:59:46 +0000 |
| commit | cba890e40291c245a53ce4297619659458ce4138 (patch) | |
| tree | 67a239e1d3bfe8d2ae35c38872e141a5597ea379 /content/browser/renderer_host/media/media_stream_dispatcher_host.h | |
| parent | f35205e4dc5551727836cbddc0bc01e0596f7972 (diff) | |
| download | chromium_src-cba890e40291c245a53ce4297619659458ce4138.zip chromium_src-cba890e40291c245a53ce4297619659458ce4138.tar.gz chromium_src-cba890e40291c245a53ce4297619659458ce4138.tar.bz2 | |
Revert 101063 - Removing singleton property of MediaStreamManager and creating thread first when needed.
Most likely cause of new Flakiness in PrerenderBrowserTest.PrerenderUnload...
BUG=92125
TEST=
Review URL: http://codereview.chromium.org/7649016
TBR=mflodman@chromium.org
Review URL: http://codereview.chromium.org/7885034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/media/media_stream_dispatcher_host.h')
| -rw-r--r-- | content/browser/renderer_host/media/media_stream_dispatcher_host.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h index c02d675..3951339 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h @@ -14,10 +14,6 @@ #include "content/browser/renderer_host/media/media_stream_requester.h" #include "content/common/media/media_stream_options.h" -namespace content { -class ResourceContext; -} // namespace content - namespace media_stream { // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by @@ -27,8 +23,7 @@ class MediaStreamDispatcherHost : public BrowserMessageFilter, public MediaStreamRequester { public: - MediaStreamDispatcherHost(const content::ResourceContext* resource_context, - int render_process_id); + explicit MediaStreamDispatcherHost(int render_process_id); virtual ~MediaStreamDispatcherHost(); // MediaStreamRequester implementation. @@ -59,9 +54,7 @@ class MediaStreamDispatcherHost // creating one if needed. MediaStreamManager* manager(); - const content::ResourceContext* resource_context_; int render_process_id_; - struct StreamRequest { StreamRequest() {} StreamRequest(int render_view_id, int page_request_id) |