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

webkit/support/webkit_support.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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 354 matching lines @@
 
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,
       base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
       collection.release(),
       NULL,
+      NULL,
       message_loop_factory.release(),
       media_stream_client,
       new media::MediaLog());
 #endif
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebFrame* frame,
     WebMediaPlayerClient* client) {
   return CreateMediaPlayer(frame, client, NULL);
@@ skipping 404 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support