Migrate webkit/renderer/media/ to content/renderer/media/.

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 a5461a772292be5f75456ffb30ef05c12fafe22a..6a2e5c2de0c4e0ef9c17ccbc3a5a52e502bb6a41 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -514,9 +514,12 @@ void WebKitTestRunner::captureHistoryForWindow(
   history->swap(result);
 }
 
+// TODO(scherkus): Remove once https://codereview.chromium.org/18130006
+// rolls into Chromium.
 WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
-    WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client)
-{
+    WebFrame* frame,
+    const WebURL& url,
+    WebMediaPlayerClient* client) {
   if (!shell_media_stream_client_) {
     shell_media_stream_client_.reset(new ShellMediaStreamClient());
   }
@@ -533,10 +536,9 @@ WebMediaPlayer* WebKitTestRunner::createWebMediaPlayer(
 #if defined(OS_ANDROID)
   return NULL;
 #else
-  // TODO(scherkus): Use RenderViewImpl::createMediaPlayer() instead of
-  // duplicating code here, see http://crbug.com/239826
   webkit_media::WebMediaPlayerParams params(
-      GetMediaThreadMessageLoopProxy(), NULL, NULL, new media::MediaLog());
+      GetMediaThreadMessageLoopProxy(), NULL, NULL, NULL,
+      new media::MediaLog());
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,