Revert 203429 "Reland: Use a shared thread for media operations."

> Reland: Use a shared thread for media operations.
> 
> This reduces the number of threads created per media element by one.
> 
> BUG=61293
> TBR=acolwell, jamesr, jochen
> 
> Review URL: https://codereview.chromium.org/15649017

It's still causing some memory corruption.

TBR=scherkus@chromium.org

Review URL: https://codereview.chromium.org/16266006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203470 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 44 insertions, 0 deletions

diff --git a/webkit/mocks/test_media_stream_client.cc b/webkit/mocks/test_media_stream_client.cc
index 3065612..632f6b39 100644
--- a/webkit/mocks/test_media_stream_client.cc
+++ b/webkit/mocks/test_media_stream_client.cc
@@ -13,6 +13,9 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
 #include "webkit/renderer/media/media_stream_audio_renderer.h"
 #include "webkit/renderer/media/simple_video_frame_provider.h"
+#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "webkit/renderer/media/webmediaplayer_ms.h"
+#include "webkit/renderer/media/webmediaplayer_params.h"
 
 using namespace WebKit;
 
@@ -40,6 +43,33 @@ bool IsMockMediaStreamWithVideo(const WebURL& url) {
 
 namespace webkit_glue {
 
+WebKit::WebMediaPlayer* CreateMediaPlayer(
+    WebFrame* frame,
+    const WebURL& url,
+    WebMediaPlayerClient* client,
+    webkit_media::MediaStreamClient* media_stream_client) {
+  if (media_stream_client && media_stream_client->IsMediaStream(url)) {
+    return new webkit_media::WebMediaPlayerMS(
+        frame,
+        client,
+        base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+        media_stream_client,
+        new media::MediaLog());
+  }
+
+#if defined(OS_ANDROID)
+  return NULL;
+#else
+  webkit_media::WebMediaPlayerParams params(
+      NULL, NULL, new media::MediaLog());
+  return new webkit_media::WebMediaPlayerImpl(
+      frame,
+      client,
+      base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+      params);
+#endif
+}
+
 TestMediaStreamClient::TestMediaStreamClient() {}
 
 TestMediaStreamClient::~TestMediaStreamClient() {}
diff --git a/webkit/mocks/test_media_stream_client.h b/webkit/mocks/test_media_stream_client.h
index 60fa4aa..b759f49 100644
--- a/webkit/mocks/test_media_stream_client.h
+++ b/webkit/mocks/test_media_stream_client.h
@@ -13,12 +13,26 @@
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "webkit/renderer/media/media_stream_client.h"
 
+namespace WebKit {
+class WebFrame;
+class WebMediaPlayer;
+class WebMediaPlayerClient;
+}
+
 namespace webkit_media {
 class MediaStreamAudioRenderer;
+class MediaStreamClient;
 }
 
 namespace webkit_glue {
 
+// This is used by WebFrameClient::createMediaPlayer().
+WebKit::WebMediaPlayer* CreateMediaPlayer(
+    WebKit::WebFrame* frame,
+    const WebKit::WebURL& url,
+    WebKit::WebMediaPlayerClient* client,
+    webkit_media::MediaStreamClient* media_stream_client);
+
 class TestMediaStreamClient : public webkit_media::MediaStreamClient {
  public:
   TestMediaStreamClient();