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

webkit/media/webmediaplayer_impl.h

Index: webkit/media/webmediaplayer_impl.h
===================================================================
--- webkit/media/webmediaplayer_impl.h	(revision 147942)
+++ webkit/media/webmediaplayer_impl.h	(working copy)
@@ -73,7 +73,7 @@
 }
 
 namespace media {
-class AesDecryptor;
+class AudioRendererSink;
 class MediaLog;
 }
 
@@ -103,11 +103,19 @@
   // filter if they wish to hear any sound coming out the speakers, otherwise
   // audio data is discarded and media plays back based on wall clock time.
   //
+  // When calling this, the |audio_source_provider| and
+  // |audio_renderer_sink| arguments should be the same object.
+  //
+  // TODO(scherkus): Remove WebAudioSourceProvider parameter once we
+  // refactor RenderAudioSourceProvider to live under webkit/media/
+  // instead of content/renderer/, see http://crbug.com/136442
+
   WebMediaPlayerImpl(WebKit::WebFrame* frame,
                      WebKit::WebMediaPlayerClient* client,
                      base::WeakPtr<WebMediaPlayerDelegate> delegate,
                      media::FilterCollection* collection,
                      WebKit::WebAudioSourceProvider* audio_source_provider,
+                     media::AudioRendererSink* audio_renderer_sink,
                      media::MessageLoopFactory* message_loop_factory,
                      MediaStreamClient* media_stream_client,
                      media::MediaLog* media_log);
@@ -338,6 +346,8 @@
 
   WebKit::WebAudioSourceProvider* audio_source_provider_;
 
+  scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
+
   bool is_local_source_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);