diff options
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index b4b18a3..07cdeb2 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -46,6 +46,7 @@ '<(DEPTH)/webkit/support/webkit_support.gyp:glue', '<(DEPTH)/webkit/support/webkit_support.gyp:quota', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support_common', ], @@ -416,9 +417,6 @@ '../../glue/dom_serializer_unittest.cc', '../../glue/glue_serialize_unittest.cc', '../../glue/iframe_redirect_unittest.cc', - '../../glue/media/buffered_data_source_unittest.cc', - '../../glue/media/buffered_resource_loader_unittest.cc', - '../../glue/media/simple_data_source_unittest.cc', '../../glue/mimetype_unittest.cc', '../../glue/multipart_response_delegate_unittest.cc', '../../glue/regular_expression_unittest.cc', @@ -428,6 +426,9 @@ '../../glue/webframe_unittest.cc', '../../glue/webkit_glue_unittest.cc', '../../glue/webview_unittest.cc', + '../../media/buffered_data_source_unittest.cc', + '../../media/buffered_resource_loader_unittest.cc', + '../../media/simple_data_source_unittest.cc', '../../mocks/mock_resource_loader_bridge.h', '../../mocks/mock_webframeclient.h', '../../mocks/mock_weburlloader.cc', diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 9231d1d..d1dea82 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -60,12 +60,12 @@ #include "ui/gfx/point.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/glue_serialize.h" -#include "webkit/glue/media/video_renderer_impl.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/webmediaplayer_impl.h" #include "webkit/glue/webpreferences.h" #include "webkit/glue/window_open_disposition.h" +#include "webkit/media/video_renderer_impl.h" +#include "webkit/media/webmediaplayer_impl.h" #include "webkit/plugins/npapi/webplugin_impl.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" @@ -647,14 +647,14 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( - new webkit_glue::VideoRendererImpl(false)); + scoped_refptr<webkit_media::VideoRendererImpl> video_renderer( + new webkit_media::VideoRendererImpl(false)); collection->AddVideoRenderer(video_renderer); - scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( - new webkit_glue::WebMediaPlayerImpl( + scoped_ptr<webkit_media::WebMediaPlayerImpl> result( + new webkit_media::WebMediaPlayerImpl( client, - base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(), + base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), collection.release(), message_loop_factory.release(), NULL, |