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

content/public/renderer/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 "content/public/renderer/content_renderer_client.h"
 
 namespace content {
 
 SkBitmap* ContentRendererClient::GetSadPluginBitmap() {
   return NULL;
@@ skipping 23 matching lines @@
 }
 
 webkit_media::WebMediaPlayerImpl*
     ContentRendererClient::OverrideCreateWebMediaPlayer(
         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) {
   return NULL;
 }
 
 bool ContentRendererClient::RunIdleHandlerWhenWidgetsHidden() {
   return true;
 }
 
@@ skipping 43 matching lines @@
 
 bool ContentRendererClient::HandleSetCookieRequest(
     RenderView* sender,
     const GURL& url,
     const GURL& first_party_for_cookies,
     const std::string& value) {
   return false;
 }
 
 }  // namespace content