Refactor content::RenderAudioSourceProvider as webkit_media::WebAudioSourceProviderImpl.

webkit/media/webmediaplayer_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 62 matching lines @@
 }
 
 namespace media {
 class ChunkDemuxer;
 class MediaLog;
 }
 
 namespace webkit_media {
 
 class MediaStreamClient;
+class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
 class WebMediaPlayerProxy;
 
 class WebMediaPlayerImpl
     : public WebKit::WebMediaPlayer,
       public MessageLoop::DestructionObserver,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
   // Constructs a WebMediaPlayer implementation using Chromium's media stack.
@@ skipping 225 matching lines @@
   MediaStreamClient* media_stream_client_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   // Since accelerated compositing status is only known after the first layout,
   // we delay reporting it to UMA until that time.
   bool accelerated_compositing_reported_;
 
   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_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
   scoped_ptr<ProxyDecryptor> decryptor_;
 
   bool starting_;
 
   scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
 
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.
   std::string init_data_type_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_