summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authorscottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 00:11:49 +0000
committerscottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 00:11:49 +0000
commitdabaf655b51cd1ffb254f8abf79d5551f8dbb178 (patch)
tree474bec664c0815ad0bcd3e0de6b1ece1c5d85b14 /webkit/tools/test_shell
parentc3d78e06c57fcd18a04110472e2456a513c903ac (diff)
downloadchromium_src-dabaf655b51cd1ffb254f8abf79d5551f8dbb178.zip
chromium_src-dabaf655b51cd1ffb254f8abf79d5551f8dbb178.tar.gz
chromium_src-dabaf655b51cd1ffb254f8abf79d5551f8dbb178.tar.bz2
Plumb media data from renderers up to MediaInternals in the browser process.
BUG=none TEST=manually Review URL: http://codereview.chromium.org/7480032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index d327006..5e9af04 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -17,6 +17,7 @@
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "media/base/filter_collection.h"
+#include "media/base/media_log.h"
#include "media/base/message_loop_factory_impl.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
@@ -625,7 +626,8 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
new webkit_glue::WebMediaPlayerImpl(client,
collection.release(),
message_loop_factory.release(),
- NULL));
+ NULL,
+ new media::MediaLog()));
if (!result->Initialize(frame, false, video_renderer)) {
return NULL;
}