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

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc	(revision 147942)
+++ content/renderer/render_view_impl.cc	(working copy)
@@ -2382,11 +2382,13 @@
   WebMediaPlayer* media_player =
       content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
           this, frame, client, AsWeakPtr(), collection, audio_source_provider,
-          message_loop_factory, media_stream_impl_, render_media_log);
+          audio_source_provider, message_loop_factory, media_stream_impl_,
+          render_media_log);
   if (!media_player) {
     media_player = new webkit_media::WebMediaPlayerImpl(
         frame, client, AsWeakPtr(), collection, audio_source_provider,
-        message_loop_factory, media_stream_impl_, render_media_log);
+        audio_source_provider, message_loop_factory, media_stream_impl_,
+        render_media_log);
   }
   return media_player;
 }