Migrate MediaStream test code from content/shell/renderer/ to content/test/.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 54e4e4c682313bafdfc285e4dbe57d29e63f864e..451427e01cc81180ce6b54cc6d9dc8b8dbc6cb6c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -101,6 +101,9 @@
 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
+#include "content/renderer/media/webmediaplayer_impl.h"
+#include "content/renderer/media/webmediaplayer_ms.h"
+#include "content/renderer/media/webmediaplayer_params.h"
 #include "content/renderer/mhtml_generator.h"
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
@@ -212,9 +215,6 @@
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
-#include "webkit/renderer/media/webmediaplayer_impl.h"
-#include "webkit/renderer/media/webmediaplayer_ms.h"
-#include "webkit/renderer/media/webmediaplayer_params.h"
 #include "webkit/renderer/webpreferences_renderer.h"
 
 #if defined(OS_ANDROID)
@@ -2852,7 +2852,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
 
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 #if defined(ENABLE_WEBRTC) && !defined(GOOGLE_TV)
-  webkit_media::MediaStreamClient* media_stream_client =
+  MediaStreamClient* media_stream_client =
       GetContentClient()->renderer()->OverrideCreateMediaStreamClient();
   if (!media_stream_client) {
     EnsureMediaStreamImpl();
@@ -2866,7 +2866,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
 #endif  // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     EnsureMediaStreamImpl();
-    return new webkit_media::WebMediaPlayerMS(
+    return new WebMediaPlayerMS(
         frame, client, AsWeakPtr(), media_stream_client, new RenderMediaLog());
   }
 #endif
@@ -2945,7 +2945,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
         gpu_channel_host, factories_loop, context3d);
   }
 
-  webkit_media::WebMediaPlayerParams params(
+  WebMediaPlayerParams params(
       RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
       base::Bind(&ContentRendererClient::DeferMediaLoad,
                  base::Unretained(GetContentClient()->renderer()),
@@ -2953,8 +2953,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
       sink,
       gpu_factories,
       new RenderMediaLog());
-  return new webkit_media::WebMediaPlayerImpl(
-      frame, client, AsWeakPtr(), params);
+  return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params);
 }
 
 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(