Enable media stream layout test with content_shell.

webkit/mocks/test_media_stream_client.h

Index: webkit/mocks/test_media_stream_client.h
===================================================================
--- webkit/mocks/test_media_stream_client.h	(revision 191708)
+++ webkit/mocks/test_media_stream_client.h	(working copy)
@@ -6,19 +6,33 @@
 // and used with WebKit::WebUserMediaClientMock to provide corresponding video
 // decoder to media pipeline.
 
-#ifndef WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
-#define WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
+#ifndef WEBKIT_MOCKS_TEST_MEDIA_STREAM_CLIENT_H_
+#define WEBKIT_MOCKS_TEST_MEDIA_STREAM_CLIENT_H_
 
 #include "base/callback_forward.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "webkit/media/media_stream_client.h"
 
+namespace WebKit {
+class WebFrame;
+class WebMediaPlayer;
+class WebMediaPlayerClient;
+}
+
 namespace webkit_media {
 class MediaStreamAudioRenderer;
+class MediaStreamClient;
 }
 
-namespace webkit_support {
+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();
@@ -34,6 +48,6 @@
       GetAudioRenderer(const GURL& url) OVERRIDE;
 };
 
-}  // namespace webkit_support
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
+#endif  // WEBKIT_MOCKS_TEST_MEDIA_STREAM_CLIENT_H_