diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-25 01:00:54 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-25 01:00:54 +0000 |
| commit | e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb (patch) | |
| tree | b66c403cd80c5754f07be256791511d24231b76c /content/browser/renderer_host/render_process_host_impl.cc | |
| parent | 78caa9e65724fa68ad6d54e8f9ecef7078bc2c0f (diff) | |
| download | chromium_src-e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb.zip chromium_src-e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb.tar.gz chromium_src-e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb.tar.bz2 | |
Revert 128789 - Media failures on Win/Mac/Linux starting with this CL.
Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to support one.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9845033
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_process_host_impl.cc')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index ce8115c..f88fd08 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -448,16 +448,13 @@ bool RenderProcessHostImpl::Init(bool is_accessibility_enabled) { } void RenderProcessHostImpl::CreateMessageFilters() { - content::MediaObserver* media_observer = - content::GetContentClient()->browser()->GetMediaObserver(); scoped_refptr<RenderMessageFilter> render_message_filter( new RenderMessageFilter( GetID(), PluginServiceImpl::GetInstance(), GetBrowserContext(), GetBrowserContext()->GetRequestContextForRenderProcess(GetID()), - widget_helper_, - media_observer)); + widget_helper_)); channel_->AddFilter(render_message_filter); content::BrowserContext* browser_context = GetBrowserContext(); content::ResourceContext* resource_context = @@ -474,7 +471,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { AudioManager* audio_manager = content::BrowserMainLoop::GetAudioManager(); channel_->AddFilter(new AudioInputRendererHost( resource_context, audio_manager)); - channel_->AddFilter(new AudioRendererHost(audio_manager, media_observer)); + channel_->AddFilter(new AudioRendererHost(resource_context, audio_manager)); channel_->AddFilter(new VideoCaptureHost(resource_context, audio_manager)); #endif channel_->AddFilter(new AppCacheDispatcherHost( |