2 files changed, 26 insertions, 0 deletions
diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc
index a240804..ba6134c 100644
--- a/content/shell/webkit_test_runner.cc
+++ b/content/shell/webkit_test_runner.cc
@@ -58,6 +58,7 @@
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/mocks/test_media_stream_client.h"
 
 using WebKit::Platform;
 using WebKit::WebArrayBufferView;
@@ -68,6 +69,8 @@ using WebKit::WebElement;
 using WebKit::WebFrame;
 using WebKit::WebGamepads;
 using WebKit::WebHistoryItem;
+using WebKit::WebMediaPlayer;
+using WebKit::WebMediaPlayerClient;
 using WebKit::WebPoint;
 using WebKit::WebRect;
 using WebKit::WebSize;
@@ -489,6 +492,17 @@ void WebKitTestRunner::captureHistoryForWindow(
   history->swap(result);
 }
 
+WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
+    WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
+{
+  if (!test_media_stream_client_.get()) {
+    test_media_stream_client_.reset(
+        new webkit_glue::TestMediaStreamClient());
+  }
+  return webkit_glue::CreateMediaPlayer(
+      frame, url, client, test_media_stream_client_.get());
+}
+
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h
index 860378db..aa2f5d1 100644
--- a/content/shell/webkit_test_runner.h
+++ b/content/shell/webkit_test_runner.h
@@ -19,6 +19,8 @@
 class SkCanvas;
 
 namespace WebKit {
+class WebMediaPlayer;
+class WebMediaPlayerClient;
 struct WebRect;
 }
 
@@ -26,6 +28,10 @@ namespace WebTestRunner {
 class WebTestProxyBase;
 }
 
+namespace webkit_glue {
+class TestMediaStreamClient;
+}
+
 namespace content {
 
 // This is the renderer side of the webkit test runner.
@@ -90,6 +96,10 @@ class WebKitTestRunner : public RenderViewObserver,
       WebTestRunner::WebTestProxyBase* proxy,
       WebKit::WebVector<WebKit::WebHistoryItem>* history,
       size_t* currentEntryIndex);
+  virtual WebKit::WebMediaPlayer* createWebMediaPlayer(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURL& url,
+      WebKit::WebMediaPlayerClient* client);
 
   void Reset();
 
@@ -125,6 +135,8 @@ class WebKitTestRunner : public RenderViewObserver,
 
   bool focus_on_next_commit_;
 
+  scoped_ptr<webkit_glue::TestMediaStreamClient> test_media_stream_client_;
+
   DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
 };