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..48580a6d6901583152568fb575165324408f3e36 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/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;
 
@@ -54,7 +54,7 @@ ShellMediaStreamClient::GetVideoFrameProvider(
   if (!IsMockMediaStreamWithVideo(url))
     return NULL;
 
-  return new webkit_media::SimpleVideoFrameProvider(
+  return new ShellVideoFrameProvider(
       gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
       base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs),
       error_cb,