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

content/shell/renderer/shell_media_stream_client.cc

Index: content/shell/renderer/shell_media_stream_client.cc
diff --git a/content/shell/renderer/shell_media_stream_client.cc b/content/shell/renderer/shell_media_stream_client.cc
index 48580a6d6901583152568fb575165324408f3e36..66579d2b6471aab8d48c2bb02969f2b5d773b702 100644
--- a/content/shell/renderer/shell_media_stream_client.cc
+++ b/content/shell/renderer/shell_media_stream_client.cc
@@ -4,13 +4,11 @@
 
 #include "content/shell/renderer/shell_media_stream_client.h"
 
+#include "content/public/renderer/media_stream_audio_renderer.h"
 #include "content/shell/renderer/shell_video_frame_provider.h"
-#include "googleurl/src/gurl.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
-#include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
-#include "webkit/renderer/media/media_stream_audio_renderer.h"
 
 using namespace WebKit;
 
@@ -46,11 +44,11 @@ bool ShellMediaStreamClient::IsMediaStream(const GURL& url) {
   return IsMockMediaStreamWithVideo(url);
 }
 
-scoped_refptr<webkit_media::VideoFrameProvider>
+scoped_refptr<VideoFrameProvider>
 ShellMediaStreamClient::GetVideoFrameProvider(
     const GURL& url,
     const base::Closure& error_cb,
-    const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) {
+    const VideoFrameProvider::RepaintCB& repaint_cb) {
   if (!IsMockMediaStreamWithVideo(url))
     return NULL;
 
@@ -61,7 +59,7 @@ ShellMediaStreamClient::GetVideoFrameProvider(
       repaint_cb);
 }
 
-scoped_refptr<webkit_media::MediaStreamAudioRenderer>
+scoped_refptr<MediaStreamAudioRenderer>
 ShellMediaStreamClient::GetAudioRenderer(const GURL& url) {
   return NULL;
 }