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

chrome/renderer/chrome_content_renderer_client.cc

 // 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.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 328 matching lines @@
 }
 
 webkit_media::WebMediaPlayerImpl*
 ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
     content::RenderView* render_view,
     WebKit::WebFrame* frame,
     WebKit::WebMediaPlayerClient* client,
     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) {
   if (!prerender::PrerenderHelper::IsPrerendering(render_view))
     return NULL;
 
   return new prerender::PrerenderWebMediaPlayer(render_view, frame, client,
-      delegate, collection, audio_source_provider, message_loop_factory,
-      media_stream_client, media_log);
+      delegate, collection, audio_source_provider, audio_renderer_sink,
+      message_loop_factory, media_stream_client, media_log);
 }
 
 WebPlugin* ChromeContentRendererClient::CreatePlugin(
     content::RenderView* render_view,
     WebFrame* frame,
     const WebPluginParams& original_params,
     const ChromeViewHostMsg_GetPluginInfo_Status& status,
     const webkit::WebPluginInfo& plugin,
     const std::string& actual_mime_type) {
   ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value;
@@ skipping 575 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome