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

content/public/renderer/content_renderer_client.h

Index: content/public/renderer/content_renderer_client.h
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 073d0af28f6cd4087403575e2895d5fa80afe95b..a6ee38fd61ae411c37dfe9691528a988688bc5c1 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -54,16 +54,13 @@ class PpapiInterfaceFactoryManager;
 struct WebPluginInfo;
 }
 
-namespace webkit_media {
-class WebMediaPlayerDelegate;
-class WebMediaPlayerImpl;
-class WebMediaPlayerParams;
-}
-
 namespace content {
 
 class RenderView;
 class SynchronousCompositor;
+class WebMediaPlayerDelegate;
+class WebMediaPlayerImpl;
+class WebMediaPlayerParams;
 
 // Embedder API for participating in renderer logic.
 class CONTENT_EXPORT ContentRendererClient {
@@ -128,12 +125,12 @@ class CONTENT_EXPORT ContentRendererClient {
 
   // Allows embedder to override creating a WebMediaPlayerImpl. If it returns
   // NULL the content layer will create the media player.
-  virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
+  virtual WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
       RenderView* render_view,
       WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-      const webkit_media::WebMediaPlayerParams& params);
+      base::WeakPtr<WebMediaPlayerDelegate> delegate,
+      const WebMediaPlayerParams& params);
 
   // Allows the embedder to override creating a WebMediaStreamCenter. If it
   // returns NULL the content layer will create the stream center.