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

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 1107b3d982739898ffbffd49493b43b9f72748b2..3c20071a893ef4f14e44972233232de8513e3cb8 100644
--- a/content/shell/renderer/shell_media_stream_client.cc
+++ b/content/shell/renderer/shell_media_stream_client.cc
@@ -4,13 +4,13 @@
 
 #include "content/shell/renderer/shell_media_stream_client.h"
 
+#include "content/renderer/media/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"
-#include "webkit/renderer/media/simple_video_frame_provider.h"
 
 using namespace WebKit;
 
@@ -46,22 +46,22 @@ 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;
 
-  return new webkit_media::SimpleVideoFrameProvider(
+  return new ShellVideoFrameProvider(
       gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
       base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs),
       error_cb,
       repaint_cb);
 }
 
-scoped_refptr<webkit_media::MediaStreamAudioRenderer>
+scoped_refptr<MediaStreamAudioRenderer>
 ShellMediaStreamClient::GetAudioRenderer(const GURL& url) {
   return NULL;
 }