summaryrefslogtreecommitdiffstats
path: root/webkit/support/webkit_support.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/support/webkit_support.cc')
-rw-r--r--webkit/support/webkit_support.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index ba537a8..51997ec 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -206,6 +206,14 @@ class TestEnvironment {
}
#endif
+ scoped_refptr<base::MessageLoopProxy> GetMediaThreadMessageLoopProxy() {
+ if (!media_thread_) {
+ media_thread_.reset(new base::Thread("Media"));
+ CHECK(media_thread_->Start());
+ }
+ return media_thread_->message_loop_proxy();
+ }
+
private:
// Data member at_exit_manager_ will take the ownership of the input
// AtExitManager and manage its lifecycle.
@@ -213,6 +221,8 @@ class TestEnvironment {
scoped_ptr<MessageLoopType> main_message_loop_;
scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
+ scoped_ptr<base::Thread> media_thread_;
+
#if defined(OS_ANDROID)
base::FilePath mock_current_directory_;
#endif
@@ -404,6 +414,7 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
return NULL;
#else
webkit_media::WebMediaPlayerParams params(
+ test_environment->GetMediaThreadMessageLoopProxy(),
NULL, NULL, new media::MediaLog());
return new webkit_media::WebMediaPlayerImpl(
frame,