Use a shared thread for media operations.

content/shell/renderer/webkit_test_runner.cc

Index: content/shell/renderer/webkit_test_runner.cc
diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc
index 83da82a61b7f1a9596d7e65cc7cccc7a9a06ad64..cdc61e2d818cb9cb21eefbeefdcf6ce3da1b3779 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -24,6 +24,7 @@
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/shell_render_process_observer.h"
+#include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "skia/ext/platform_canvas.h"
@@ -59,6 +60,9 @@
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/media/webmediaplayer_impl.h"
+#include "webkit/media/webmediaplayer_ms.h"
+#include "webkit/media/webmediaplayer_params.h"
 #include "webkit/mocks/test_media_stream_client.h"
 
 using WebKit::Platform;
@@ -191,7 +195,8 @@ WebKitTestRunner::WebKitTestRunner(RenderView* render_view)
       proxy_(NULL),
       focused_view_(NULL),
       is_main_window_(false),
-      focus_on_next_commit_(false) {
+      focus_on_next_commit_(false),
+      media_thread_("Media") {
 }
 
 WebKitTestRunner::~WebKitTestRunner() {
@@ -524,8 +529,32 @@ WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
     test_media_stream_client_.reset(
         new webkit_glue::TestMediaStreamClient());
   }
-  return webkit_glue::CreateMediaPlayer(
-      frame, url, client, test_media_stream_client_.get());
+
+  if (test_media_stream_client_->IsMediaStream(url)) {

[scherkus (not reviewing), 2013/05/09 21:59:32]

jochen: I didn't see a strong reason to stick webkit_glue::CreateMediaPlayer()
in test_media_stream_client.h as opposed to inlining the code here --
webkit/media/ is still glue code and it removes a layer of indirection

then again, I'd much rather have us not override cWMP() in the first place but I
feel that's something we'll have to tackle later :\

+    return new webkit_media::WebMediaPlayerMS(
+        frame,
+        client,
+        base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+        test_media_stream_client_.get(),
+        new media::MediaLog());
+  }
+
+#if defined(OS_ANDROID)
+  return NULL;
+#else
+  // TODO(scherkus): Use RenderViewImpl::createMediaPlayer() instead of
+  // duplicating code here.
+  if (!media_thread_.IsRunning())
+    media_thread_.Start();

[jochen (gone - plz use gerrit), 2013/05/10 07:37:34]

why don't you use the RenderThread's media thread?

You can CONTENT_EXPORT the getter, add a method to
content/test/layouttest_support.cc to access it

[scherkus (not reviewing), 2013/05/10 18:27:06]

This was exactly the sort of plumbing I was looking for! Thanks!

+
+  webkit_media::WebMediaPlayerParams params(
+      media_thread_.message_loop_proxy(), NULL, NULL, new media::MediaLog());
+  return new webkit_media::WebMediaPlayerImpl(
+      frame,
+      client,
+      base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+      params);
+#endif
 }
 
 // RenderViewObserver  --------------------------------------------------------