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..5812f4c48283f7770cb5e3f077c84be22352534e 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -23,6 +23,9 @@
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/public/test/layouttest_support.h"
+#include "content/renderer/media/webmediaplayer_impl.h"
+#include "content/renderer/media/webmediaplayer_ms.h"
+#include "content/renderer/media/webmediaplayer_params.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/webkit_test_helpers.h"
 #include "content/shell/renderer/shell_media_stream_client.h"
@@ -61,9 +64,6 @@
 #include "ui/gfx/rect.h"
 #include "webkit/common/webpreferences.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/renderer/media/webmediaplayer_impl.h"
-#include "webkit/renderer/media/webmediaplayer_ms.h"
-#include "webkit/renderer/media/webmediaplayer_params.h"
 
 using WebKit::Platform;
 using WebKit::WebArrayBufferView;
@@ -514,18 +514,21 @@ 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());
   }
 
   if (shell_media_stream_client_->IsMediaStream(url)) {
-    return new webkit_media::WebMediaPlayerMS(
+    return new WebMediaPlayerMS(
         frame,
         client,
-        base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+        base::WeakPtr<WebMediaPlayerDelegate>(),
         shell_media_stream_client_.get(),
         new media::MediaLog());
   }
@@ -533,15 +536,11 @@ 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());
-  return new webkit_media::WebMediaPlayerImpl(
-      frame,
-      client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
-      params);
+  WebMediaPlayerParams params(
+      GetMediaThreadMessageLoopProxy(), NULL, NULL, NULL,
+      new media::MediaLog());
+  return new WebMediaPlayerImpl(
+      frame, client, base::WeakPtr<WebMediaPlayerDelegate>(), params);
 #endif
 }