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

content/shell/renderer/shell_media_stream_client.h

Index: content/shell/renderer/shell_media_stream_client.h
diff --git a/content/shell/renderer/shell_media_stream_client.h b/content/shell/renderer/shell_media_stream_client.h
index df74532ac6f7f87d8cd7dd22da0ca3b82096d31e..007cebb76aa204023f34e3e479c042e8c9c2f1d9 100644
--- a/content/shell/renderer/shell_media_stream_client.h
+++ b/content/shell/renderer/shell_media_stream_client.h
@@ -6,26 +6,26 @@
 #define CONTENT_SHELL_RENDERER_SHELL_MEDIA_STREAM_CLIENT_H_
 
 #include "base/callback_forward.h"
+#include "content/public/renderer/media_stream_client.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/renderer/media/media_stream_client.h"
 
 namespace content {
 
 // ShellMediaStreamClient is a mock implementation of
 // webkit_media::MediaStreamClient used when running layout tests.
-class ShellMediaStreamClient : public webkit_media::MediaStreamClient {
+class ShellMediaStreamClient : public MediaStreamClient {
  public:
   ShellMediaStreamClient();
   virtual ~ShellMediaStreamClient();
 
-  // webkit_media::MediaStreamClient implementation.
+  // MediaStreamClient implementation.
   virtual bool IsMediaStream(const GURL& url) OVERRIDE;
-  virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
+  virtual scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
       const GURL& url,
       const base::Closure& error_cb,
-      const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
-  virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
-      GetAudioRenderer(const GURL& url) OVERRIDE;
+      const VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
+  virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
+      const GURL& url) OVERRIDE;
 };
 
 }  // namespace content