Merge 146897 - WebMediaPlayerImpl needs to own the audio source provider.

chrome/renderer/chrome_content_renderer_client.h

Index: chrome/renderer/chrome_content_renderer_client.h
===================================================================
--- chrome/renderer/chrome_content_renderer_client.h	(revision 147942)
+++ chrome/renderer/chrome_content_renderer_client.h	(working copy)
@@ -25,6 +25,10 @@
 
 struct ChromeViewHostMsg_GetPluginInfo_Status;
 
+namespace media {
+class AudioRendererSink;
+}
+
 namespace prerender {
 class PrerenderDispatcher;
 }
@@ -74,6 +78,7 @@
       base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
       media::FilterCollection* collection,
       WebKit::WebAudioSourceProvider* audio_source_provider,
+      media::AudioRendererSink* audio_renderer_sink,
       media::MessageLoopFactory* message_loop_factory,
       webkit_media::MediaStreamClient* media_stream_client,
       media::MediaLog* media_log) OVERRIDE;