Refactor content::RenderAudioSourceProvider as webkit_media::WebAudioSourceProviderImpl.

webkit/media/webmediaplayer_impl.h

Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index e9f8cd57c35fc1a303179c646f35f4f59f21e0bc..053fcf191e7f25f3cbb0880172bc57cf95bd0728 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -80,6 +80,7 @@ class MediaLog;
 namespace webkit_media {
 
 class MediaStreamClient;
+class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
 class WebMediaPlayerProxy;
@@ -325,13 +326,8 @@ class WebMediaPlayerImpl
 
   bool incremented_externally_allocated_memory_;
 
-  // TODO(scherkus): Sadly these two objects are the same and we're also forced
-  // to maintain an additional reference to |audio_renderer_sink_| otherwise
-  // |audio_source_provider_| will go bad after |pipeline_| shuts down.
-  //
-  // See http://crbug.com/136442 for details.
-  WebKit::WebAudioSourceProvider* audio_source_provider_;
-  scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
+  // Routes audio playback to either AudioRendererSink or WebAudio.
+  scoped_refptr<WebAudioSourceProviderImpl> audio_source_provider_;
 
   bool is_local_source_;
   bool supports_save_;