Enable media stream layout test with content_shell.

content/shell/webkit_test_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 40 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTask.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h"
 #include "ui/gfx/rect.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/support/test_media_stream_client.h"
+#include "webkit/support/webkit_support.h"

[jochen (gone - plz use gerrit), 2013/04/02 07:02:21]

content/ must not depend on webkit/support.

You could move the test_media_stream_client to webkit/mocks, and just copy the
CreateMediaPlayer method to this file.

[wjia(left Chromium), 2013/04/03 00:44:04]

Done.

 
 using WebKit::Platform;
 using WebKit::WebArrayBufferView;
 using WebKit::WebContextMenuData;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDeviceOrientation;
 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;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebTestingSupport;
 using WebKit::WebVector;
 using WebKit::WebView;
@@ skipping 401 matching lines @@
   size_t num_entries = session_histories_[pos].size();
   *currentEntryIndex = current_entry_indexes_[pos];
   WebVector<WebHistoryItem> result(num_entries);
   for (size_t entry = 0; entry < num_entries; ++entry) {
     result[entry] =
         webkit_glue::HistoryItemFromString(session_histories_[pos][entry]);
   }
   history->swap(result);
 }
 
+WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
+    WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
+{
+#if ENABLE_WEBRTC
+  if (!test_media_stream_client_.get())
+    test_media_stream_client_.reset(
+        new webkit_support::TestMediaStreamClient());
+  return webkit_support::CreateMediaPlayer(frame, url, client,
+                                           test_media_stream_client_.get());
+#else
+  return webkit_support::CreateMediaPlayer(frame, url, client);
+#endif // ENABLE_WEBRTC
+}
+
 // RenderViewObserver  --------------------------------------------------------
 
 void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
   WebTestingSupport::injectInternalsObject(frame);
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame);
 }
 
 bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebKitTestRunner, message)
@@ skipping 139 matching lines @@
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->resetAll();
   Reset();
   // Navigating to about:blank will make sure that no new loads are initiated
   // by the renderer.
   render_view()->GetWebView()->mainFrame()
       ->loadRequest(WebURLRequest(GURL("about:blank")));
   Send(new ShellViewHostMsg_ResetDone(routing_id()));
 }
 
 }  // namespace content